<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[51650] trunk/tests/phpunit/tests/error-protection: Tests: Rename classes in `phpunit/tests/error-protection/` per the naming conventions.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/51650">51650</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/51650","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-08-21 15:32:53 +0000 (Sat, 21 Aug 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Rename classes in `phpunit/tests/error-protection/` per the naming conventions.
https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization
Follow-up to <a href="https://core.trac.wordpress.org/changeset/47780">[47780]</a>, <a href="https://core.trac.wordpress.org/changeset/48911">[48911]</a>, <a href="https://core.trac.wordpress.org/changeset/49327">[49327]</a>, <a href="https://core.trac.wordpress.org/changeset/50291">[50291]</a>, <a href="https://core.trac.wordpress.org/changeset/50292">[50292]</a>, <a href="https://core.trac.wordpress.org/changeset/50342">[50342]</a>, <a href="https://core.trac.wordpress.org/changeset/50452">[50452]</a>, <a href="https://core.trac.wordpress.org/changeset/50453">[50453]</a>, <a href="https://core.trac.wordpress.org/changeset/50456">[50456]</a>, <a href="https://core.trac.wordpress.org/changeset/50967">[50967]</a>, <a href="https://core.trac.wordpress.org/changeset/50968">[50968]</a>, <a href="https://core.trac.wordpress.org/changeset/50969">[50969]</a>, <a href="https://core.trac.wordpress.org/changeset/51491">[51491]</a>, <a href="https://core.trac.wordpress.org/changeset/51492">[514
92]</a>, <a href="https://core.trac.wordpress.org/changeset/51493">[51493]</a>, <a href="https://core.trac.wordpress.org/changeset/51623">[51623]</a>, <a href="https://core.trac.wordpress.org/changeset/51639">[51639]</a>, <a href="https://core.trac.wordpress.org/changeset/51646">[51646]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestserrorprotectionwpRecoveryModeCookieServicephp">trunk/tests/phpunit/tests/error-protection/wpRecoveryModeCookieService.php</a></li>
<li><a href="#trunktestsphpunittestserrorprotectionwpRecoveryModeKeyServicephp">trunk/tests/phpunit/tests/error-protection/wpRecoveryModeKeyService.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestserrorprotectionrecoverymodecookieservicephp">trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php</a></li>
<li><a href="#trunktestsphpunittestserrorprotectionrecoverymodekeyservicephp">trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestserrorprotectionrecoverymodecookieservicephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php 2021-08-21 00:18:25 UTC (rev 51649)
+++ trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php 2021-08-21 15:32:53 UTC (rev 51650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,99 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group error-protection
- */
-class Tests_Recovery_Mode_Cookie_Service extends WP_UnitTestCase {
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
- */
- public function test_validate_cookie_returns_wp_error_if_invalid_format() {
-
- $service = new WP_Recovery_Mode_Cookie_Service();
-
- $error = $service->validate_cookie( 'gibbersih' );
- $this->assertWPError( $error );
- $this->assertSame( 'invalid_format', $error->get_error_code() );
-
- $error = $service->validate_cookie( base64_encode( 'test|data|format' ) );
- $this->assertWPError( $error );
- $this->assertSame( 'invalid_format', $error->get_error_code() );
-
- $error = $service->validate_cookie( base64_encode( 'test|data|format|to|long' ) );
- $this->assertWPError( $error );
- $this->assertSame( 'invalid_format', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
- */
- public function test_validate_cookie_returns_wp_error_if_expired() {
- $service = new WP_Recovery_Mode_Cookie_Service();
- $reflection = new ReflectionMethod( $service, 'recovery_mode_hash' );
- $reflection->setAccessible( true );
-
- $to_sign = sprintf( 'recovery_mode|%s|%s', time() - WEEK_IN_SECONDS - 30, wp_generate_password( 20, false ) );
- $signed = $reflection->invoke( $service, $to_sign );
- $cookie = base64_encode( sprintf( '%s|%s', $to_sign, $signed ) );
-
- $error = $service->validate_cookie( $cookie );
- $this->assertWPError( $error );
- $this->assertSame( 'expired', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
- */
- public function test_validate_cookie_returns_wp_error_if_signature_mismatch() {
- $service = new WP_Recovery_Mode_Cookie_Service();
- $reflection = new ReflectionMethod( $service, 'generate_cookie' );
- $reflection->setAccessible( true );
-
- $cookie = $reflection->invoke( $service );
- $cookie .= 'gibbersih';
-
- $error = $service->validate_cookie( $cookie );
- $this->assertWPError( $error );
- $this->assertSame( 'signature_mismatch', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
- */
- public function test_validate_cookie_returns_wp_error_if_created_at_is_invalid_format() {
- $service = new WP_Recovery_Mode_Cookie_Service();
- $reflection = new ReflectionMethod( $service, 'recovery_mode_hash' );
- $reflection->setAccessible( true );
-
- $to_sign = sprintf( 'recovery_mode|%s|%s', 'month', wp_generate_password( 20, false ) );
- $signed = $reflection->invoke( $service, $to_sign );
- $cookie = base64_encode( sprintf( '%s|%s', $to_sign, $signed ) );
-
- $error = $service->validate_cookie( $cookie );
- $this->assertWPError( $error );
- $this->assertSame( 'invalid_created_at', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
- */
- public function test_validate_cookie_returns_true_for_valid_cookie() {
-
- $service = new WP_Recovery_Mode_Cookie_Service();
- $reflection = new ReflectionMethod( $service, 'generate_cookie' );
- $reflection->setAccessible( true );
-
- $this->assertTrue( $service->validate_cookie( $reflection->invoke( $service ) ) );
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestserrorprotectionrecoverymodekeyservicephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php 2021-08-21 00:18:25 UTC (rev 51649)
+++ trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php 2021-08-21 15:32:53 UTC (rev 51650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,210 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group error-protection
- */
-class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::generate_recovery_mode_token
- * @covers WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key
- */
- public function test_generate_and_store_recovery_mode_key_returns_recovery_key() {
- $service = new WP_Recovery_Mode_Key_Service();
- $token = $service->generate_recovery_mode_token();
- $key = $service->generate_and_store_recovery_mode_key( $token );
-
- $this->assertNotWPError( $key );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_wp_error_if_no_key_set() {
- $service = new WP_Recovery_Mode_Key_Service();
- $error = $service->validate_recovery_mode_key( '', 'abcd', HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'token_not_found', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_wp_error_if_data_missing() {
- update_option( 'recovery_keys', 'gibberish' );
-
- $service = new WP_Recovery_Mode_Key_Service();
- $error = $service->validate_recovery_mode_key( '', 'abcd', HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'token_not_found', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_wp_error_if_bad() {
- update_option( 'recovery_keys', array( 'token' => 'gibberish' ) );
-
- $service = new WP_Recovery_Mode_Key_Service();
- $error = $service->validate_recovery_mode_key( 'token', 'abcd', HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'invalid_recovery_key_format', $error->get_error_code() );
- }
-
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_wp_error_if_stored_format_is_invalid() {
-
- $token = wp_generate_password( 22, false );
- update_option( 'recovery_keys', array( $token => 'gibberish' ) );
-
- $service = new WP_Recovery_Mode_Key_Service();
- $error = $service->validate_recovery_mode_key( $token, 'abcd', HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'invalid_recovery_key_format', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_wp_error_if_empty_key() {
- $service = new WP_Recovery_Mode_Key_Service();
- $token = $service->generate_recovery_mode_token();
- $service->generate_and_store_recovery_mode_key( $token );
- $error = $service->validate_recovery_mode_key( $token, '', HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'hash_mismatch', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_wp_error_if_hash_mismatch() {
- $service = new WP_Recovery_Mode_Key_Service();
- $token = $service->generate_recovery_mode_token();
- $service->generate_and_store_recovery_mode_key( $token );
- $error = $service->validate_recovery_mode_key( $token, 'abcd', HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'hash_mismatch', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_wp_error_if_expired() {
- $service = new WP_Recovery_Mode_Key_Service();
- $token = $service->generate_recovery_mode_token();
- $key = $service->generate_and_store_recovery_mode_key( $token );
-
- $records = get_option( 'recovery_keys' );
- $records[ $token ]['created_at'] = time() - HOUR_IN_SECONDS - 30;
- update_option( 'recovery_keys', $records );
-
- $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'key_expired', $error->get_error_code() );
- }
-
- /**
- * @ticket 46130
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_true_for_valid_key() {
- $service = new WP_Recovery_Mode_Key_Service();
- $token = $service->generate_recovery_mode_token();
- $key = $service->generate_and_store_recovery_mode_key( $token );
- $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );
- }
-
- /**
- * @ticket 46595
- *
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_error_if_token_used_more_than_once() {
- $service = new WP_Recovery_Mode_Key_Service();
- $token = $service->generate_recovery_mode_token();
- $key = $service->generate_and_store_recovery_mode_key( $token );
-
- $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );
-
- // Data should be remove by first call.
- $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'token_not_found', $error->get_error_code() );
- }
-
- /**
- * @ticket 46595
- *
- * @covers WP_Recovery_Mode_Key_Service::generate_recovery_mode_token
- * @covers WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key
- * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
- */
- public function test_validate_recovery_mode_key_returns_error_if_token_used_more_than_once_more_than_key_stored() {
- $service = new WP_Recovery_Mode_Key_Service();
-
- // Create an extra key.
- $token = $service->generate_recovery_mode_token();
- $service->generate_and_store_recovery_mode_key( $token );
-
- $token = $service->generate_recovery_mode_token();
- $key = $service->generate_and_store_recovery_mode_key( $token );
-
- $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );
-
- // Data should be remove by first call.
- $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );
-
- $this->assertWPError( $error );
- $this->assertSame( 'token_not_found', $error->get_error_code() );
- }
-
- /**
- * @ticket 46595
- *
- * @covers WP_Recovery_Mode_Key_Service::clean_expired_keys
- */
- public function test_clean_expired_keys() {
- $service = new WP_Recovery_Mode_Key_Service();
- $token = $service->generate_recovery_mode_token();
- $service->generate_and_store_recovery_mode_key( $token );
-
- $records = get_option( 'recovery_keys' );
-
- $records[ $token ]['created_at'] = time() - HOUR_IN_SECONDS - 30;
-
- update_option( 'recovery_keys', $records );
-
- $service->clean_expired_keys( HOUR_IN_SECONDS );
-
- $this->assertEmpty( get_option( 'recovery_keys' ) );
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestserrorprotectionwpRecoveryModeCookieServicephpfromrev51649trunktestsphpunittestserrorprotectionrecoverymodecookieservicephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/error-protection/wpRecoveryModeCookieService.php (from rev 51649, trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/error-protection/wpRecoveryModeCookieService.php (rev 0)
+++ trunk/tests/phpunit/tests/error-protection/wpRecoveryModeCookieService.php 2021-08-21 15:32:53 UTC (rev 51650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,99 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group error-protection
+ */
+class Tests_Error_Protection_wpRecoveryModeCookieService extends WP_UnitTestCase {
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
+ */
+ public function test_validate_cookie_returns_wp_error_if_invalid_format() {
+
+ $service = new WP_Recovery_Mode_Cookie_Service();
+
+ $error = $service->validate_cookie( 'gibbersih' );
+ $this->assertWPError( $error );
+ $this->assertSame( 'invalid_format', $error->get_error_code() );
+
+ $error = $service->validate_cookie( base64_encode( 'test|data|format' ) );
+ $this->assertWPError( $error );
+ $this->assertSame( 'invalid_format', $error->get_error_code() );
+
+ $error = $service->validate_cookie( base64_encode( 'test|data|format|to|long' ) );
+ $this->assertWPError( $error );
+ $this->assertSame( 'invalid_format', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
+ */
+ public function test_validate_cookie_returns_wp_error_if_expired() {
+ $service = new WP_Recovery_Mode_Cookie_Service();
+ $reflection = new ReflectionMethod( $service, 'recovery_mode_hash' );
+ $reflection->setAccessible( true );
+
+ $to_sign = sprintf( 'recovery_mode|%s|%s', time() - WEEK_IN_SECONDS - 30, wp_generate_password( 20, false ) );
+ $signed = $reflection->invoke( $service, $to_sign );
+ $cookie = base64_encode( sprintf( '%s|%s', $to_sign, $signed ) );
+
+ $error = $service->validate_cookie( $cookie );
+ $this->assertWPError( $error );
+ $this->assertSame( 'expired', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
+ */
+ public function test_validate_cookie_returns_wp_error_if_signature_mismatch() {
+ $service = new WP_Recovery_Mode_Cookie_Service();
+ $reflection = new ReflectionMethod( $service, 'generate_cookie' );
+ $reflection->setAccessible( true );
+
+ $cookie = $reflection->invoke( $service );
+ $cookie .= 'gibbersih';
+
+ $error = $service->validate_cookie( $cookie );
+ $this->assertWPError( $error );
+ $this->assertSame( 'signature_mismatch', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
+ */
+ public function test_validate_cookie_returns_wp_error_if_created_at_is_invalid_format() {
+ $service = new WP_Recovery_Mode_Cookie_Service();
+ $reflection = new ReflectionMethod( $service, 'recovery_mode_hash' );
+ $reflection->setAccessible( true );
+
+ $to_sign = sprintf( 'recovery_mode|%s|%s', 'month', wp_generate_password( 20, false ) );
+ $signed = $reflection->invoke( $service, $to_sign );
+ $cookie = base64_encode( sprintf( '%s|%s', $to_sign, $signed ) );
+
+ $error = $service->validate_cookie( $cookie );
+ $this->assertWPError( $error );
+ $this->assertSame( 'invalid_created_at', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Cookie_Service::validate_cookie
+ */
+ public function test_validate_cookie_returns_true_for_valid_cookie() {
+
+ $service = new WP_Recovery_Mode_Cookie_Service();
+ $reflection = new ReflectionMethod( $service, 'generate_cookie' );
+ $reflection->setAccessible( true );
+
+ $this->assertTrue( $service->validate_cookie( $reflection->invoke( $service ) ) );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestserrorprotectionwpRecoveryModeKeyServicephpfromrev51649trunktestsphpunittestserrorprotectionrecoverymodekeyservicephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/error-protection/wpRecoveryModeKeyService.php (from rev 51649, trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/error-protection/wpRecoveryModeKeyService.php (rev 0)
+++ trunk/tests/phpunit/tests/error-protection/wpRecoveryModeKeyService.php 2021-08-21 15:32:53 UTC (rev 51650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,210 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group error-protection
+ */
+class Tests_Error_Protection_wpRecoveryModeKeyService extends WP_UnitTestCase {
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::generate_recovery_mode_token
+ * @covers WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key
+ */
+ public function test_generate_and_store_recovery_mode_key_returns_recovery_key() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $token = $service->generate_recovery_mode_token();
+ $key = $service->generate_and_store_recovery_mode_key( $token );
+
+ $this->assertNotWPError( $key );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_wp_error_if_no_key_set() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $error = $service->validate_recovery_mode_key( '', 'abcd', HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'token_not_found', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_wp_error_if_data_missing() {
+ update_option( 'recovery_keys', 'gibberish' );
+
+ $service = new WP_Recovery_Mode_Key_Service();
+ $error = $service->validate_recovery_mode_key( '', 'abcd', HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'token_not_found', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_wp_error_if_bad() {
+ update_option( 'recovery_keys', array( 'token' => 'gibberish' ) );
+
+ $service = new WP_Recovery_Mode_Key_Service();
+ $error = $service->validate_recovery_mode_key( 'token', 'abcd', HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'invalid_recovery_key_format', $error->get_error_code() );
+ }
+
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_wp_error_if_stored_format_is_invalid() {
+
+ $token = wp_generate_password( 22, false );
+ update_option( 'recovery_keys', array( $token => 'gibberish' ) );
+
+ $service = new WP_Recovery_Mode_Key_Service();
+ $error = $service->validate_recovery_mode_key( $token, 'abcd', HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'invalid_recovery_key_format', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_wp_error_if_empty_key() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $token = $service->generate_recovery_mode_token();
+ $service->generate_and_store_recovery_mode_key( $token );
+ $error = $service->validate_recovery_mode_key( $token, '', HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'hash_mismatch', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_wp_error_if_hash_mismatch() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $token = $service->generate_recovery_mode_token();
+ $service->generate_and_store_recovery_mode_key( $token );
+ $error = $service->validate_recovery_mode_key( $token, 'abcd', HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'hash_mismatch', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_wp_error_if_expired() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $token = $service->generate_recovery_mode_token();
+ $key = $service->generate_and_store_recovery_mode_key( $token );
+
+ $records = get_option( 'recovery_keys' );
+ $records[ $token ]['created_at'] = time() - HOUR_IN_SECONDS - 30;
+ update_option( 'recovery_keys', $records );
+
+ $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'key_expired', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46130
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_true_for_valid_key() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $token = $service->generate_recovery_mode_token();
+ $key = $service->generate_and_store_recovery_mode_key( $token );
+ $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );
+ }
+
+ /**
+ * @ticket 46595
+ *
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_error_if_token_used_more_than_once() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $token = $service->generate_recovery_mode_token();
+ $key = $service->generate_and_store_recovery_mode_key( $token );
+
+ $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );
+
+ // Data should be remove by first call.
+ $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'token_not_found', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46595
+ *
+ * @covers WP_Recovery_Mode_Key_Service::generate_recovery_mode_token
+ * @covers WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key
+ * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
+ */
+ public function test_validate_recovery_mode_key_returns_error_if_token_used_more_than_once_more_than_key_stored() {
+ $service = new WP_Recovery_Mode_Key_Service();
+
+ // Create an extra key.
+ $token = $service->generate_recovery_mode_token();
+ $service->generate_and_store_recovery_mode_key( $token );
+
+ $token = $service->generate_recovery_mode_token();
+ $key = $service->generate_and_store_recovery_mode_key( $token );
+
+ $this->assertTrue( $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS ) );
+
+ // Data should be remove by first call.
+ $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );
+
+ $this->assertWPError( $error );
+ $this->assertSame( 'token_not_found', $error->get_error_code() );
+ }
+
+ /**
+ * @ticket 46595
+ *
+ * @covers WP_Recovery_Mode_Key_Service::clean_expired_keys
+ */
+ public function test_clean_expired_keys() {
+ $service = new WP_Recovery_Mode_Key_Service();
+ $token = $service->generate_recovery_mode_token();
+ $service->generate_and_store_recovery_mode_key( $token );
+
+ $records = get_option( 'recovery_keys' );
+
+ $records[ $token ]['created_at'] = time() - HOUR_IN_SECONDS - 30;
+
+ update_option( 'recovery_keys', $records );
+
+ $service->clean_expired_keys( HOUR_IN_SECONDS );
+
+ $this->assertEmpty( get_option( 'recovery_keys' ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>