<!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>[25637] trunk: Expand the zxcvbn password meter blacklist, based on user input.</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/25637">25637</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-28 06:46:29 +0000 (Sat, 28 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expand the zxcvbn password meter blacklist, based on user input.
props iandunn.
see <a href="http://core.trac.wordpress.org/ticket/25174">#25174</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjspasswordstrengthmeterjs">trunk/src/wp-admin/js/password-strength-meter.js</a></li>
<li><a href="#trunksrcwpadminjsuserprofilejs">trunk/src/wp-admin/js/user-profile.js</a></li>
<li><a href="#trunktestsqunitwpadminjspasswordstrengthmeterjs">trunk/tests/qunit/wp-admin/js/password-strength-meter.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjspasswordstrengthmeterjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/password-strength-meter.js (25636 => 25637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/password-strength-meter.js 2013-09-28 06:36:17 UTC (rev 25636)
+++ trunk/src/wp-admin/js/password-strength-meter.js 2013-09-28 06:46:29 UTC (rev 25637)
</span><span class="lines">@@ -1,6 +1,74 @@
</span><del>-function passwordStrength(password1, username, password2) {
- if (password1 != password2 && password2.length > 0)
- return 5;
- var result = zxcvbn( password1, [ username ] );
- return result.score;
-}
</del><ins>+window.wp = window.wp || {};
+
+var passwordStrength;
+(function($){
+ wp.passwordStrength = {
+ /**
+ * Determine the strength of a given password
+ *
+ * @param string password1 The password
+ * @param array blacklist An array of words that will lower the entropy of the password
+ * @param string password2 The confirmed password
+ */
+ meter : function( password1, blacklist, password2 ) {
+ if ( ! $.isArray( blacklist ) )
+ blacklist = [ blacklist.toString() ];
+
+ if (password1 != password2 && password2.length > 0)
+ return 5;
+
+ var result = zxcvbn( password1, blacklist );
+ return result.score;
+ },
+
+ /**
+ * Builds an array of data that should be penalized, because it would lower the entropy of a password if it were used
+ *
+ * @return array The array of data to be blacklisted
+ */
+ userInputBlacklist : function() {
+ var i, userInputFieldsLength, rawValuesLength, currentField,
+ rawValues = [],
+ blacklist = [],
+ userInputFields = [ 'user_login', 'first_name', 'last_name', 'nickname', 'display_name', 'email', 'url', 'description', 'weblog_title', 'admin_email' ];
+
+ // Collect all the strings we want to blacklist
+ rawValues.push( document.title );
+ rawValues.push( document.URL );
+
+ userInputFieldsLength = userInputFields.length;
+ for ( i = 0; i < userInputFieldsLength; i++ ) {
+ currentField = $( '#' + userInputFields[ i ] );
+
+ if ( 0 == currentField.length ) {
+ continue;
+ }
+
+ rawValues.push( currentField[0].defaultValue );
+ rawValues.push( currentField.val() );
+ }
+
+ // Strip out non-alphanumeric characters and convert each word to an individual entry
+ rawValuesLength = rawValues.length;
+ for ( i = 0; i < rawValuesLength; i++ ) {
+ if ( rawValues[ i ] ) {
+ blacklist = blacklist.concat( rawValues[ i ].replace( /\W/g, ' ' ).split( ' ' ) );
+ }
+ }
+
+ // Remove empty values, short words, and duplicates. Short words are likely to cause many false positives.
+ blacklist = $.grep( blacklist, function( value, key ) {
+ if ( '' == value || 4 > value.length ) {
+ return false;
+ }
+
+ return $.inArray( value, blacklist ) === key;
+ });
+
+ return blacklist;
+ }
+ }
+
+ // Backwards compatibility.
+ passwordStrength = wp.passwordStrength.meter;
+})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpadminjsuserprofilejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/user-profile.js (25636 => 25637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/user-profile.js 2013-09-28 06:36:17 UTC (rev 25636)
+++ trunk/src/wp-admin/js/user-profile.js 2013-09-28 06:46:29 UTC (rev 25637)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- strength = passwordStrength(pass1, user, pass2);
</del><ins>+ strength = wp.passwordStrength.meter( pass1, wp.passwordStrength.userInputBlacklist(), pass2 );
</ins><span class="cx">
</span><span class="cx"> switch ( strength ) {
</span><span class="cx"> case 2:
</span></span></pre></div>
<a id="trunktestsqunitwpadminjspasswordstrengthmeterjs"></a>
<div class="modfile"><h4>Modified: trunk/tests/qunit/wp-admin/js/password-strength-meter.js (25636 => 25637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/qunit/wp-admin/js/password-strength-meter.js 2013-09-28 06:36:17 UTC (rev 25636)
+++ trunk/tests/qunit/wp-admin/js/password-strength-meter.js 2013-09-28 06:46:29 UTC (rev 25637)
</span><span class="lines">@@ -77,15 +77,23 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- test( 'username in password should be penalized', function() {
</del><ins>+ test( 'blacklisted words in password should be penalized', function() {
</ins><span class="cx"> var allowedPasswordScore, penalizedPasswordScore,
</span><span class="cx"> allowedPassword = 'a[janedoe]4',
</span><span class="cx"> penalizedPassword = 'a[johndoe]4',
</span><del>- username = 'johndoe';
</del><ins>+ blacklist = [ 'extra', 'johndoe', 'superfluous' ];
</ins><span class="cx">
</span><del>- allowedPasswordScore = passwordStrength( allowedPassword, username, allowedPassword );
- penalizedPasswordScore = passwordStrength( penalizedPassword, username, penalizedPassword );
</del><ins>+ allowedPasswordScore = passwordStrength( allowedPassword, blacklist, allowedPassword );
+ penalizedPasswordScore = passwordStrength( penalizedPassword, blacklist, penalizedPassword );
</ins><span class="cx">
</span><span class="cx"> ok( penalizedPasswordScore < allowedPasswordScore, 'Penalized password scored ' + penalizedPasswordScore + '; allowed password scored: ' + allowedPasswordScore );
</span><span class="cx"> });
</span><ins>+
+ test( 'user input blacklist array should contain expected words', function() {
+ var blacklist = wp.passwordStrength.userInputBlacklist();
+
+ ok( jQuery.isArray( blacklist ), 'blacklist is an array' );
+ ok( jQuery.inArray( 'WordPress', blacklist ) > -1, 'blacklist contains "WordPress" from page title' );
+ ok( jQuery.inArray( 'tests', blacklist ) > -1, 'blacklist contains "tests" from site URL' );
+ });
</ins><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>