<!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>[36449] branches/4.2: Better validation of the URL used in HTTP redirects.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36449">36449</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36449","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-02 16:59:15 +0000 (Tue, 02 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Better validation of the URL used in HTTP redirects.
Merges <a href="https://core.trac.wordpress.org/changeset/36444">[36444]</a> to the 4.2 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches42srcwpincludespluggablephp">branches/4.2/src/wp-includes/pluggable.php</a></li>
<li><a href="#branches42testsphpunittestsformattingredirectphp">branches/4.2/tests/phpunit/tests/formatting/redirect.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches42srcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.2/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.2/src/wp-includes/pluggable.php 2016-02-02 16:59:00 UTC (rev 36448)
+++ branches/4.2/src/wp-includes/pluggable.php 2016-02-02 16:59:15 UTC (rev 36449)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1296,7 +1296,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // In php 5 parse_url may fail if the URL query part contains http://, bug #38143
</span><span class="cx" style="display: block; padding: 0 10px"> $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lp = parse_url($test);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @-operator is used to prevent possible warnings in PHP < 5.3.3.
+ $lp = @parse_url($test);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Give up if malformed URL
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $lp )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1306,10 +1307,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $default;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reject if scheme is set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
- if ( isset($lp['scheme']) && !isset($lp['host']) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
+ if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $default;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reject malformed components parse_url() can return on odd inputs.
+ foreach ( array( 'user', 'pass', 'host' ) as $component ) {
+ if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
+ return $default;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpp = parse_url(home_url());
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="branches42testsphpunittestsformattingredirectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.2/tests/phpunit/tests/formatting/redirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.2/tests/phpunit/tests/formatting/redirect.php 2016-02-02 16:59:00 UTC (rev 36448)
+++ branches/4.2/tests/phpunit/tests/formatting/redirect.php 2016-02-02 16:59:15 UTC (rev 36449)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,8 +3,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group pluggable
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group redirect
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_Redirect extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function setUp() {
+ add_filter( 'home_url', array( $this, 'home_url' ) );
+ }
+
+ function tearDown() {
+ remove_filter( 'home_url', array( $this, 'home_url' ) );
+ }
+
+ function home_url() {
+ return 'http://example.com/';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_wp_sanitize_redirect() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('http://example.com/watchthelinefeedgo', wp_sanitize_redirect('http://example.com/watchthelinefeed%0Ago'));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('http://example.com/watchthelinefeedgo', wp_sanitize_redirect('http://example.com/watchthelinefeed%0ago'));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,4 +32,96 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('http://[2606:2800:220:6d:26bf:1447:aa7]/', wp_sanitize_redirect('http://[2606:2800:220:6d:26bf:1447:aa7]/'));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('http://example.com/search.php?search=(amistillhere)', wp_sanitize_redirect('http://example.com/search.php?search=(amistillhere)'));
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @dataProvider valid_url_provider
+ */
+ function test_wp_validate_redirect_valid_url( $url, $expected ) {
+ $this->assertEquals( $expected, wp_validate_redirect( $url ) );
+ }
+
+ /**
+ * @dataProvider invalid_url_provider
+ */
+ function test_wp_validate_redirect_invalid_url( $url ) {
+ $this->assertEquals( false, wp_validate_redirect( $url, false ) );
+ }
+
+ function valid_url_provider() {
+ return array(
+ array( 'http://example.com', 'http://example.com' ),
+ array( 'http://example.com/', 'http://example.com/' ),
+ array( 'https://example.com/', 'https://example.com/' ),
+ array( '//example.com', 'http://example.com' ),
+ array( '//example.com/', 'http://example.com/' ),
+ array( 'http://example.com/?foo=http://example.com/', 'http://example.com/?foo=http://example.com/' ),
+ array( 'http://user@example.com/', 'http://user@example.com/' ),
+ array( 'http://user:@example.com/', 'http://user:@example.com/' ),
+ array( 'http://user:pass@example.com/', 'http://user:pass@example.com/' ),
+ );
+ }
+
+ function invalid_url_provider() {
+ return array(
+ // parse_url() fails
+ array( '' ),
+ array( 'http://:' ),
+
+ // non-safelisted domain
+ array( 'http://non-safelisted.example/' ),
+
+ // unsupported schemes
+ array( 'data:text/plain;charset=utf-8,Hello%20World!' ),
+ array( 'file:///etc/passwd' ),
+ array( 'ftp://example.com/' ),
+
+ // malformed input
+ array( 'http:example.com' ),
+ array( 'http:80' ),
+ array( 'http://example.com:1234:5678/' ),
+ array( 'http://user:pa:ss@example.com/' ),
+
+ array( 'http://user@@example.com' ),
+ array( 'http://user@:example.com' ),
+ array( 'http://user?@example.com' ),
+ array( 'http://user@?example.com' ),
+ array( 'http://user#@example.com' ),
+ array( 'http://user@#example.com' ),
+
+ array( 'http://user@@example.com/' ),
+ array( 'http://user@:example.com/' ),
+ array( 'http://user?@example.com/' ),
+ array( 'http://user@?example.com/' ),
+ array( 'http://user#@example.com/' ),
+ array( 'http://user@#example.com/' ),
+
+ array( 'http://user:pass@@example.com' ),
+ array( 'http://user:pass@:example.com' ),
+ array( 'http://user:pass?@example.com' ),
+ array( 'http://user:pass@?example.com' ),
+ array( 'http://user:pass#@example.com' ),
+ array( 'http://user:pass@#example.com' ),
+
+ array( 'http://user:pass@@example.com/' ),
+ array( 'http://user:pass@:example.com/' ),
+ array( 'http://user:pass?@example.com/' ),
+ array( 'http://user:pass@?example.com/' ),
+ array( 'http://user:pass#@example.com/' ),
+ array( 'http://user:pass@#example.com/' ),
+
+ array( 'http://user.pass@@example.com' ),
+ array( 'http://user.pass@:example.com' ),
+ array( 'http://user.pass?@example.com' ),
+ array( 'http://user.pass@?example.com' ),
+ array( 'http://user.pass#@example.com' ),
+ array( 'http://user.pass@#example.com' ),
+
+ array( 'http://user.pass@@example.com/' ),
+ array( 'http://user.pass@:example.com/' ),
+ array( 'http://user.pass?@example.com/' ),
+ array( 'http://user.pass@?example.com/' ),
+ array( 'http://user.pass#@example.com/' ),
+ array( 'http://user.pass@#example.com/' ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>