<!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>[11744] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Introduce specific capabilities for various actions, rather than just using "edit access".</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 { white-space: pre-line; 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/11744">11744</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/11744","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-04-05 05:14:18 +0000 (Tue, 05 Apr 2022)</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'>Plugin Directory: Introduce specific capabilities for various actions, rather than just using "edit access".
See <a href="http://meta.trac.wordpress.org/ticket/5654">#5654</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginreleaseconfirmationphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginselfclosephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-close.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginselftransferphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-transfer.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasscapabilitiesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginreleaseconfirmationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php 2022-04-05 04:58:00 UTC (rev 11743)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php 2022-04-05 05:14:18 UTC (rev 11744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permission_callback' => function( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
</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 current_user_can( 'plugin_admin_edit', $plugin ) && 'publish' === $plugin->post_status;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return current_user_can( 'plugin_manage_releases', $plugin );
</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">@@ -49,8 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return (
</span><span class="cx" style="display: block; padding: 0 10px"> Release_Confirmation_Shortcode::can_access() &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- current_user_can( 'plugin_admin_edit', $plugin ) &&
- 'publish' === $plugin->post_status
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ current_user_can( 'plugin_manage_releases', $plugin )
</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>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginselfclosephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-close.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-close.php 2022-04-05 04:58:00 UTC (rev 11743)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-close.php 2022-04-05 05:14:18 UTC (rev 11744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permission_callback' => function( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
</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 current_user_can( 'plugin_admin_edit', $plugin ) && 'publish' === $plugin->post_status;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return current_user_can( 'plugin_self_close', $plugin );
</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>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginselftransferphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-transfer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-transfer.php 2022-04-05 04:58:00 UTC (rev 11743)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-transfer.php 2022-04-05 05:14:18 UTC (rev 11744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,10 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permission_callback' => function( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
</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
- current_user_can( 'plugin_admin_edit', $plugin ) &&
- get_current_user_id() == $plugin->post_author &&
- 'publish' === $plugin->post_status;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return current_user_can( 'plugin_self_transfer', $plugin );
</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>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasscapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php 2022-04-05 04:58:00 UTC (rev 11743)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php 2022-04-05 05:14:18 UTC (rev 11744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,74 +22,101 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Primitive caps.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function map_meta_cap( $required_caps, $cap, $user_id, $context ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_edit_cap = false;
- switch ( $cap ) {
- case 'plugin_admin_edit':
- case 'plugin_add_committer':
- case 'plugin_remove_committer':
- case 'plugin_add_support_rep':
- case 'plugin_remove_support_rep':
- $plugin_edit_cap = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $handled_caps = array(
+ // All these caps must pass a WP_Post context.
+ 'plugin_admin_view',
+ 'plugin_admin_edit',
+ 'plugin_add_committer',
+ 'plugin_remove_committer',
+ 'plugin_add_support_rep',
+ 'plugin_remove_support_rep',
+ 'plugin_self_transfer',
+ 'plugin_self_close',
+ 'plugin_manage_releases',
+ );
+ if ( ! in_array( $cap, $handled_caps ) ) {
+ return $required_caps;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Fall through
- // Although we no longer have a admin view, this capability is still used to determine if the current user is a committer/contributor.
- case 'plugin_admin_view':
- // Committers + Contributors.
- // If no committers, post_author.
- $required_caps = array();
- $post = get_post( $context[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Protect against a cap call without a plugin context.
+ $post = $context ? get_post( $context[0] ) : false;
+ if ( ! $post ) {
+ return array( 'do_not_allow' );
+ }
</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 ( ! $post ) {
- $required_caps[] = 'do_not_allow';
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Start over, we'll specify all caps below.
+ $required_caps = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = new \WP_User( $user_id );
- if ( $user->has_cap( 'plugin_review' ) ) {
- $required_caps[] = 'plugin_review';
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Certain actions require the plugin to be published.
+ if (
+ 'publish' !== $post->post_status &&
+ in_array(
+ $cap,
+ array(
+ 'plugin_self_transfer',
+ 'plugin_self_close',
+ 'plugin_manage_releases',
+ )
+ )
+ ) {
+ $required_caps[] = 'do_not_allow';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Committers
- $committers = Tools::get_plugin_committers( $post->post_name );
- if ( ! $committers && 'publish' === $post->post_status ) {
- // post_author in the event no committers exist (yet?)
- $committers = array( get_user_by( 'ID', $post->post_author )->user_login );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If a plugin is in the Beta or Featured views, they're not able to self-manage certain things. Require reviewer.
+ if (
+ in_array(
+ $cap,
+ array(
+ 'plugin_self_close',
+ 'plugin_self_transfer',
+ 'plugin_add_committer',
+ 'plugin_remove_committer',
+ )
+ ) &&
+ is_object_in_term( $post->ID, 'plugin_section', array( 'beta', 'featured' ) )
+ ) {
+ $required_caps[] = 'plugin_review';
+ }
</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->user_login, $committers ) ) {
- $required_caps[] = 'exist'; // All users are allowed to exist, even when they have no role.
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only the Owner of a plugin is able to transfer plugins.
+ if ( 'plugin_self_transfer' === $cap && $user_id != $post->post_author ) {
+ $required_caps[] = 'do_not_allow';
+ }
</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 ( ! $plugin_edit_cap ) {
- // Contributors can view, but not edit.
- $terms = get_the_terms( $post, 'plugin_contributors' );
- if ( is_array( $terms ) ) {
- $contributors = (array) wp_list_pluck( $terms, 'name' );
- if ( in_array( $user->user_nicename, $contributors, true ) ) {
- $required_caps[] = 'exist'; // All users are allowed to exist, even when they have no role.
- break;
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Committers
+ $committers = Tools::get_plugin_committers( $post->post_name );
+ // If there are no committers, use the plugin author if the plugin is published.
+ if ( ! $committers && 'publish' === $post->post_status ) {
+ $committers = array( get_user_by( 'ID', $post->post_author )->user_login );
+ }
+
+ if ( in_array( $user->user_login, $committers ) ) {
+ $required_caps[] = 'exist';
+ }
+
+ // Contributors can view, but not edit.
+ if ( 'plugin_admin_view' === $cap ) {
+ $terms = get_the_terms( $post, 'plugin_contributors' );
+ if ( is_array( $terms ) ) {
+ $contributors = (array) wp_list_pluck( $terms, 'name' );
+ if ( in_array( $user->user_nicename, $contributors, true ) ) {
+ $required_caps[] = 'exist';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Else;
- $required_caps[] = 'do_not_allow';
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow users with review caps to access.
+ $user = new \WP_User( $user_id );
+ if ( $user->has_cap( 'plugin_review' ) ) {
+ $required_caps[] = 'plugin_review';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'plugin_transition':
- /*
- Handle the transition between
- pending -> publish
- publish -> rejected
- publish -> closed
- etc
- */
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we've not found a matching user/cap, deny.
+ if ( ! $required_caps ) {
+ $required_caps[] = 'do_not_allow';
</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 $required_caps;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array_unique( $required_caps );
</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>