Changeset 719657

Timestamp:

05/29/2013 12:46:51 AM (13 years ago)

Author:

convissor

Message:

Squash for release 0.39.0.

Location:

login-security-solution/trunk

Files:

• languages/login-security-solution-fr_FR.mo (modified) (previous)
• languages/login-security-solution-fr_FR.po (modified) (1 diff)
• login-security-solution.php (modified) (8 diffs)
• readme.txt (modified) (1 diff)
• tests/PasswordChangeTest.php (modified) (1 diff)

login-security-solution/trunk/languages/login-security-solution-fr_FR.po

@@ -352 +352 @@
 "utilize WordPress' built in password reset functionality."
 msgstr ""
-"Cocher cette case obligera tous les utilisateurs exepté vous, à utiliser le "
-"processus de changement de mot de passe de WordPress."
+"Cocher cette case obligera tous les utilisateurs excepté vous-même, à "
+"utiliser le processus de changement de mot de passe de WordPress."
 
 #: admin.php:733

login-security-solution/trunk/login-security-solution.php

@@ -7 +7 @@
  *
  * Plugin URI: http://wordpress.org/extend/plugins/login-security-solution/
- * Version: 0.38.0
+ * Version: 0.39.0
  *         (Remember to change the VERSION constant, below, as well!)
  * Author: Daniel Convissor
@@ -43 +43 @@
      * This plugin's version
      */
-    const VERSION = '0.38.0';
+    const VERSION = '0.39.0';
 
     /**
@@ -59 +59 @@
     const E_NUMBER = 'pw-number';
     const E_PUNCT = 'pw-punct';
+    const E_REUSED = 'pw-reused';
     const E_SEQ_CHAR = 'pw-seqchar';
     const E_SEQ_KEY = 'pw-seqkey';
@@ -737 +738 @@
         }
 
+        if ($this->is_pw_reused($user_pass, $user->ID)) {
+            ###$this->log(__FUNCTION__, "password reused");
+            $this->redirect_to_login(self::E_REUSED, false, 'rp');
+            return -2;
+        }
+
         $this->save_verified_ip($user->ID, $this->get_ip());
         $this->process_pw_metadata($user->ID, $user_pass);
@@ -810 +817 @@
             }
             if ($this->is_pw_reused($user->user_pass, $user->ID)) {
-                $this->load_plugin_textdomain();
                 $errors->add(self::ID,
-                    $this->err(__("Passwords can not be reused.", self::ID)),
+                    $this->err($this->msg(self::E_REUSED)),
                     array('form-field' => 'pass1')
                 );
@@ -1877 +1883 @@
      */
     protected function msg($code) {
+        $this->load_plugin_textdomain();
         switch ($code) {
             case self::E_ASCII:
@@ -1892 +1899 @@
             case self::E_PUNCT:
                 return sprintf(__("Passwords must either contain punctuation marks / symbols or be %d characters long.", self::ID), $this->options['pw_complexity_exemption_length']);
+            case self::E_REUSED:
+                return __("Passwords can not be reused.", self::ID);
             case self::E_SEQ_CHAR:
                 return __("Passwords can't have that many sequential characters.", self::ID);
@@ -2648 +2657 @@
      */
     public function validate_pw($user, &$errors = null) {
-        $this->load_plugin_textdomain();
-
         if (is_object($user)) {
             $all_tests = true;

login-security-solution/trunk/readme.txt

@@ -445 +445 @@
 
 == Changelog ==
+
+= 0.39.0 (2013-05-29) =
+* Enforce password history during password reset process.
 
 = 0.38.0 (2013-05-27) =

login-security-solution/trunk/tests/PasswordChangeTest.php

@@ -203 +203 @@
         $this->assertGreaterThan(0, $actual, 'Changed time should be > 0.');
 
-        $actual = self::$lss->is_pw_reused(self::$pass_1, $this->user->ID);
-        $this->assertTrue($actual, 'Password should show up as reused');
-
         $this->ensure_grace_and_force_are_empty();
-
-        $wpdb->query('ROLLBACK TO empty');
+    }
+
+    /**
+     * @depends test_password_reset__normal
+     */
+    public function test_password_reset__reused_pw() {
+        global $wpdb;
+
+        $_GET['key'] = 'jk';
+        $_GET['login'] = 'ab';
+
+        $expected_error = 'Cannot modify header information';
+        $this->expected_errors($expected_error);
+        self::$location_expected = get_option('siteurl')
+                . '/wp-login.php?action=rp&key=jk&login=ab&'
+                . self::$lss->key_login_msg
+                . '=pw-reused';
+
+        $actual = self::$lss->password_reset($this->user, self::$pass_1);
+        $this->assertEquals(-2, $actual, 'password_reset() return.');
+
+        $wpdb->query('ROLLBACK TO empty');
+
+        $this->assertTrue($this->were_expected_errors_found(),
+                "Expected error not found: '$expected_error'");
+        $this->assertEquals(self::$location_expected, self::$location_actual,
+                'wp_redirect() produced unexpected location header.');
     }