<!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>[40993] trunk: Capabilities: Prevent users having the `do_not_allow` capability.</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/40993">40993</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/40993","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>2017-07-02 05:15:42 +0000 (Sun, 02 Jul 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'>Capabilities: Prevent users having the `do_not_allow` capability.
Meta capabilities use the capability `do_not_allow` to indicate a user should be blocked from performing a particular action. This ensures users can not have the capability as it would cause unexpected behaviour.
Props johnbillion.
Fixes <a href="https://core.trac.wordpress.org/ticket/41059">#41059</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpuserphp"></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/class-wp-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user.php 2017-07-01 22:13:00 UTC (rev 40992)
+++ trunk/src/wp-includes/class-wp-user.php 2017-07-02 05:15:42 UTC (rev 40993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,6 +748,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Everyone is allowed to exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $capabilities['exist'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Nobody is allowed to do things they are not allowed to do.
+ unset( $capabilities['do_not_allow'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Must have ALL requested caps.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $caps as $cap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $capabilities[ $cap ] ) )
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></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/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2017-07-01 22:13:00 UTC (rev 40992)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2017-07-02 05:15:42 UTC (rev 40993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,6 +494,57 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( $user, 'exist' ), "User with the {$role} role should have the exist capability" );
</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">+ /**
+ * @ticket 41059
+ */
+ public function test_do_not_allow_is_denied_for_all_roles() {
+ foreach ( self::$users as $role => $user ) {
+
+ # Test adding the cap directly to the user
+ $user->add_cap( 'do_not_allow' );
+ $has_cap = $user->has_cap( 'do_not_allow' );
+ $user->remove_cap( 'do_not_allow' );
+ $this->assertFalse( $has_cap, "User with the {$role} role should not have the do_not_allow capability" );
+
+ # Test adding the cap to the user's role
+ $role_obj = get_role( $role );
+ $role_obj->add_cap( 'do_not_allow' );
+ $has_cap = $user->has_cap( 'do_not_allow' );
+ $role_obj->remove_cap( 'do_not_allow' );
+ $this->assertFalse( $has_cap, "User with the {$role} role should not have the do_not_allow capability" );
+
+ # Test adding the cap via a filter
+ add_filter( 'user_has_cap', array( $this, 'grant_do_not_allow' ), 10, 4 );
+ $has_cap = $user->has_cap( 'do_not_allow' );
+ remove_filter( 'user_has_cap', array( $this, 'grant_do_not_allow' ), 10, 4 );
+ $this->assertFalse( $has_cap, "User with the {$role} role should not have the do_not_allow capability" );
+
+ }
+ }
+
+ /**
+ * @group ms-required
+ * @ticket 41059
+ */
+ public function test_do_not_allow_is_denied_for_super_admins() {
+ # Test adding the cap directly to the user
+ self::$super_admin->add_cap( 'do_not_allow' );
+ $has_cap = self::$super_admin->has_cap( 'do_not_allow' );
+ self::$super_admin->remove_cap( 'do_not_allow' );
+ $this->assertFalse( $has_cap, 'Super admins should not have the do_not_allow capability' );
+
+ # Test adding the cap via a filter
+ add_filter( 'user_has_cap', array( $this, 'grant_do_not_allow' ), 10, 4 );
+ $has_cap = self::$super_admin->has_cap( 'do_not_allow' );
+ remove_filter( 'user_has_cap', array( $this, 'grant_do_not_allow' ), 10, 4 );
+ $this->assertFalse( $has_cap, 'Super admins should not have the do_not_allow capability' );
+ }
+
+ public function grant_do_not_allow( $allcaps, $caps, $args, $user ) {
+ $allcaps['do_not_allow'] = true;
+ return $allcaps;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // special case for the link manager
</span><span class="cx" style="display: block; padding: 0 10px"> function test_link_manager_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = array(
</span></span></pre>
</div>
</div>
</body>
</html>