<!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>[BuddyPress][10044] trunk: Core: Fix issue with `bp_verify_nonce_request()` when a port is used in the home 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="http://buddypress.trac.wordpress.org/changeset/10044">10044</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10044","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-11 17:03:48 +0000 (Tue, 11 Aug 2015)</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'>Core: Fix issue with `bp_verify_nonce_request()` when a port is used in the home URL.
When a site is using a port for their home URL, `bp_verify_nonce_request()`
can sometimes fail. This is because the port is duplicated twice due to
`$_SERVER['HTTP_HOST']` including the port number and we're appending the
port number again with `$_SERVER['SERVER_PORT']`.
This commit appends `$_SERVER['SERVER_PORT']` if `$_SERVER['HTTP_HOST']`
does not already include the port number and includes a unit test.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6528">#6528</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestcasescorefunctionsbpVerifyNonceRequestphp">trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2015-08-11 16:54:03 UTC (rev 10043)
+++ trunk/src/bp-core/bp-core-functions.php 2015-08-11 17:03:48 UTC (rev 10044)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2055,7 +2055,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Requested URL *********************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Maybe include the port, if it's included in home_url()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $parsed_home['port'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $parsed_home['port'] ) && false === strpos( $_SERVER['HTTP_HOST'], ':' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request_host = $_SERVER['HTTP_HOST'] . ':' . $_SERVER['SERVER_PORT'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $request_host = $_SERVER['HTTP_HOST'];
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorefunctionsbpVerifyNonceRequestphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php (rev 0)
+++ trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php 2015-08-11 17:03:48 UTC (rev 10044)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,81 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group core
+ * @group functions
+ * @group bp_verify_nonce_request
+ */
+class BP_Tests_Core_Functions_BPVerifyNonceRequest extends BP_UnitTestCase {
+ private $http_host = '';
+ private $server_port = '';
+ private $request_uri = '';
+
+ public function setUp() {
+ parent::setUp();
+
+ if ( isset( $_SERVER['HTTP_HOST'] ) ) {
+ $this->http_host = $_SERVER['HTTP_HOST'];
+ }
+
+ if ( isset( $_SERVER['SERVER_PORT'] ) ) {
+ $this->server_port = $_SERVER['SERVER_PORT'];
+ }
+
+ if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+ $this->request_uri = $_SERVER['REQUEST_URI'];
+ }
+ }
+
+ public function tearDown() {
+ if ( '' !== $this->http_host ) {
+ $_SERVER['HTTP_HOST'] = $this->http_host;
+ }
+
+ if ( '' !== $this->server_port ) {
+ $_SERVER['SERVER_PORT'] = $this->server_port;
+ }
+
+ if ( '' !== $this->request_uri ) {
+ $_SERVER['REQUEST_URI'] = $this->request_uri;
+ }
+
+ parent::tearDown();
+ }
+
+ public function test_bp_verify_nonce_request_with_port_in_home_url_and_wordpress_installed_in_subdirectory() {
+ // fake various $_SERVER parameters
+ $host = explode( ':', $_SERVER['HTTP_HOST'] );
+ $_SERVER['HTTP_HOST'] = $host[0] . ':80';
+ $_SERVER['SERVER_PORT'] = 80;
+ $_SERVER['REQUEST_URI'] = '/wordpress/';
+
+ // add port number and subdirecotry to home URL for testing
+ add_filter( 'home_url', array( $this, 'add_port_and_subdirectory_to_home_url' ), 10, 3 );
+
+ // test bp_verify_nonce_request()
+ $action = 'verify-this';
+ $_REQUEST[$action] = wp_create_nonce( $action );
+ $test = bp_verify_nonce_request( $action, $action );
+
+ // clean up!
+ remove_filter( 'home_url', array( $this, 'add_port_and_subdirectory_to_home_url' ), 10, 3 );
+ unset( $_REQUEST[$action] );
+
+ // assert!
+ $this->assertSame( 1, $test );
+ }
+
+ /**
+ * Add port 80 and /wordpress/ subdirectory to home URL.
+ *
+ * @param string $url The complete home URL including scheme and path.
+ * @param string $path Path relative to the home URL. Blank string if no path is specified.
+ * @param string|null $orig_scheme Scheme to give the home URL context. Accepts 'http', 'https', 'relative' or null.
+ * @return string
+ */
+ public function add_port_and_subdirectory_to_home_url( $url, $path, $scheme ) {
+ $home = parse_url( get_option( 'home' ) );
+ $home_path = isset( $home['path'] ) ? $home['path'] : '';
+ return $scheme . $home['host'] . ':80' . $home_path . '/wordpress' . $path;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>