<!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>[52309] trunk: KSES: Accept port number in PDF upload 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/52309">52309</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/52309","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-03 02:42:17 +0000 (Fri, 03 Dec 2021)</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'>KSES: Accept port number in PDF upload paths.
Improves the URL validation in `_wp_kses_allow_pdf_objects()` to account for sites using an upload path that contains a port, for example wp.org:8080.
Follow up to <a href="https://core.trac.wordpress.org/changeset/51963">[51963]</a>, <a href="https://core.trac.wordpress.org/changeset/52304">[52304]</a>.
Props ocean90, ramonopoly, talldanwp.
See <a href="https://core.trac.wordpress.org/ticket/54261">#54261</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesksesphp"></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/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php 2021-12-02 23:35:20 UTC (rev 52308)
+++ trunk/src/wp-includes/kses.php 2021-12-03 02:42:17 UTC (rev 52309)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2591,21 +2591,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The URL to check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the URL is safe, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wp_kses_allow_pdf_objects( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wp_kses_allow_pdf_objects( $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // We're not interested in URLs that contain query strings or fragments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $value, '?' ) !== false || strpos( $value, '#' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strpos( $url, '?' ) !== false || strpos( $url, '#' ) !== false ) {
</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 class="cx" style="display: block; padding: 0 10px"> // If it doesn't have a PDF extension, it's not safe.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 !== substr_compare( $value, '.pdf', -4, 4, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 !== substr_compare( $url, '.pdf', -4, 4, true ) ) {
</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 class="cx" style="display: block; padding: 0 10px"> // If the URL host matches the current site's media URL, it's safe.
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_info = wp_upload_dir( null, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upload_host = wp_parse_url( $upload_info['url'], PHP_URL_HOST );
- if ( 0 === strpos( $value, "http://$upload_host/" ) || 0 === strpos( $value, "https://$upload_host/" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_url = wp_parse_url( $upload_info['url'] );
+ $upload_host = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
+ $upload_port = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : '';
+ if ( 0 === strpos( $url, "http://$upload_host$upload_port/" ) || 0 === strpos( $url, "https://$upload_host$upload_port/" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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="trunktestsphpunittestsksesphp"></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/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/kses.php 2021-12-02 23:35:20 UTC (rev 52308)
+++ trunk/tests/phpunit/tests/kses.php 2021-12-03 02:42:17 UTC (rev 52309)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1596,10 +1596,65 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<object type="application/pdf" data="/cat/foo.pdf" />',
</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">+ 'url with port number-like path' => array(
+ '<object type="application/pdf" data="https://example.org/cat:8888/foo.pdf" />',
+ '<object type="application/pdf" data="https://example.org/cat:8888/foo.pdf" />',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">+ * Test that object tags are allowed when there is a port number in the URL.
+ *
+ * @ticket 54261
+ *
+ * @dataProvider data_wp_kses_object_data_url_with_port_number_allowed
+ *
+ * @param string $html A string of HTML to test.
+ * @param string $expected The expected result from KSES.
+ */
+ function test_wp_kses_object_data_url_with_port_number_allowed( $html, $expected ) {
+ add_filter( 'upload_dir', array( $this, 'wp_kses_upload_dir_filter' ), 10, 2 );
+ $this->assertSame( $expected, wp_kses_post( $html ) );
+ }
+
+ /**
+ * Data provider for test_wp_kses_object_data_url_with_port_number_allowed().
+ */
+ function data_wp_kses_object_data_url_with_port_number_allowed() {
+ return array(
+ 'url with port number' => array(
+ '<object type="application/pdf" data="https://example.org:8888/cat/foo.pdf" />',
+ '<object type="application/pdf" data="https://example.org:8888/cat/foo.pdf" />',
+ ),
+ 'url with port number and http protocol' => array(
+ '<object type="application/pdf" data="http://example.org:8888/cat/foo.pdf" />',
+ '<object type="application/pdf" data="http://example.org:8888/cat/foo.pdf" />',
+ ),
+ 'url with wrong port number' => array(
+ '<object type="application/pdf" data="http://example.org:3333/cat/foo.pdf" />',
+ '',
+ ),
+ 'url without port number' => array(
+ '<object type="application/pdf" data="http://example.org/cat/foo.pdf" />',
+ '',
+ ),
+ );
+ }
+
+ /**
+ * Filter upload directory for tests using port number.
+ *
+ * @param array $param See wp_upload_dir()
+ * @return array $param with a modified `url`.
+ */
+ public function wp_kses_upload_dir_filter( $param ) {
+ $url_with_port_number = is_string( $param['url'] ) ? str_replace( 'example.org', 'example.org:8888', $param['url'] ) : $param['url'];
+ $param['url'] = $url_with_port_number;
+ return $param;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test that object tags will continue to function if they've been added using the
</span><span class="cx" style="display: block; padding: 0 10px"> * 'wp_kses_allowed_html' filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>