<!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>[24916] branches/3.6: Additional checks when evaluating the safety of an HTTP request, to avoid false negatives.</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/24916">24916</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-07-31 06:46:02 +0000 (Wed, 31 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Additional checks when evaluating the safety of an HTTP request, to avoid false negatives.
Merges <a href="http://core.trac.wordpress.org/changeset/24915">[24915]</a> to the 3.6 branch.
fixes <a href="http://core.trac.wordpress.org/ticket/24646">#24646</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches36wpincludesdefaultfiltersphp">branches/3.6/wp-includes/default-filters.php</a></li>
<li><a href="#branches36wpincludeshttpphp">branches/3.6/wp-includes/http.php</a></li>
<li><a href="#branches36wpincludesmsdefaultfiltersphp">branches/3.6/wp-includes/ms-default-filters.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches36">branches/3.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.6
</span><span class="cx">===================================================================
</span><del>--- branches/3.6 2013-07-31 06:44:57 UTC (rev 24915)
</del><ins>+++ branches/3.6 2013-07-31 06:46:02 UTC (rev 24916)
</ins><a id="branches36"></a>
<div class="propset"><h4>Property changes: branches/3.6</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,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895,24902,24913
</del><ins>+/trunk:18512,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895,24902,24913,24915
</ins><span class="cx">\ No newline at end of property
</span><a id="branches36wpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/default-filters.php (24915 => 24916)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/default-filters.php 2013-07-31 06:44:57 UTC (rev 24915)
+++ branches/3.6/wp-includes/default-filters.php 2013-07-31 06:46:02 UTC (rev 24916)
</span><span class="lines">@@ -196,6 +196,8 @@
</span><span class="cx"> add_filter( 'pingback_ping_source_uri', 'pingback_ping_source_uri' );
</span><span class="cx"> add_filter( 'xmlrpc_pingback_error', 'xmlrpc_pingback_error' );
</span><span class="cx">
</span><ins>+add_filter( 'http_request_host_is_external', 'allowed_http_request_hosts', 10, 2 );
+
</ins><span class="cx"> // Actions
</span><span class="cx"> add_action( 'wp_head', 'wp_enqueue_scripts', 1 );
</span><span class="cx"> add_action( 'wp_head', 'feed_links', 2 );
</span></span></pre></div>
<a id="branches36wpincludeshttpphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/http.php (24915 => 24916)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/http.php 2013-07-31 06:44:57 UTC (rev 24915)
+++ branches/3.6/wp-includes/http.php 2013-07-31 06:46:02 UTC (rev 24916)
</span><span class="lines">@@ -451,15 +451,16 @@
</span><span class="cx"> $ip = false;
</span><span class="cx"> }
</span><span class="cx"> if ( $ip ) {
</span><del>- if ( '127.0.0.1' === $ip )
- return false;
</del><span class="cx"> $parts = array_map( 'intval', explode( '.', $ip ) );
</span><del>- if ( 10 === $parts[0] )
- return false;
- if ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] )
- return false;
- if ( 192 === $parts[0] && 168 === $parts[1] )
- return false;
</del><ins>+ if ( '127.0.0.1' === $ip
+ || ( 10 === $parts[0] )
+ || ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] )
+ || ( 192 === $parts[0] && 168 === $parts[1] )
+ ) {
+ // If host appears local, reject unless specifically allowed.
+ if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) )
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -475,3 +476,44 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+/**
+ * Whitelists allowed redirect hosts for safe HTTP requests as well.
+ *
+ * Attached to the http_request_host_is_external filter.
+ *
+ * @since 3.6.0
+ *
+ * @param bool $is_external
+ * @param string $host
+ * @return bool
+ */
+function allowed_http_request_hosts( $is_external, $host ) {
+ if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) )
+ $is_external = true;
+ return $is_external;
+}
+
+/**
+ * Whitelists any domain in a multisite installation for safe HTTP requests.
+ *
+ * Attached to the http_request_host_is_external filter.
+ *
+ * @since 3.6.0
+ *
+ * @param bool $is_external
+ * @param string $host
+ * @return bool
+ */
+function ms_allowed_http_request_hosts( $is_external, $host ) {
+ global $wpdb, $current_site;
+ static $queried = array();
+ if ( $is_external )
+ return $is_external;
+ if ( $host === $current_site->domain )
+ return true;
+ if ( isset( $queried[ $host ] ) )
+ return $queried[ $host ];
+ $queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
+ return $queried[ $host ];
+}
</ins></span></pre></div>
<a id="branches36wpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/ms-default-filters.php (24915 => 24916)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/ms-default-filters.php 2013-07-31 06:44:57 UTC (rev 24915)
+++ branches/3.6/wp-includes/ms-default-filters.php 2013-07-31 06:46:02 UTC (rev 24916)
</span><span class="lines">@@ -63,4 +63,7 @@
</span><span class="cx"> remove_filter( 'option_home', '_config_wp_home' );
</span><span class="cx">
</span><span class="cx"> // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.
</span><del>-add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
</del><span class="cx">\ No newline at end of file
</span><ins>+add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
+
+// Whitelist multisite domains for HTTP requests
+add_filter( 'http_request_host_is_external', 'ms_allowed_http_request_hosts', 20, 2 );
</ins></span></pre>
</div>
</div>
</body>
</html>