<!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>[1877] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/trusted-deputy-capabilities.php: WordCamp.org: Update the trusted deputy capabilities plugin.</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="http://meta.trac.wordpress.org/changeset/1877">1877</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1877","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-11 14:30:16 +0000 (Fri, 11 Sep 2015)</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'>WordCamp.org: Update the trusted deputy capabilities plugin.
This new version filters `user_has_cap` rather than `map_meta_cap`
and adds an extra set of primitive capabilities to trusted users.
It does use `map_meta_cap` to map some meta capabilities back
to primitive capabilities, such as the ones defined in Jetpack.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginstrusteddeputycapabilitiesphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/trusted-deputy-capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginstrusteddeputycapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/trusted-deputy-capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/trusted-deputy-capabilities.php 2015-09-11 07:42:09 UTC (rev 1876)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/trusted-deputy-capabilities.php 2015-09-11 14:30:16 UTC (rev 1877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,80 +15,84 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * capability that isn't explicitly granted.
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Give extra capabilities to trusted Deputies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Give extra capabilities to trusted deputies.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $required_capabilities The primitive capabilities that are required to perform the requested meta capability
- * @param string $requested_capability The requested meta capability
- * @param int $user_id The user ID.
- * @param array $args Adds the context to the cap. Typically the object ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Uses the user_has_cap filter to add more primitive capabilities to trusted deputies.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $allcaps This user's capabilities.
+ * @param string $caps Requested set of capabilities.
+ * @param array $args Adds the context to the cap.
+ * @param int $user The WP_User object.
+ *
+ * @return array An array of this user's capabilities.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function allow_trusted_deputy_capabilities( $required_capabilities, $requested_capability, $user_id, $args ) {
- global $trusted_deputies;
- $allow_capability = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function trusted_deputy_has_cap( $allcaps, $caps, $args, $user ) {
+ if ( ! is_deputy( $user->ID ) )
+ return $allcaps;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $user_id, $trusted_deputies ) ) {
- $allow_capability = false;
- } else if ( in_array( 'do_not_allow', $required_capabilities ) ) {
- $allow_capability = false;
- } else if ( ! is_allowed_capability( $requested_capability, $required_capabilities ) ) {
- $allow_capability = false;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allcaps = array_merge( get_role( 'administrator' )->capabilities, array(
+ 'manage_network' => true,
+ 'manage_sites' => true,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $allow_capability ) {
- $required_capabilities = array();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'jetpack_network_admin_page' => true,
+ 'jetpack_network_sites_page' => true,
+ 'jetpack_network_settings_page' => true,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $required_capabilities;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $allcaps;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'map_meta_cap', __NAMESPACE__ . '\allow_trusted_deputy_capabilities', 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'user_has_cap', __NAMESPACE__ . '\trusted_deputy_has_cap', 10, 4 );
</ins><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">- * Determine if the given capability should be allowed for trusted Deputies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter meta-capabilities.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $capability
- * @param array $dependent_capabilities
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Uses the map_meta_cap filter to add some additional logic around meta-caps.
+ * Mainly we just map some custom meta-caps back to primitive ones.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $required_caps An array of capabilites required to perform $cap.
+ * @param string $cap The requested capability.
+ * @param int $user_id The user ID.
+ *
+ * @return array An array of required capababilities to perform $cap.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function is_allowed_capability( $capability, $dependent_capabilities ) {
- $allowed = false;
- $deputy_capabilities = get_trusted_deputy_capabilities();
-
- if ( array_key_exists( $capability, $deputy_capabilities ) ) {
- $allowed = true;
- } else {
- foreach ( $dependent_capabilities as $dependent_capability ) {
- if ( array_key_exists( $dependent_capability, $deputy_capabilities ) ) {
- $allowed = true;
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function trusted_deputy_meta_caps( $required_caps, $cap, $user_id ) {
+ if ( ! is_deputy( $user_id ) )
+ return $required_caps;
+
+ switch ( $cap ) {
+
+ // With multisite and plugin menus turned off, core requires
+ // the manage_network_plugins cap via a meta cap.
+ case 'activate_plugins':
+ if ( ! is_network_admin() ) {
+ $required_caps = array( 'activate_plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ break;
+
+ // Map some Jetpack meta caps back to regular caps.
+ // See https://github.com/Automattic/jetpack/commit/bf3f4b9a8eb8b689b33a106d2e9b2fefd9a4c2fb
+ case 'jetpack_network_admin_page':
+ case 'jetpack_network_sites_page':
+ case 'jetpack_network_settings_page':
+ $required_caps = array( $cap );
+ break;
</ins><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">- return $allowed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $required_caps;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'map_meta_cap', __NAMESPACE__ . '\trusted_deputy_meta_caps', 10, 3 );
</ins><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">- * Get the capabilities that trusted Deputies should have
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns true if $user_id is a deputy.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $user_id A user ID.
+ *
+ * @return bool True if $user_id is a deputy.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_trusted_deputy_capabilities() {
- $administrator_role = get_role( 'administrator' );
-
- $capabilities = array_merge(
- $administrator_role->capabilities,
- array(
- 'manage_network' => true,
- 'manage_sites' => true,
- )
- );
-
- return $capabilities;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function is_deputy( $user_id = null ) {
+ global $trusted_deputies;
+ return in_array( $user_id, (array) $trusted_deputies );
</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">@@ -108,6 +112,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'import' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_theme_options' => 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">+ // Jetpack-specific caps.
+ 'jetpack_network_admin_page' => true,
+ 'jetpack_network_sites_page' => true,
+ 'jetpack_network_settings_page' => true,
+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'manage_network_users' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'manage_network_plugins' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'manage_network_themes' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +133,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $capabilities as $capability => $allowed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "<li>%s should be %s and was %s</li>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "<li>%s: %s should be %s and was %s</li>",
+ $allowed == current_user_can( $capability ) ? 'OK' : 'ERROR',
</ins><span class="cx" style="display: block; padding: 0 10px"> $capability,
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed ? 'granted' : 'denied',
</span><span class="cx" style="display: block; padding: 0 10px"> current_user_can( $capability ) ? 'granted' : 'denied'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,4 +143,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-//add_action( 'init', __NAMESPACE__ . '\test_allow_trusted_deputy_capabilities' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// add_action( 'init', __NAMESPACE__ . '\test_allow_trusted_deputy_capabilities' );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>