<!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>[25157] trunk: Use Dropbox's zxcvbn library for our password meter.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25157">25157</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-08-28 16:08:19 +0000 (Wed, 28 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Dropbox's zxcvbn library for our password meter.
The library was added in <a href="http://core.trac.wordpress.org/changeset/25156">[25156]</a>.
props duck_.
see <a href="http://core.trac.wordpress.org/ticket/21737">#21737</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpadminjspasswordstrengthmeterjs">trunk/src/wp-admin/js/password-strength-meter.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjszxcvbnasyncjs">trunk/src/wp-includes/js/zxcvbn-async.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4>Modified: trunk/Gruntfile.js (25156 => 25157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Gruntfile.js 2013-08-28 16:02:53 UTC (rev 25156)
+++ trunk/Gruntfile.js 2013-08-28 16:08:19 UTC (rev 25157)
</span><span class="lines">@@ -63,7 +63,8 @@
</span><span class="cx"> '!wp-admin/js/iris.min.js',
</span><span class="cx"> '!wp-includes/js/backbone.min.js',
</span><span class="cx"> '!wp-includes/js/swfobject.js',
</span><del>- '!wp-includes/js/underscore.min.js'
</del><ins>+ '!wp-includes/js/underscore.min.js',
+ '!wp-includes/js/zxcvbn.min.js'
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> tinymce: {
</span></span></pre></div>
<a id="trunksrcwpadminjspasswordstrengthmeterjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/password-strength-meter.js (25156 => 25157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/password-strength-meter.js 2013-08-28 16:02:53 UTC (rev 25156)
+++ trunk/src/wp-admin/js/password-strength-meter.js 2013-08-28 16:08:19 UTC (rev 25157)
</span><span class="lines">@@ -1,36 +1,6 @@
</span><del>-// Password strength meter
</del><span class="cx"> function passwordStrength(password1, username, password2) {
</span><del>- 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;
</del><ins>+ if (password1 != password2 && password2.length > 0)
+ return 5;
+ var result = zxcvbn( password1, [ username ] );
+ return result.score;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjszxcvbnasyncjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/js/zxcvbn-async.js (0 => 25157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/zxcvbn-async.js (rev 0)
+++ trunk/src/wp-includes/js/zxcvbn-async.js 2013-08-28 16:08:19 UTC (rev 25157)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+(function() {
+ var async_load = function() {
+ var first, s;
+ s = document.createElement('script');
+ s.src = _zxcvbnSettings.src;
+ s.type = 'text/javascript';
+ s.async = true;
+ first = document.getElementsByTagName('script')[0];
+ return first.parentNode.insertBefore(s, first);
+ };
+
+ if (window.attachEvent != null) {
+ window.attachEvent('onload', async_load);
+ } else {
+ window.addEventListener('load', async_load, false);
+ }
+}).call(this);
</ins></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (25156 => 25157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/script-loader.php 2013-08-28 16:02:53 UTC (rev 25156)
+++ trunk/src/wp-includes/script-loader.php 2013-08-28 16:08:19 UTC (rev 25157)
</span><span class="lines">@@ -309,7 +309,12 @@
</span><span class="cx"> 'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), false, 1 );
</del><ins>+ $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 );
</ins><span class="cx"> did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
</span><span class="cx"> 'empty' => __('Strength indicator'),
</span><span class="cx"> 'short' => __('Very weak'),
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (25156 => 25157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2013-08-28 16:02:53 UTC (rev 25156)
+++ trunk/src/wp-includes/version.php 2013-08-28 16:08:19 UTC (rev 25157)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.7-alpha-25000';
</del><ins>+$wp_version = '3.7-alpha-25157';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre>
</div>
</div>
</body>
</html>