<!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>[36242] trunk: Ensure `wp_get_referer()` returns `false` when the referrer URL is the current URL.</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/36242">36242</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/36242","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-09 14:35:03 +0000 (Sat, 09 Jan 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'>Ensure `wp_get_referer()` returns `false` when the referrer URL is the current URL.
Adds unit tests.
Fixes <a href="https://core.trac.wordpress.org/ticket/19856">#19856</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsrefererphp">trunk/tests/phpunit/tests/functions/referer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2016-01-09 14:28:02 UTC (rev 36241)
+++ trunk/src/wp-includes/functions.php 2016-01-09 14:35:03 UTC (rev 36242)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1525,8 +1525,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $ref = wp_unslash( $_SERVER['HTTP_REFERER'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) && $ref !== home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_validate_redirect( $ref, false );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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="trunktestsphpunittestsfunctionsrefererphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/functions/referer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/referer.php (rev 0)
+++ trunk/tests/phpunit/tests/functions/referer.php 2016-01-09 14:35:03 UTC (rev 36242)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,125 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Test wp_get_referer().
+ *
+ * @group functions.php
+ */
+class Tests_Functions_Referer extends WP_UnitTestCase {
+ private $request = array();
+ private $server = array();
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->server = $_SERVER;
+ $this->request = $_REQUEST;
+ }
+
+ public function tearDown() {
+ parent::tearDown();
+
+ $_SERVER = $this->server;
+ $_REQUEST = $this->request;
+ }
+
+ public function _fake_subfolder_install() {
+ return 'http://example.org/subfolder';
+ }
+
+ public function filter_allowed_redirect_hosts( $hosts ) {
+ $hosts[] = 'another.example.org';
+
+ return $hosts;
+ }
+
+ public function test_from_request_relative_referrer() {
+ $_REQUEST['_wp_http_referer'] = addslashes( '/test.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertFalse( wp_get_referer() );
+ }
+
+ public function test_from_request_same_url() {
+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/test.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertFalse( wp_get_referer() );
+ }
+
+ public function test_from_request_different_resource() {
+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/another.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertSame( 'http://example.org/another.php?id=123', wp_get_referer() );
+ }
+
+ public function test_from_request_different_query_args() {
+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/test.php?another=555' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertSame( 'http://example.org/test.php?another=555', wp_get_referer() );
+ }
+
+ /**
+ * @ticket 19856
+ */
+ public function test_from_request_subfolder_install() {
+ add_filter( 'site_url', array( $this, '_fake_subfolder_install' ) );
+
+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/subfolder/test.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/subfolder/test.php?id=123' );
+ $this->assertFalse( wp_get_referer() );
+
+ remove_filter( 'site_url', array( $this, '_fake_subfolder_install' ) );
+ }
+
+ /**
+ * @ticket 19856
+ */
+ public function test_from_request_subfolder_install_different_resource() {
+ add_filter( 'site_url', array( $this, '_fake_subfolder_install' ) );
+
+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/subfolder/another.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/subfolder/test.php?id=123' );
+ $this->assertSame( 'http://example.org/subfolder/another.php?id=123', wp_get_referer() );
+
+ remove_filter( 'site_url', array( $this, '_fake_subfolder_install' ) );
+ }
+
+ public function test_relative_referrer() {
+ $_REQUEST['HTTP_REFERER'] = addslashes( '/test.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertFalse( wp_get_referer() );
+ }
+
+ public function test_same_url() {
+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://example.org/test.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertFalse( wp_get_referer() );
+ }
+
+ public function test_different_resource() {
+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://example.org/another.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertSame( 'http://example.org/another.php?id=123', wp_get_referer() );
+ }
+
+ /**
+ * @ticket 19856
+ * @ticket 27152
+ */
+ public function test_different_server() {
+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://another.example.org/test.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertFalse( wp_get_referer() );
+ }
+
+ /**
+ * @ticket 19856
+ * @ticket 27152
+ */
+ public function test_different_server_allowed_redirect_host() {
+ add_filter( 'allowed_redirect_hosts', array( $this, 'filter_allowed_redirect_hosts' ) );
+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://another.example.org/test.php?id=123' );
+ $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
+ $this->assertSame( 'http://another.example.org/test.php?id=123', wp_get_referer() );
+ remove_filter( 'allowed_redirect_hosts', array( $this, 'filter_allowed_redirect_hosts' ) );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/functions/referer.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>