<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16803] branches/3.0: Improve the capabilites checking in the XMLRPC code.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16803">16803</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-12-08 17:50:05 +0000 (Wed, 08 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the capabilites checking in the XMLRPC code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30readmehtml">branches/3.0/readme.html</a></li>
<li><a href="#branches30wpadminincludesupdatecorephp">branches/3.0/wp-admin/includes/update-core.php</a></li>
<li><a href="#branches30wpincludesversionphp">branches/3.0/wp-includes/version.php</a></li>
<li><a href="#branches30xmlrpcphp">branches/3.0/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30readmehtml"></a>
<div class="modfile"><h4>Modified: branches/3.0/readme.html (16802 => 16803)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/readme.html 2010-12-08 17:07:55 UTC (rev 16802)
+++ branches/3.0/readme.html 2010-12-08 17:50:05 UTC (rev 16803)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> <body>
</span><span class="cx"> <h1 id="logo">
</span><span class="cx"> <a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
</span><del>- <br /> Version 3.0.2
</del><ins>+ <br /> Version 3.0.3
</ins><span class="cx"> </h1>
</span><span class="cx"> <p style="text-align: center">Semantic Personal Publishing Platform</p>
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-admin/includes/update-core.php (16802 => 16803)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-admin/includes/update-core.php 2010-12-08 17:07:55 UTC (rev 16802)
+++ branches/3.0/wp-admin/includes/update-core.php 2010-12-08 17:50:05 UTC (rev 16803)
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> $mysql_version = $wpdb->db_version();
</span><span class="cx"> $required_php_version = '4.3';
</span><span class="cx"> $required_mysql_version = '4.1.2';
</span><del>- $wp_version = '3.0.2';
</del><ins>+ $wp_version = '3.0.3';
</ins><span class="cx"> $php_compat = version_compare( $php_version, $required_php_version, '>=' );
</span><span class="cx"> $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpincludesversionphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-includes/version.php (16802 => 16803)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-includes/version.php 2010-12-08 17:07:55 UTC (rev 16802)
+++ branches/3.0/wp-includes/version.php 2010-12-08 17:50:05 UTC (rev 16803)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.0.2';
</del><ins>+$wp_version = '3.0.3';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre></div>
<a id="branches30xmlrpcphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/xmlrpc.php (16802 => 16803)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/xmlrpc.php 2010-12-08 17:07:55 UTC (rev 16802)
+++ branches/3.0/xmlrpc.php 2010-12-08 17:50:05 UTC (rev 16803)
</span><span class="lines">@@ -1156,9 +1156,12 @@
</span><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.deleteComment');
</span><span class="cx">
</span><del>- if ( ! get_comment($comment_ID) )
</del><ins>+ if ( !$comment = get_comment( $comment_ID ) )
</ins><span class="cx"> return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
</span><span class="cx">
</span><ins>+ if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+ return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+
</ins><span class="cx"> return wp_delete_comment($comment_ID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1184,12 +1187,15 @@
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'moderate_comments' ) )
</span><span class="cx"> return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</span><ins>+
+ if ( !$comment = get_comment( $comment_ID ) )
+ return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
</ins><span class="cx">
</span><ins>+ if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+ return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+
</ins><span class="cx"> do_action('xmlrpc_call', 'wp.editComment');
</span><span class="cx">
</span><del>- if ( ! get_comment($comment_ID) )
- return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
-
</del><span class="cx"> if ( isset($content_struct['status']) ) {
</span><span class="cx"> $statuses = get_comment_statuses();
</span><span class="cx"> $statuses = array_keys($statuses);
</span><span class="lines">@@ -1417,7 +1423,7 @@
</span><span class="cx"> if ( !$user = $this->login($username, $password) )
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><del>- if ( !current_user_can( 'edit_posts' ) )
</del><ins>+ if ( !current_user_can( 'edit_pages' ) )
</ins><span class="cx"> return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</span><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getPageStatusList');
</span><span class="lines">@@ -1957,7 +1963,7 @@
</span><span class="cx"> if ( !$actual_post || $actual_post['post_type'] != 'post' )
</span><span class="cx"> return new IXR_Error(404, __('Sorry, no such post.'));
</span><span class="cx">
</span><del>- if ( !current_user_can('edit_post', $post_ID) )
</del><ins>+ if ( !current_user_can('delete_post', $post_ID) )
</ins><span class="cx"> return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
</span><span class="cx">
</span><span class="cx"> $result = wp_delete_post($post_ID);
</span><span class="lines">@@ -1987,30 +1993,42 @@
</span><span class="cx"> $username = $args[1];
</span><span class="cx"> $password = $args[2];
</span><span class="cx"> $content_struct = $args[3];
</span><del>- $publish = $args[4];
</del><ins>+ $publish = isset( $args[4] ) ? $args[4] : 0;
</ins><span class="cx">
</span><span class="cx"> if ( !$user = $this->login($username, $password) )
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'metaWeblog.newPost');
</span><del>-
- $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
- $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
- $post_type = 'post';
</del><ins>+
</ins><span class="cx"> $page_template = '';
</span><span class="cx"> if ( !empty( $content_struct['post_type'] ) ) {
</span><span class="cx"> if ( $content_struct['post_type'] == 'page' ) {
</span><del>- $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
</del><ins>+ if ( $publish || 'publish' == $content_struct['page_status'])
+ $cap = 'publish_pages';
+ else
+ $cap = 'edit_pages';
</ins><span class="cx"> $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
</span><span class="cx"> $post_type = 'page';
</span><span class="cx"> if ( !empty( $content_struct['wp_page_template'] ) )
</span><span class="cx"> $page_template = $content_struct['wp_page_template'];
</span><span class="cx"> } elseif ( $content_struct['post_type'] == 'post' ) {
</span><del>- // This is the default, no changes needed
</del><ins>+ if ( $publish || 'publish' == $content_struct['post_status'])
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> } else {
</span><span class="cx"> // No other post_type values are allowed here
</span><span class="cx"> return new IXR_Error( 401, __( 'Invalid post type.' ) );
</span><span class="cx"> }
</span><ins>+ } else {
+ if ( $publish || 'publish' == $content_struct['post_status'])
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $cap ) )
</span><span class="lines">@@ -2275,17 +2293,32 @@
</span><span class="cx"> $page_template = '';
</span><span class="cx"> if ( !empty( $content_struct['post_type'] ) ) {
</span><span class="cx"> if ( $content_struct['post_type'] == 'page' ) {
</span><del>- $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
</del><ins>+ if ( $publish || 'publish' == $content_struct['page_status'] )
+ $cap = 'publish_pages';
+ else
+ $cap = 'edit_pages';
</ins><span class="cx"> $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
</span><span class="cx"> $post_type = 'page';
</span><span class="cx"> if ( !empty( $content_struct['wp_page_template'] ) )
</span><span class="cx"> $page_template = $content_struct['wp_page_template'];
</span><span class="cx"> } elseif ( $content_struct['post_type'] == 'post' ) {
</span><del>- // This is the default, no changes needed
</del><ins>+ if ( $publish || 'publish' == $content_struct['post_status'] )
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> } else {
</span><span class="cx"> // No other post_type values are allowed here
</span><span class="cx"> return new IXR_Error( 401, __( 'Invalid post type.' ) );
</span><span class="cx"> }
</span><ins>+ } else {
+ if ( $publish || 'publish' == $content_struct['post_status'] )
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $cap ) )
</span><span class="lines">@@ -3101,7 +3134,7 @@
</span><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'mt.publishPost');
</span><span class="cx">
</span><del>- if ( !current_user_can('edit_post', $post_ID) )
</del><ins>+ if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) )
</ins><span class="cx"> return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
</span><span class="cx">
</span><span class="cx"> $postdata = wp_get_single_post($post_ID,ARRAY_A);
</span><span class="lines">@@ -3339,4 +3372,4 @@
</span><span class="cx">
</span><span class="cx"> $wp_xmlrpc_server = new wp_xmlrpc_server();
</span><span class="cx"> $wp_xmlrpc_server->serve_request();
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>