<!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>[24467] branches/3.5: Validate post password hash.</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/24467">24467</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-06-21 03:02:28 +0000 (Fri, 21 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Validate post password hash.
Merges <a href="http://core.trac.wordpress.org/changeset/24466">[24466]</a> to the 3.5 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches35wpincludesposttemplatephp">branches/3.5/wp-includes/post-template.php</a></li>
<li><a href="#branches35wploginphp">branches/3.5/wp-login.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches35">branches/3.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.5
</span><span class="cx">===================================================================
</span><del>--- branches/3.5 2013-06-21 03:00:26 UTC (rev 24466)
</del><ins>+++ branches/3.5 2013-06-21 03:02:28 UTC (rev 24467)
</ins><a id="branches35"></a>
<div class="propset"><h4>Property changes: branches/3.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24446,24448,24457,24459,24461,24463
</del><ins>+/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24446,24448,24457,24459,24461,24463,24466
</ins><span class="cx">\ No newline at end of property
</span><a id="branches35wpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-includes/post-template.php (24466 => 24467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-includes/post-template.php 2013-06-21 03:00:26 UTC (rev 24466)
+++ branches/3.5/wp-includes/post-template.php 2013-06-21 03:02:28 UTC (rev 24467)
</span><span class="lines">@@ -567,8 +567,6 @@
</span><span class="cx"> * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
</span><span class="cx"> */
</span><span class="cx"> function post_password_required( $post = null ) {
</span><del>- global $wp_hasher;
-
</del><span class="cx"> $post = get_post($post);
</span><span class="cx">
</span><span class="cx"> if ( empty( $post->post_password ) )
</span><span class="lines">@@ -577,15 +575,14 @@
</span><span class="cx"> if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if ( empty( $wp_hasher ) ) {
- require_once( ABSPATH . 'wp-includes/class-phpass.php');
- // By default, use the portable hash from phpass
- $wp_hasher = new PasswordHash(8, true);
- }
</del><ins>+ require_once ABSPATH . 'wp-includes/class-phpass.php';
+ $hasher = new PasswordHash( 8, true );
</ins><span class="cx">
</span><span class="cx"> $hash = stripslashes( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
</span><ins>+ if ( 0 !== strpos( $hash, '$P$B' ) )
+ return true;
</ins><span class="cx">
</span><del>- return ! $wp_hasher->CheckPassword( $post->post_password, $hash );
</del><ins>+ return ! $hasher->CheckPassword( $post->post_password, $hash );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="branches35wploginphp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-login.php (24466 => 24467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-login.php 2013-06-21 03:00:26 UTC (rev 24466)
+++ branches/3.5/wp-login.php 2013-06-21 03:02:28 UTC (rev 24467)
</span><span class="lines">@@ -389,14 +389,11 @@
</span><span class="cx"> switch ($action) {
</span><span class="cx">
</span><span class="cx"> case 'postpass' :
</span><del>- if ( empty( $wp_hasher ) ) {
- require_once( ABSPATH . 'wp-includes/class-phpass.php' );
- // By default, use the portable hash from phpass
- $wp_hasher = new PasswordHash(8, true);
- }
</del><ins>+ require_once ABSPATH . 'wp-includes/class-phpass.php';
+ $hasher = new PasswordHash( 8, true );
</ins><span class="cx">
</span><span class="cx"> // 10 days
</span><del>- setcookie( 'wp-postpass_' . COOKIEHASH, $wp_hasher->HashPassword( stripslashes( $_POST['post_password'] ) ), time() + 10 * DAY_IN_SECONDS, COOKIEPATH );
</del><ins>+ setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( stripslashes( $_POST['post_password'] ) ), time() + 10 * DAY_IN_SECONDS, COOKIEPATH );
</ins><span class="cx">
</span><span class="cx"> wp_safe_redirect( wp_get_referer() );
</span><span class="cx"> exit();
</span></span></pre>
</div>
</div>
</body>
</html>