<!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>[39190] trunk: REST API: `unfiltered_html` and slashing: terms.</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/39190">39190</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/39190","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joehoyle</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-10 02:09:40 +0000 (Thu, 10 Nov 2016)</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'>REST API: `unfiltered_html` and slashing: terms.
Follow-up to <a href="https://core.trac.wordpress.org/ticket/38609">#38609</a> and <a href="https://core.trac.wordpress.org/ticket/38704">#38704</a>; handle slashes correctly for taxonomy terms.
Props westonruter, jnylen0.
Fixes <a href="https://core.trac.wordpress.org/ticket/38726">#38726</a>, see <a href="https://core.trac.wordpress.org/ticket/38609">#38609</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp"></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/rest-api/endpoints/class-wp-rest-terms-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2016-11-10 01:53:08 UTC (rev 39189)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2016-11-10 02:09:40 UTC (rev 39190)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_term = $this->prepare_item_for_database( $request );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = wp_insert_term( $prepared_term->name, $this->taxonomy, $prepared_term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = wp_insert_term( addslashes( $prepared_term->name ), $this->taxonomy, wp_slash( (array) $prepared_term ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $term ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If we're going to inform the client that the term already exists,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only update the term if we haz something to update.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $prepared_term ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update = wp_update_term( $term->term_id, $term->taxonomy, (array) $prepared_term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update = wp_update_term( $term->term_id, $term->taxonomy, wp_slash( (array) $prepared_term ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $update ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $update;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,9 +821,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'HTML description of the resource.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'context' => array( 'view', 'edit' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'arg_options' => array(
- 'sanitize_callback' => 'wp_filter_post_kses',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'URL to the resource.' ),
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttagscontrollerphp"></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-tags-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-tags-controller.php 2016-11-10 01:53:08 UTC (rev 39189)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2016-11-10 02:09:40 UTC (rev 39190)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,16 +10,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group restapi
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $superadmin;
</ins><span class="cx" style="display: block; padding: 0 10px"> protected static $administrator;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $editor;
</ins><span class="cx" style="display: block; padding: 0 10px"> protected static $subscriber;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$superadmin = $factory->user->create( array(
+ 'role' => 'administrator',
+ 'user_login' => 'superadmin',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$administrator = $factory->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$editor = $factory->user->create( array(
+ 'role' => 'editor',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$subscriber = $factory->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() ) {
+ update_site_option( 'site_admins', array( 'superadmin' ) );
+ }
</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"> public static function wpTearDownAfterClass() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,6 +629,103 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_taxonomy_not_hierarchical', $response, 400 );
</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">+ public function verify_tag_roundtrip( $input = array(), $expected_output = array() ) {
+ // Create the tag
+ $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
+ foreach ( $input as $name => $value ) {
+ $request->set_param( $name, $value );
+ }
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 201, $response->get_status() );
+ $actual_output = $response->get_data();
+
+ // Compare expected API output to actual API output
+ $this->assertEquals( $expected_output['name'], $actual_output['name'] );
+ $this->assertEquals( $expected_output['description'], $actual_output['description'] );
+
+ // Compare expected API output to WP internal values
+ $tag = get_term_by( 'id', $actual_output['id'], 'post_tag' );
+ $this->assertEquals( $expected_output['name'], $tag->name );
+ $this->assertEquals( $expected_output['description'], $tag->description );
+
+ // Update the tag
+ $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/tags/%d', $actual_output['id'] ) );
+ foreach ( $input as $name => $value ) {
+ $request->set_param( $name, $value );
+ }
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ $actual_output = $response->get_data();
+
+ // Compare expected API output to actual API output
+ $this->assertEquals( $expected_output['name'], $actual_output['name'] );
+ $this->assertEquals( $expected_output['description'], $actual_output['description'] );
+
+ // Compare expected API output to WP internal values
+ $tag = get_term_by( 'id', $actual_output['id'], 'post_tag' );
+ $this->assertEquals( $expected_output['name'], $tag->name );
+ $this->assertEquals( $expected_output['description'], $tag->description );
+ }
+
+ public function test_tag_roundtrip_as_editor() {
+ wp_set_current_user( self::$editor );
+ $this->assertEquals( ! is_multisite(), current_user_can( 'unfiltered_html' ) );
+ $this->verify_tag_roundtrip( array(
+ 'name' => '\o/ ¯\_(ツ)_/¯',
+ 'description' => '\o/ ¯\_(ツ)_/¯',
+ ), array(
+ 'name' => '\o/ ¯\_(ツ)_/¯',
+ 'description' => '\o/ ¯\_(ツ)_/¯',
+ ) );
+ }
+
+ public function test_tag_roundtrip_as_editor_html() {
+ wp_set_current_user( self::$editor );
+ if ( is_multisite() ) {
+ $this->assertFalse( current_user_can( 'unfiltered_html' ) );
+ $this->verify_tag_roundtrip( array(
+ 'name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+ 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+ ), array(
+ 'name' => 'div strong',
+ 'description' => 'div <strong>strong</strong>',
+ ) );
+ } else {
+ $this->assertTrue( current_user_can( 'unfiltered_html' ) );
+ $this->verify_tag_roundtrip( array(
+ 'name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+ 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+ ), array(
+ 'name' => 'div strong',
+ 'description' => 'div <strong>strong</strong> oh noes',
+ ) );
+ }
+ }
+
+ public function test_tag_roundtrip_as_superadmin() {
+ wp_set_current_user( self::$superadmin );
+ $this->assertTrue( current_user_can( 'unfiltered_html' ) );
+ $this->verify_tag_roundtrip( array(
+ 'name' => '\\\&\\\ & &invalid; < < &lt;',
+ 'description' => '\\\&\\\ & &invalid; < < &lt;',
+ ), array(
+ 'name' => '\\\&\\\ & &invalid; < < &lt;',
+ 'description' => '\\\&\\\ & &invalid; < < &lt;',
+ ) );
+ }
+
+ public function test_tag_roundtrip_as_superadmin_html() {
+ wp_set_current_user( self::$superadmin );
+ $this->assertTrue( current_user_can( 'unfiltered_html' ) );
+ $this->verify_tag_roundtrip( array(
+ 'name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+ 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
+ ), array(
+ 'name' => 'div strong',
+ 'description' => 'div <strong>strong</strong> oh noes',
+ ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_item() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
</span></span></pre>
</div>
</div>
</body>
</html>