Ticket #43187: 43187.11.diff
| File 43187.11.diff, 9.5 KB (added by , 7 years ago) |
|---|
-
src/wp-includes/default-filters.php
104 104 add_filter( $filter, 'balanceTags', 50 ); 105 105 } 106 106 107 // Add proper rel values for links with target. 108 foreach ( array( 'pre_user_email', 'title_save_pre', 'pre_user_first_name', 'pre_term_description', 'pre_link_name', 'pre_link_target', 'pre_user_nickname', 'pre_comment_author_email', 'pre_link_notes', 'pre_user_last_name', 'pre_term_name', 'pre_user_display_name', 'pre_comment_content', 'pre_link_rel', 'content_save_pre', 'pre_user_description', 'content_filtered_save_pre', 'excerpt_save_pre', 'pre_comment_author_name', 'pre_link_description' ) as $filter ) { 109 add_filter( $filter, 'wp_targeted_link_rel' ); 110 }; 111 107 112 // Format strings for display. 108 113 foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) { 109 114 add_filter( $filter, 'wptexturize' ); -
src/wp-includes/formatting.php
3024 3024 } 3025 3025 3026 3026 /** 3027 * Adds rel noreferrer and noopener to all HTML A elements that have a target. 3028 * 3029 * @param string $text Content that may contain HTML A elements. 3030 * @return string Converted content. 3031 */ 3032 function wp_targeted_link_rel( $text ) { 3033 $text = preg_replace_callback( '|<a\s([^>]*target\s*=[^>]*)>|i', 'wp_targeted_link_rel_callback', $text ); 3034 return $text; 3035 } 3036 3037 /** 3038 * Callback to add rel="noreferrer noopener" string to HTML A element. 3039 * 3040 * Will not duplicate existing noreferrer and noopener values 3041 * to prevent from invalidating the HTML. 3042 * 3043 * @param array $matches Single Match 3044 * @return string HTML A Element with rel noreferrer noopener in addition to any existing values 3045 */ 3046 function wp_targeted_link_rel_callback( $matches ) { 3047 $link_html = $matches[1]; 3048 $rel_match = array(); 3049 3050 /** 3051 * Filters the rel values that are added to links with `target` attribute. 3052 * 3053 * @since 5.0.0 3054 * 3055 * @param string The rel values. 3056 * @param string $link_html The matched content of the link tag including all HTML attributes. 3057 */ 3058 $rel = apply_filters( 'wp_targeted_link_rel', 'noopener noreferrer', $link_html ); 3059 3060 // Value with delimiters, spaces around are optional. 3061 $attr_regex = '|rel\s*=\s*?(\\\\{0,1}["\'])(.*?)\\1|i'; 3062 preg_match( $attr_regex, $link_html, $rel_match ); 3063 3064 if ( empty( $rel_match[0] ) ) { 3065 // No delimiters, try with a single value and spaces, because `rel = va"lue` is totally fine... 3066 $attr_regex = '|rel\s*=(\s*)([^\s]*)|i'; 3067 preg_match( $attr_regex, $link_html, $rel_match ); 3068 } 3069 3070 if ( ! empty( $rel_match[0] ) ) { 3071 $parts = preg_split( '|\s+|', strtolower( $rel_match[2] ) ); 3072 $parts = array_map( 'esc_attr', $parts ); 3073 $needed = explode( ' ', $rel ); 3074 $parts = array_unique( array_merge( $parts, $needed ) ); 3075 $delimiter = trim( $rel_match[1] ) ? $rel_match[1] : '"'; 3076 $rel = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter; 3077 $link_html = str_replace( $rel_match[0], $rel, $link_html ); 3078 } else { 3079 $link_html .= " rel=\"$rel\""; 3080 } 3081 3082 return "<a $link_html>"; 3083 } 3084 3085 /** 3027 3086 * Convert one smiley code to the icon graphic file equivalent. 3028 3087 * 3029 3088 * Callback handler for convert_smilies(). -
tests/phpunit/tests/formatting/WPTargetedLinkRel.php
1 <?php 2 3 /** 4 * @group formatting 5 */ 6 class Tests_Targeted_Link_Rel extends WP_UnitTestCase { 7 8 public function test_add_to_links_with_target() { 9 $content = '<p>Links: <a href="/" target="_blank">No rel</a></p>'; 10 $expected = '<p>Links: <a href="/" target="_blank" rel="noopener noreferrer">No rel</a></p>'; 11 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 12 } 13 14 public function test_target_as_first_attribute() { 15 $content = '<p>Links: <a target="_blank" href="#">No rel</a></p>'; 16 $expected = '<p>Links: <a target="_blank" href="#" rel="noopener noreferrer">No rel</a></p>'; 17 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 18 } 19 20 public function test_add_to_existing_rel() { 21 $content = '<p>Links: <a href="/" rel="existing values" target="_blank">Existing rel</a></p>'; 22 $expected = '<p>Links: <a href="/" rel="existing values noopener noreferrer" target="_blank">Existing rel</a></p>'; 23 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 24 } 25 26 public function test_no_duplicate_values_added() { 27 $content = '<p>Links: <a href="/" rel="existing noopener values" target="_blank">Existing rel</a></p>'; 28 $expected = '<p>Links: <a href="/" rel="existing noopener values noreferrer" target="_blank">Existing rel</a></p>'; 29 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 30 } 31 32 public function test_rel_with_single_quote_delimiter() { 33 $content = '<p>Links: <a href="/" rel=\'existing values\' target="_blank">Existing rel</a></p>'; 34 $expected = '<p>Links: <a href="/" rel=\'existing values noopener noreferrer\' target="_blank">Existing rel</a></p>'; 35 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 36 } 37 38 public function test_rel_with_no_delimiter() { 39 $content = '<p>Links: <a href="/" rel=existing target="_blank">Existing rel</a></p>'; 40 $expected = '<p>Links: <a href="/" rel="existing noopener noreferrer" target="_blank">Existing rel</a></p>'; 41 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 42 } 43 44 public function test_rel_value_spaced_and_no_delimiter() { 45 $content = '<p>Links: <a href="/" rel = existing target="_blank">Existing rel</a></p>'; 46 $expected = '<p>Links: <a href="/" rel="existing noopener noreferrer" target="_blank">Existing rel</a></p>'; 47 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 48 } 49 50 public function test_rel_value_spaced_and_no_delimiter_and_values_to_escape() { 51 $content = '<p>Links: <a href="/" rel = existing"value target="_blank">Existing rel</a></p>'; 52 $expected = '<p>Links: <a href="/" rel="existing"value noopener noreferrer" target="_blank">Existing rel</a></p>'; 53 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 54 } 55 56 public function test_escaped_quotes() { 57 $content = '<p>Links: <a href=\"/\" rel=\"existing values\" target=\"_blank\">Existing rel</a></p>'; 58 $expected = '<p>Links: <a href=\"/\" rel=\"existing values noopener noreferrer\" target=\"_blank\">Existing rel</a></p>'; 59 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 60 } 61 62 public function test_ignore_links_with_no_target() { 63 $content = '<p>Links: <a href="/" target="_blank">Change me</a> <a href="/">Do not change me</a></p>'; 64 $expected = '<p>Links: <a href="/" target="_blank" rel="noopener noreferrer">Change me</a> <a href="/">Do not change me</a></p>'; 65 $this->assertEquals( $expected, wp_targeted_link_rel( $content ) ); 66 } 67 } -
tests/phpunit/tests/rest-api/rest-attachments-controller.php
Property changes on: tests/phpunit/tests/formatting/WPTargetedLinkRel.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property
1015 1015 'rendered' => '<a href="#">link</a>', 1016 1016 ), 1017 1017 'description' => array( 1018 'raw' => '<a href="#" target="_blank" >link</a>',1019 'rendered' => '<p><a href="#" target="_blank" >link</a></p>',1018 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>', 1019 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>', 1020 1020 ), 1021 1021 'caption' => array( 1022 'raw' => '<a href="#" target="_blank" >link</a>',1023 'rendered' => '<p><a href="#" target="_blank" >link</a></p>',1022 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>', 1023 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>', 1024 1024 ), 1025 1025 ), 1026 1026 ), -
tests/phpunit/tests/rest-api/rest-posts-controller.php
3185 3185 'rendered' => '<a href="#">link</a>', 3186 3186 ), 3187 3187 'content' => array( 3188 'raw' => '<a href="#" target="_blank" >link</a>',3189 'rendered' => '<p><a href="#" target="_blank" >link</a></p>',3188 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>', 3189 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>', 3190 3190 ), 3191 3191 'excerpt' => array( 3192 'raw' => '<a href="#" target="_blank" >link</a>',3193 'rendered' => '<p><a href="#" target="_blank" >link</a></p>',3192 'raw' => '<a href="#" target="_blank" rel="noopener noreferrer">link</a>', 3193 'rendered' => '<p><a href="#" target="_blank" rel="noopener noreferrer">link</a></p>', 3194 3194 ), 3195 3195 ), 3196 3196 ),