<!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>[29389] branches/3.9: Verify the MAC earlier in WP_Customize_Widgets.</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/29389">29389</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-08-06 05:50:20 +0000 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Verify the MAC earlier in WP_Customize_Widgets. props duck_.
Merges <a href="http://core.trac.wordpress.org/changeset/29377">[29377]</a> (and <a href="http://core.trac.wordpress.org/changeset/29028">[29028]</a>) to the 3.9 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches39srcwpincludesclasswpcustomizewidgetsphp">branches/3.9/src/wp-includes/class-wp-customize-widgets.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches39">branches/3.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.9
</span><span class="cx">===================================================================
</span><del>--- branches/3.9 2014-08-06 05:44:39 UTC (rev 29388)
</del><ins>+++ branches/3.9 2014-08-06 05:50:20 UTC (rev 29389)
</ins><a id="branches39"></a>
<div class="propset"><h4>Property changes: branches/3.9</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,28158,28161,28163,28165-28166,28168-28169,28171-28174,28176-28187,28189-28191,28193-28195,28203,28219,28223,28266,28269,28275-28276,28280,28284,29382
</del><ins>+/trunk:18512,28158,28161,28163,28165-28166,28168-28169,28171-28174,28176-28187,28189-28191,28193-28195,28203,28219,28223,28266,28269,28275-28276,28280,28284,29377,29382
</ins><span class="cx">\ No newline at end of property
</span><a id="branches39srcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4>Modified: branches/3.9/src/wp-includes/class-wp-customize-widgets.php (29388 => 29389)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.9/src/wp-includes/class-wp-customize-widgets.php 2014-08-06 05:44:39 UTC (rev 29388)
+++ branches/3.9/src/wp-includes/class-wp-customize-widgets.php 2014-08-06 05:50:20 UTC (rev 29389)
</span><span class="lines">@@ -1119,22 +1119,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get a widget instance's hash key.
</del><ins>+ * Get MAC for a serialized widget instance string.
</ins><span class="cx"> *
</span><del>- * Serialize an instance and hash it with the AUTH_KEY; when a JS value is
- * posted back to save, this instance hash key is used to ensure that the
- * serialized_instance was not tampered with, but that it had originated
- * from WordPress and so is sanitized.
</del><ins>+ * Allows values posted back from JS to be rejected if any tampering of the
+ * data has occurred.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.9.0
</span><span class="cx"> * @access protected
</span><span class="cx"> *
</span><del>- * @param array $instance Widget instance.
- * @return string Widget instance's hash key.
</del><ins>+ * @param string $serialized_instance Widget instance.
+ * @return string MAC for serialized widget instance.
</ins><span class="cx"> */
</span><del>- protected function get_instance_hash_key( $instance ) {
- $hash = md5( AUTH_KEY . serialize( $instance ) );
- return $hash;
</del><ins>+ protected function get_instance_hash_key( $serialized_instance ) {
+ return wp_hash( $serialized_instance );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1162,18 +1159,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $decoded = base64_decode( $value['encoded_serialized_instance'], true );
</span><del>-
</del><span class="cx"> if ( false === $decoded ) {
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><del>- $instance = unserialize( $decoded );
</del><span class="cx">
</span><del>- if ( false === $instance ) {
</del><ins>+ if ( $this->get_instance_hash_key( $decoded ) !== $value['instance_hash_key'] ) {
</ins><span class="cx"> return null;
</span><span class="cx"> }
</span><del>- if ( $this->get_instance_hash_key( $instance ) !== $value['instance_hash_key'] ) {
</del><ins>+
+ $instance = unserialize( $decoded );
+ if ( false === $instance ) {
</ins><span class="cx"> return null;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return $instance;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1194,7 +1192,7 @@
</span><span class="cx"> 'encoded_serialized_instance' => base64_encode( $serialized ),
</span><span class="cx"> 'title' => empty( $value['title'] ) ? '' : $value['title'],
</span><span class="cx"> 'is_widget_customizer_js_value' => true,
</span><del>- 'instance_hash_key' => $this->get_instance_hash_key( $value ),
</del><ins>+ 'instance_hash_key' => $this->get_instance_hash_key( $serialized ),
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx"> return $value;
</span></span></pre>
</div>
</div>
</body>
</html>