<!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>[42770] trunk: Add pre-save content filter to make target=_blank always secure.</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/42770">42770</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/42770","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-03-02 14:41:04 +0000 (Fri, 02 Mar 2018)</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'>Add pre-save content filter to make target=_blank always secure.
Props notnownikki, iseulde, azaozz
Fixes <a href="https://core.trac.wordpress.org/ticket/43187">#43187</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestattachmentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsformattingWPTargetedLinkRelphp">trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2018-03-02 10:01:39 UTC (rev 42769)
+++ trunk/src/wp-includes/default-filters.php 2018-03-02 14:41:04 UTC (rev 42770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,6 +104,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( $filter, 'balanceTags', 50 );
</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">+// Add proper rel values for links with target.
+foreach ( array(
+ 'title_save_pre',
+ 'content_save_pre',
+ 'excerpt_save_pre',
+ 'content_filtered_save_pre',
+ 'pre_comment_content',
+ 'pre_term_description',
+ 'pre_link_description',
+ 'pre_link_notes',
+ 'pre_user_description',
+) as $filter ) {
+ add_filter( $filter, 'wp_targeted_link_rel' );
+};
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Format strings for display.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( $filter, 'wptexturize' );
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></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/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2018-03-02 10:01:39 UTC (rev 42769)
+++ trunk/src/wp-includes/formatting.php 2018-03-02 14:41:04 UTC (rev 42770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3024,6 +3024,69 @@
</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">+ * Adds rel noreferrer and noopener to all HTML A elements that have a target.
+ *
+ * @param string $text Content that may contain HTML A elements.
+ * @return string Converted content.
+ */
+function wp_targeted_link_rel( $text ) {
+ // Don't run (more expensive) regex if no links with targets.
+ if ( stripos( $text, 'target' ) !== false && stripos( $text, '<a ' ) !== false ) {
+ $text = preg_replace_callback( '|<a\s([^>]*target\s*=[^>]*)>|i', 'wp_targeted_link_rel_callback', $text );
+ }
+
+ return $text;
+}
+
+/**
+ * Callback to add rel="noreferrer noopener" string to HTML A element.
+ *
+ * Will not duplicate existing noreferrer and noopener values
+ * to prevent from invalidating the HTML.
+ *
+ * @param array $matches Single Match
+ * @return string HTML A Element with rel noreferrer noopener in addition to any existing values
+ */
+function wp_targeted_link_rel_callback( $matches ) {
+ $link_html = $matches[1];
+ $rel_match = array();
+
+ /**
+ * Filters the rel values that are added to links with `target` attribute.
+ *
+ * @since 5.0.0
+ *
+ * @param string The rel values.
+ * @param string $link_html The matched content of the link tag including all HTML attributes.
+ */
+ $rel = apply_filters( 'wp_targeted_link_rel', 'noopener noreferrer', $link_html );
+
+ // Value with delimiters, spaces around are optional.
+ $attr_regex = '|rel\s*=\s*?(\\\\{0,1}["\'])(.*?)\\1|i';
+ preg_match( $attr_regex, $link_html, $rel_match );
+
+ if ( empty( $rel_match[0] ) ) {
+ // No delimiters, try with a single value and spaces, because `rel = va"lue` is totally fine...
+ $attr_regex = '|rel\s*=(\s*)([^\s]*)|i';
+ preg_match( $attr_regex, $link_html, $rel_match );
+ }
+
+ if ( ! empty( $rel_match[0] ) ) {
+ $parts = preg_split( '|\s+|', strtolower( $rel_match[2] ) );
+ $parts = array_map( 'esc_attr', $parts );
+ $needed = explode( ' ', $rel );
+ $parts = array_unique( array_merge( $parts, $needed ) );
+ $delimiter = trim( $rel_match[1] ) ? $rel_match[1] : '"';
+ $rel = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter;
+ $link_html = str_replace( $rel_match[0], $rel, $link_html );
+ } else {
+ $link_html .= " rel=\"$rel\"";
+ }
+
+ return "<a $link_html>";
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Convert one smiley code to the icon graphic file equivalent.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Callback handler for convert_smilies().
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTargetedLinkRelphp"></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/formatting/WPTargetedLinkRel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php (rev 0)
+++ trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php 2018-03-02 14:41:04 UTC (rev 42770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,74 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group formatting
+ * @ticket 43187
+ */
+class Tests_Targeted_Link_Rel extends WP_UnitTestCase {
+
+ public function test_add_to_links_with_target_blank() {
+ $content = '<p>Links: <a href="/" target="_blank">No rel</a></p>';
+ $expected = '<p>Links: <a href="/" target="_blank" rel="noopener noreferrer">No rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_add_to_links_with_target_foo() {
+ $content = '<p>Links: <a href="/" target="foo">No rel</a></p>';
+ $expected = '<p>Links: <a href="/" target="foo" rel="noopener noreferrer">No rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_target_as_first_attribute() {
+ $content = '<p>Links: <a target="_blank" href="#">No rel</a></p>';
+ $expected = '<p>Links: <a target="_blank" href="#" rel="noopener noreferrer">No rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_add_to_existing_rel() {
+ $content = '<p>Links: <a href="/" rel="existing values" target="_blank">Existing rel</a></p>';
+ $expected = '<p>Links: <a href="/" rel="existing values noopener noreferrer" target="_blank">Existing rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_no_duplicate_values_added() {
+ $content = '<p>Links: <a href="/" rel="existing noopener values" target="_blank">Existing rel</a></p>';
+ $expected = '<p>Links: <a href="/" rel="existing noopener values noreferrer" target="_blank">Existing rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_rel_with_single_quote_delimiter() {
+ $content = '<p>Links: <a href="/" rel=\'existing values\' target="_blank">Existing rel</a></p>';
+ $expected = '<p>Links: <a href="/" rel=\'existing values noopener noreferrer\' target="_blank">Existing rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_rel_with_no_delimiter() {
+ $content = '<p>Links: <a href="/" rel=existing target="_blank">Existing rel</a></p>';
+ $expected = '<p>Links: <a href="/" rel="existing noopener noreferrer" target="_blank">Existing rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_rel_value_spaced_and_no_delimiter() {
+ $content = '<p>Links: <a href="/" rel = existing target="_blank">Existing rel</a></p>';
+ $expected = '<p>Links: <a href="/" rel="existing noopener noreferrer" target="_blank">Existing rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_rel_value_spaced_and_no_delimiter_and_values_to_escape() {
+ $content = '<p>Links: <a href="/" rel = existing"value target="_blank">Existing rel</a></p>';
+ $expected = '<p>Links: <a href="/" rel="existing"value noopener noreferrer" target="_blank">Existing rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_escaped_quotes() {
+ $content = '<p>Links: <a href=\"/\" rel=\"existing values\" target=\"_blank\">Existing rel</a></p>';
+ $expected = '<p>Links: <a href=\"/\" rel=\"existing values noopener noreferrer\" target=\"_blank\">Existing rel</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+
+ public function test_ignore_links_with_no_target() {
+ $content = '<p>Links: <a href="/" target="_blank">Change me</a> <a href="/">Do not change me</a></p>';
+ $expected = '<p>Links: <a href="/" target="_blank" rel="noopener noreferrer">Change me</a> <a href="/">Do not change me</a></p>';
+ $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsrestapirestattachmentscontrollerphp"></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/rest-api/rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2018-03-02 10:01:39 UTC (rev 42769)
+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2018-03-02 14:41:04 UTC (rev 42770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,12 +1015,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<a href="#">link</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'raw' => '<a href="#" target="_blank">link</a>',
- 'rendered' => '<p><a href="#" target="_blank">link</a></p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>',
+ 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'raw' => '<a href="#" target="_blank">link</a>',
- 'rendered' => '<p><a href="#" target="_blank">link</a></p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>',
+ 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>',
</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></pre></div>
<a id="trunktestsphpunittestsrestapirestpostscontrollerphp"></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/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2018-03-02 10:01:39 UTC (rev 42769)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2018-03-02 14:41:04 UTC (rev 42770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3185,12 +3185,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<a href="#">link</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'raw' => '<a href="#" target="_blank">link</a>',
- 'rendered' => '<p><a href="#" target="_blank">link</a></p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>',
+ 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'raw' => '<a href="#" target="_blank">link</a>',
- 'rendered' => '<p><a href="#" target="_blank">link</a></p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>',
+ 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>',
</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></pre>
</div>
</div>
</body>
</html>