<!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>[46472] trunk: Formatting: In `wp_validate_redirect()`, normalize the path when validating the location for relative URLs, to account for Windows paths.</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 { white-space: pre-line; 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/46472">46472</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/46472","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-10-14 10:50:41 +0000 (Mon, 14 Oct 2019)</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'>Formatting: In `wp_validate_redirect()`, normalize the path when validating the location for relative URLs, to account for Windows paths.
Props peterwilsoncc, rconde, jmmathc, mat-lipe, Sixes, justinahinon, cmagrin, daxelrod, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/47980">#47980</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunktestsphpunittestsformattingredirectphp">trunk/tests/phpunit/tests/formatting/redirect.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2019-10-13 10:00:18 UTC (rev 46471)
+++ trunk/src/wp-includes/pluggable.php 2019-10-14 10:50:41 UTC (rev 46472)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1418,6 +1418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = dirname( parse_url( 'http://placeholder' . $_SERVER['REQUEST_URI'], PHP_URL_PATH ) . '?' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = wp_normalize_path( $path );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $location = '/' . ltrim( $path . '/', '/' ) . $location;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingredirectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/redirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/redirect.php 2019-10-13 10:00:18 UTC (rev 46471)
+++ trunk/tests/phpunit/tests/formatting/redirect.php 2019-10-14 10:50:41 UTC (rev 46472)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,4 +141,79 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'http://user.pass@#example.com/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 47980
+ * @dataProvider relative_url_provider
+ */
+ function test_wp_validate_redirect_relative_url( $current_uri, $url, $expected ) {
+ // Backup the global.
+ $unset = false;
+ if ( ! isset( $_SERVER['REQUEST_URI'] ) ) {
+ $unset = true;
+ } else {
+ $backup_request_uri = $_SERVER['REQUEST_URI'];
+ }
+
+ // Set the global to current URI.
+ $_SERVER['REQUEST_URI'] = $current_uri;
+
+ $this->assertEquals( $expected, wp_validate_redirect( $url, false ) );
+
+ // Delete or reset the global as required.
+ if ( $unset ) {
+ unset( $_SERVER['REQUEST_URI'] );
+ } else {
+ $_SERVER['REQUEST_URI'] = $backup_request_uri;
+ }
+ }
+
+ /**
+ * Data provider for test_wp_validate_redirect_relative_url.
+ *
+ * @return array[] {
+ * string Current URI (i.e. path and query string only).
+ * string Redirect requested.
+ * string Expected destination.
+ * }
+ */
+ function relative_url_provider() {
+ return array(
+ array(
+ '/',
+ 'wp-login.php?loggedout=true',
+ '/wp-login.php?loggedout=true',
+ ),
+ array(
+ '/src/',
+ 'wp-login.php?loggedout=true',
+ '/src/wp-login.php?loggedout=true',
+ ),
+ array(
+ '/wp-admin/settings.php?page=my-plugin',
+ './settings.php?page=my-plugin',
+ '/wp-admin/./settings.php?page=my-plugin',
+ ),
+ array(
+ '/wp-admin/settings.php?page=my-plugin',
+ '/wp-login.php',
+ '/wp-login.php',
+ ),
+ array(
+ '/wp-admin/settings.php?page=my-plugin',
+ '../wp-admin/admin.php?page=my-plugin',
+ '/wp-admin/../wp-admin/admin.php?page=my-plugin',
+ ),
+ array(
+ '/2019/10/13/my-post',
+ '../../',
+ '/2019/10/13/../../',
+ ),
+ array(
+ '/2019/10/13/my-post',
+ '/',
+ '/',
+ ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>