<!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>[BuddyPress][12507] trunk: Improve object ID sanitization when deleting avatar or cover image</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://buddypress.trac.wordpress.org/changeset/12507">12507</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12507","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-12-23 07:56:32 +0000 (Mon, 23 Dec 2019)</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'>Improve object ID sanitization when deleting avatar or cover image
Fixes the issue in trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreattachmentsphp">trunk/src/bp-core/bp-core-attachments.php</a></li>
<li><a href="#trunksrcbpcorebpcoreavatarsphp">trunk/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreavatarsphp">trunk/tests/phpunit/testcases/core/avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreattachmentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-attachments.php 2019-12-09 20:38:18 UTC (rev 12506)
+++ trunk/src/bp-core/bp-core-attachments.php 2019-12-23 07:56:32 UTC (rev 12507)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1449,7 +1449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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">- if ( empty( $_POST['object'] ) || empty( $_POST['item_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_POST['object'] ) || empty( $_POST['item_id'] ) || ( ! ctype_digit( $_POST['item_id'] ) && ! is_int( $_POST['item_id'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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="trunksrcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-avatars.php 2019-12-09 20:38:18 UTC (rev 12506)
+++ trunk/src/bp-core/bp-core-avatars.php 2019-12-23 07:56:32 UTC (rev 12507)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,7 +718,6 @@
</span><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"> $args = wp_parse_args( $args, $defaults );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- extract( $args, EXTR_SKIP );
</del><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"> * Filters whether or not to handle deleting an existing avatar.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,47 +744,61 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- if ( empty( $item_id ) ) {
- if ( 'user' == $object )
- $item_id = bp_displayed_user_id();
- elseif ( 'group' == $object )
- $item_id = buddypress()->groups->current_group->id;
- elseif ( 'blog' == $object )
- $item_id = $current_blog->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $args['item_id'] ) ) {
+ if ( 'user' === $args['object'] ) {
+ $args['item_id'] = bp_displayed_user_id();
+ } elseif ( 'group' === $args['object'] ) {
+ $args['item_id'] = buddypress()->groups->current_group->id;
+ } elseif ( 'blog' === $args['object'] ) {
+ $args['item_id'] = $current_blog->id;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in bp-core/bp-core-avatars.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_id = apply_filters( 'bp_core_avatar_item_id', $args['item_id'], $args['object'] );
+ } else {
+ $item_id = $args['item_id'];
+ }
</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 ( !$item_id ) return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $item_id && ( ctype_digit( $item_id ) || is_int( $item_id ) ) ) {
+ $item_id = (int) $item_id;
+ } else {
+ return false;
</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">- if ( empty( $avatar_dir ) ) {
- if ( 'user' == $object )
- $avatar_dir = 'avatars';
- elseif ( 'group' == $object )
- $avatar_dir = 'group-avatars';
- elseif ( 'blog' == $object )
- $avatar_dir = 'blog-avatars';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $args['avatar_dir'] ) ) {
+ if ( 'user' === $args['object'] ) {
+ $args['avatar_dir'] = 'avatars';
+ } elseif ( 'group' === $args['object'] ) {
+ $args['avatar_dir'] = 'group-avatars';
+ } elseif ( 'blog' === $args['object'] ) {
+ $args['avatar_dir'] = 'blog-avatars';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in bp-core/bp-core-avatars.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $avatar_dir = apply_filters( 'bp_core_avatar_dir', $avatar_dir, $object );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar_dir = apply_filters( 'bp_core_avatar_dir', $args['avatar_dir'], $args['object'] );
+ } else {
+ $avatar_dir = $args['avatar_dir'];
+ }
</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 ( !$avatar_dir ) return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $avatar_dir ) {
+ return false;
</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"> /** This filter is documented in bp-core/bp-core-avatars.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', bp_core_avatar_upload_path() . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', bp_core_avatar_upload_path() . '/' . $avatar_dir . '/' . $item_id, $item_id, $args['object'], $avatar_dir );
</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 ( !file_exists( $avatar_folder_dir ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_dir( $avatar_folder_dir ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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><span class="cx" style="display: block; padding: 0 10px"> if ( $av_dir = opendir( $avatar_folder_dir ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
- if ( ( preg_match( "/-bpfull/", $avatar_file ) || preg_match( "/-bpthumb/", $avatar_file ) ) && '.' != $avatar_file && '..' != $avatar_file )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( false !== ( $avatar_file = readdir( $av_dir ) ) ) {
+ if ( ( preg_match( "/-bpfull/", $avatar_file ) || preg_match( "/-bpthumb/", $avatar_file ) ) && '.' != $avatar_file && '..' != $avatar_file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> @unlink( $avatar_folder_dir . '/' . $avatar_file );
</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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- closedir($av_dir);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ closedir( $av_dir );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> @rmdir( $avatar_folder_dir );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/avatars.php 2019-12-09 20:38:18 UTC (rev 12506)
+++ trunk/tests/phpunit/testcases/core/avatars.php 2019-12-23 07:56:32 UTC (rev 12507)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,4 +370,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_thumb_width() {
</span><span class="cx" style="display: block; padding: 0 10px"> return 51;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group bp_core_delete_existing_avatar
+ */
+ public function test_bp_core_delete_existing_avatar() {
+ $avatar_dir1 = bp_core_avatar_upload_path() . '/avatars/1';
+ $avatar_dir2 = bp_core_avatar_upload_path() . '/avatars/2';
+ wp_mkdir_p( $avatar_dir1 );
+ wp_mkdir_p( $avatar_dir2 );
+
+ copy( BP_TESTS_DIR . 'assets/upside-down.jpg', $avatar_dir1 . '/avatar-bpfull.jpg' );
+ copy( BP_TESTS_DIR . 'assets/upside-down.jpg', $avatar_dir1 . '/avatar-bpthumb.jpg' );
+ copy( BP_TESTS_DIR . 'assets/upside-down.jpg', $avatar_dir2 . '/avatar-bpfull.jpg' );
+ copy( BP_TESTS_DIR . 'assets/upside-down.jpg', $avatar_dir2 . '/avatar-bpthumb.jpg' );
+
+ $test = bp_core_delete_existing_avatar( array(
+ 'item_id' => '2/../1',
+ 'object' => 'user',
+ 'avatar_dir' => false
+ ) );
+
+ $this->assertTrue( is_dir( $avatar_dir1 ) );
+
+ $test2 = bp_core_delete_existing_avatar( array(
+ 'item_id' => '2',
+ 'object' => 'user',
+ 'avatar_dir' => false
+ ) );
+
+ $this->assertFalse( is_dir( $avatar_dir2 ) );
+
+ $test1 = bp_core_delete_existing_avatar( array(
+ 'item_id' => 1.1,
+ 'object' => 'user',
+ 'avatar_dir' => false
+ ) );
+
+ $this->assertTrue( is_dir( $avatar_dir1 ) );
+
+ $test1 = bp_core_delete_existing_avatar( array(
+ 'item_id' => 1,
+ 'object' => 'user',
+ 'avatar_dir' => false
+ ) );
+
+ $this->assertFalse( is_dir( $avatar_dir1 ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>