Changeset 25157

Timestamp:

08/28/2013 04:08:19 PM (11 years ago)

Author:

nacin

Message:

Use Dropbox's zxcvbn library for our password meter.

The library was added in [25156].

props duck_.
see #21737.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-admin/js/password-strength-meter.js (modified) (1 diff)
• src/wp-includes/js/zxcvbn-async.js (added)
• src/wp-includes/script-loader.php (modified) (1 diff)
• src/wp-includes/version.php (modified) (1 diff)

trunk/Gruntfile.js

@@ -64 +64 @@
                     '!wp-includes/js/backbone.min.js',
                     '!wp-includes/js/swfobject.js',
-                    '!wp-includes/js/underscore.min.js'
+                    '!wp-includes/js/underscore.min.js',
+                    '!wp-includes/js/zxcvbn.min.js'
                 ]
             },

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

@@ -1 @@
-// Password strength meter
 function passwordStrength(password1, username, password2) {
-    var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, mismatch = 5, symbolSize = 0, natLog, score;
-
-    // password 1 != password 2
-    if ( (password1 != password2) && password2.length > 0)
-        return mismatch
-
-    //password < 4
-    if ( password1.length < 4 )
-        return shortPass
-
-    //password1 == username
-    if ( password1.toLowerCase() == username.toLowerCase() )
-        return badPass;
-
-    if ( password1.match(/[0-9]/) )
-        symbolSize +=10;
-    if ( password1.match(/[a-z]/) )
-        symbolSize +=26;
-    if ( password1.match(/[A-Z]/) )
-        symbolSize +=26;
-    if ( password1.match(/[^a-zA-Z0-9]/) )
-        symbolSize +=31;
-
-    natLog = Math.log( Math.pow(symbolSize, password1.length) );
-    score = natLog / Math.LN2;
-
-    if (score < 40 )
-        return badPass
-
-    if (score < 56 )
-        return goodPass
-
-    return strongPass;
+    if (password1 != password2 && password2.length > 0)
+        return 5;
+    var result = zxcvbn( password1, [ username ] );
+    return result.score;
 }

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

@@ -310 +310 @@
     ) );
 
-    $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), false, 1 );
+    $scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
+    did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array(
+        'src' => includes_url( '/js/zxcvbn.min.js' ),
+    ) );
+
+    $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(
         'empty' => __('Strength indicator'),

trunk/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.7-alpha-25000';
+$wp_version = '3.7-alpha-25157';
 
 /**