Changeset 37940

Timestamp:

07/01/2016 12:44:43 PM (8 years ago)

Author:

peterwilsoncc

Message:

Users: Check zxcvbn is defined before calling.

Prevents JavaScript errors by checking zxcvbn is defined before calling.

Changes wp.passwordStrength.meter() to return -1 if the strength of the password is unknown.

On the user profile screen, generatePassword() checks if the user has entered the password before setting the value of the password input box.

Props peterwilsoncc, adamsilverstein.
Fixes #34905.

Location:

trunk/src

Files:

• wp-admin/js/password-strength-meter.js (modified) (1 diff)
• wp-admin/js/user-profile.js (modified) (4 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-admin/js/password-strength-meter.js

@@ -18 +18 @@
             if (password1 != password2 && password2 && password2.length > 0)
                 return 5;
+
+            if ( 'undefined' === typeof window.zxcvbn ) {
+                // Password strength unknown.
+                return -1;
+            }
 
             var result = zxcvbn( password1, blacklist );

trunk/src/wp-admin/js/user-profile.js

@@ -31 +31 @@
         if ( typeof zxcvbn !== 'function' ) {
             setTimeout( generatePassword, 50 );
+            return;
+        } else if ( ! $pass1.val() ) {
+            // zxcvbn loaded before user entered password.
+            $pass1.val( $pass1.data( 'pw' ) );
+            $pass1.trigger( 'pwupdate' );
+            showOrHideWeakPasswordCheckbox();
+        }
+        else {
+            // zxcvbn loaded after the user entered password, check strength.
+            check_pass_strength();
+            showOrHideWeakPasswordCheckbox();
+        }
+
+        if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
+            $pass1Wrap.addClass( 'show-password' );
         } else {
-            $pass1.val( $pass1.data( 'pw' ) );
-            $pass1.trigger( 'pwupdate' ).trigger( 'wp-check-valid-field' );
-            if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
-                $pass1Wrap.addClass( 'show-password' );
-            } else {
-                $toggleButton.trigger( 'click' );
-            }
-        }
+            $toggleButton.trigger( 'click' );
+        }
+
+        // Once zxcvbn loads, passwords strength is known.
+        $( '#pw-weak-text-label' ).html( userProfileL10n.warnWeak );
     }
 
     function bindPass1() {
-        var passStrength = $('#pass-strength-result')[0];
-
         currentPass = $pass1.val();
 
@@ -83 +93 @@
             }
             $pass1.add( $pass1Text ).removeClass( 'short bad good strong' );
-
-            if ( passStrength.className ) {
-                $pass1.add( $pass1Text ).addClass( passStrength.className );
-                if ( 'short' === passStrength.className || 'bad' === passStrength.className ) {
-                    if ( ! $weakCheckbox.prop( 'checked' ) ) {
-                        $submitButtons.prop( 'disabled', true );
-                    }
-                    $weakRow.show();
-                } else {
-                    $submitButtons.prop( 'disabled', false );
-                    $weakRow.hide();
-                }
-            }
+            showOrHideWeakPasswordCheckbox();
         } );
     }
@@ -290 +288 @@
 
         switch ( strength ) {
+            case -1:
+                $( '#pass-strength-result' ).addClass( 'bad' ).html( pwsL10n.unknown );
+                break;
             case 2:
                 $('#pass-strength-result').addClass('bad').html( pwsL10n.bad );
@@ -307 +308 @@
     }
 
+    function showOrHideWeakPasswordCheckbox() {
+        var passStrength = $('#pass-strength-result')[0];
+
+        if ( passStrength.className ) {
+            $pass1.add( $pass1Text ).addClass( passStrength.className );
+            if ( 'short' === passStrength.className || 'bad' === passStrength.className ) {
+                if ( ! $weakCheckbox.prop( 'checked' ) ) {
+                    $submitButtons.prop( 'disabled', true );
+                }
+                $weakRow.show();
+            } else {
+                $submitButtons.prop( 'disabled', false );
+                $weakRow.hide();
+            }
+        }
+    }
+
     $(document).ready( function() {
         var $colorpicker, $stylesheet, user_id, current_user_id,

trunk/src/wp-admin/user-edit.php

@@ -532 +532 @@
         <label>
             <input type="checkbox" name="pw_weak" class="pw-checkbox" />
-            <?php _e( 'Confirm use of weak password' ); ?>
+            <span id="pw-weak-text-label"><?php _e( 'Confirm use of potentially weak password' ); ?></span>
         </label>
     </td>

trunk/src/wp-includes/script-loader.php

@@ -381 +381 @@
     $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
+        'unknown'  => _x( 'Password strength unknown', 'password strength' ),
         'short'    => _x( 'Very weak', 'password strength' ),
         'bad'      => _x( 'Weak', 'password strength' ),
@@ -391 +392 @@
     did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array(
         'warn'     => __( 'Your new password has not been saved.' ),
+        'warnWeak' => __( 'Confirm use of weak password.' ),
         'show'     => __( 'Show' ),
         'hide'     => __( 'Hide' ),