<!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>[41260] trunk: Widgets: Prevent visual Text widget from decoding encoded HTML.</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/41260">41260</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/41260","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-08-17 23:36:53 +0000 (Thu, 17 Aug 2017)</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'>Widgets: Prevent visual Text widget from decoding encoded HTML.
Also apply `the_editor_content` filters on widget `text` with `format_for_editor()` as is done for the post editor.
Amends <a href="https://core.trac.wordpress.org/changeset/40631">[40631]</a>.
Props westonruter, azaozz.
See <a href="https://core.trac.wordpress.org/ticket/35243">#35243</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/41596">#41596</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjswidgetstextwidgetsjs">trunk/src/wp-admin/js/widgets/text-widgets.js</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.php</a></li>
<li><a href="#trunktestsphpunittestswidgetstextwidgetphp">trunk/tests/phpunit/tests/widgets/text-widget.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjswidgetstextwidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/widgets/text-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/widgets/text-widgets.js 2017-08-17 21:03:55 UTC (rev 41259)
+++ trunk/src/wp-admin/js/widgets/text-widgets.js 2017-08-17 23:36:53 UTC (rev 41260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Sync input fields to hidden sync fields which actually get sent to the server.
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( control.fields, function( fieldInput, fieldName ) {
</span><span class="cx" style="display: block; padding: 0 10px"> fieldInput.on( 'input change', function updateSyncField() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var syncInput = control.syncContainer.find( 'input[type=hidden].' + fieldName );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var syncInput = control.syncContainer.find( '.sync-input.' + fieldName );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( syncInput.val() !== fieldInput.val() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> syncInput.val( fieldInput.val() );
</span><span class="cx" style="display: block; padding: 0 10px"> syncInput.trigger( 'change' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</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"> // Note that syncInput cannot be re-used because it will be destroyed with each widget-updated event.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fieldInput.val( control.syncContainer.find( 'input[type=hidden].' + fieldName ).val() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fieldInput.val( control.syncContainer.find( '.sync-input.' + fieldName ).val() );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,11 +145,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var control = this, syncInput;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! control.fields.title.is( document.activeElement ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- syncInput = control.syncContainer.find( 'input[type=hidden].title' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ syncInput = control.syncContainer.find( '.sync-input.title' );
</ins><span class="cx" style="display: block; padding: 0 10px"> control.fields.title.val( syncInput.val() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- syncInput = control.syncContainer.find( 'input[type=hidden].text' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ syncInput = control.syncContainer.find( '.sync-input.text' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( control.fields.text.is( ':visible' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! control.fields.text.is( document.activeElement ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> control.fields.text.val( syncInput.val() );
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettextphp"></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/widgets/class-wp-widget-text.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-text.php 2017-08-17 21:03:55 UTC (rev 41259)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php 2017-08-17 23:36:53 UTC (rev 41260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,6 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.8.0 Form only contains hidden inputs which are synced with JS template.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.8.1 Restored original form to be displayed when in legacy mode.
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget_Visual_Text::render_control_template_scripts()
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see _WP_Editors::editor()
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance Current settings.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,10 +347,31 @@
</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"> <?php if ( ! $this->is_legacy_instance( $instance ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" class="title" type="hidden" value="<?php echo esc_attr( $instance['title'] ); ?>">
- <input id="<?php echo $this->get_field_id( 'text' ); ?>" name="<?php echo $this->get_field_name( 'text' ); ?>" class="text" type="hidden" value="<?php echo esc_attr( $instance['text'] ); ?>">
- <input id="<?php echo $this->get_field_id( 'filter' ); ?>" name="<?php echo $this->get_field_name( 'filter' ); ?>" class="filter" type="hidden" value="on">
- <input id="<?php echo $this->get_field_id( 'visual' ); ?>" name="<?php echo $this->get_field_name( 'visual' ); ?>" class="visual" type="hidden" value="on">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+
+ if ( user_can_richedit() ) {
+ add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
+ $default_editor = 'tinymce';
+ } else {
+ $default_editor = 'html';
+ }
+
+ /** This filter is documented in wp-includes/class-wp-editor.php */
+ $text = apply_filters( 'the_editor_content', $instance['text'], $default_editor );
+
+ // Reset filter addition.
+ if ( user_can_richedit() ) {
+ remove_filter( 'the_editor_content', 'format_for_editor' );
+ }
+
+ // Prevent premature closing of textarea in case format_for_editor() didn't apply or the_editor_content filter did a wrong thing.
+ $escaped_text = preg_replace( '#</textarea#i', '</textarea', $text );
+
+ ?>
+ <input id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" class="title sync-input" type="hidden" value="<?php echo esc_attr( $instance['title'] ); ?>">
+ <textarea id="<?php echo $this->get_field_id( 'text' ); ?>" name="<?php echo $this->get_field_name( 'text' ); ?>" class="text sync-input" hidden><?php echo $escaped_text; ?></textarea>
+ <input id="<?php echo $this->get_field_id( 'filter' ); ?>" name="<?php echo $this->get_field_name( 'filter' ); ?>" class="filter sync-input" type="hidden" value="on">
+ <input id="<?php echo $this->get_field_id( 'visual' ); ?>" name="<?php echo $this->get_field_name( 'visual' ); ?>" class="visual sync-input" type="hidden" value="on">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="<?php echo $this->get_field_id( 'visual' ); ?>" name="<?php echo $this->get_field_name( 'visual' ); ?>" class="visual" type="hidden" value="">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetstextwidgetphp"></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/widgets/text-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/text-widget.php 2017-08-17 21:03:55 UTC (rev 41259)
+++ trunk/tests/phpunit/tests/widgets/text-widget.php 2017-08-17 23:36:53 UTC (rev 41260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::form
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_form() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'user_can_richedit', '__return_true' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $widget->_set( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => 'Text',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->form( $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $form = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'class="visual" type="hidden" value=""', $form );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotContains( 'class="visual" type="hidden" value="on"', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotContains( 'class="visual sync-input" type="hidden" value="on"', $form );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,8 +472,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->form( $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $form = ob_get_clean();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertContains( 'class="visual" type="hidden" value="on"', $form );
- $this->assertNotContains( 'class="visual" type="hidden" value=""', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertContains( 'class="visual sync-input" type="hidden" value="on"', $form );
+ $this->assertNotContains( 'class="visual sync-input" type="hidden" value=""', $form );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,12 +484,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->form( $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $form = ob_get_clean();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertContains( 'class="visual" type="hidden" value="on"', $form );
- $this->assertNotContains( 'class="visual" type="hidden" value=""', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertContains( 'class="visual sync-input" type="hidden" value="on"', $form );
+ $this->assertNotContains( 'class="visual sync-input" type="hidden" value=""', $form );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Title',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'text' => 'Text',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'text' => 'This is some HTML Code: <code><strong>BOLD!</strong></code>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,8 +497,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->form( $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $form = ob_get_clean();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertContains( 'class="visual" type="hidden" value="on"', $form );
- $this->assertNotContains( 'class="visual" type="hidden" value=""', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertContains( 'class="visual sync-input" type="hidden" value="on"', $form );
+ $this->assertContains( '<code>&lt;strong&gt;BOLD!', $form );
+ $this->assertNotContains( 'class="visual sync-input" type="hidden" value=""', $form );
+
+ remove_filter( 'user_can_richedit', '__return_true' );
+ add_filter( 'user_can_richedit', '__return_false' );
+ $instance = array(
+ 'title' => 'Title',
+ 'text' => 'Evil:</textarea><script>alert("XSS")</script>',
+ 'filter' => true,
+ 'visual' => true,
+ );
+ $this->assertFalse( $widget->is_legacy_instance( $instance ) );
+ ob_start();
+ $widget->form( $instance );
+ $form = ob_get_clean();
+ $this->assertNotContains( 'Evil:</textarea>', $form );
+ $this->assertContains( 'Evil:</textarea>', $form );
</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>