<!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>[10806] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Theme uploads: Validate the file is a valid ZIP file before processing it.</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/10806">10806</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/10806","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>2021-03-11 02:54:26 +0000 (Thu, 11 Mar 2021)</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'>Theme Directory: Theme uploads: Validate the file is a valid ZIP file before processing it.
This is caused by some users uploading zero byte, or corrupted ZIP files which contain unexpected contents.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp"></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/theme-directory/class-wporg-themes-upload.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/theme-directory/class-wporg-themes-upload.php 2021-03-10 22:11:08 UTC (rev 10805)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-03-11 02:54:26 UTC (rev 10806)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,6 +36,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const UNZIP = '/usr/bin/unzip';
</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">+ * Temporary directory where uploads are stored.
+ *
+ * @var string
+ */
+ const TMP = '/tmp/wporg-theme-upload';
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Path to temporary directory.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,11 +125,34 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Get set up to run tests on the uploaded theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Validate that a theme upload succeeded and was a valid file.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function __construct() {
- $this->create_tmp_dirs();
- $this->unwrap_package();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function validate_upload( $file ) {
+ // Check to see if PHP detected any errors in the upload.
+ if ( 0 !== $file['error'] ) {
+ return false;
+ }
+
+ // Validate the file uploaded correctly.
+ $size = filesize( $file['tmp_name'] );
+ if ( ! $size || $size !== $file['size'] ) {
+ return false;
+ }
+
+ // Validate that the file is a ZIP file before processing it.
+ $check = wp_check_filetype_and_ext(
+ $file['tmp_name'],
+ $file['name'],
+ [
+ 'zip' => 'application/zip'
+ ]
+ );
+ if ( ! $check['ext'] || ! $check['type'] ) {
+ return false;
+ }
+
+ // Everything seems fine, the ZIP file might still be invalid still if it was corrupted on the authors computer.
+ return true;
</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">@@ -132,7 +162,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Failure or success message.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function process_upload() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function process_upload( $file_upload ) {
+ $valid_upload = $this->validate_upload( $file_upload );
+ if ( ! $valid_upload ) {
+ return __( 'Error in file upload.', 'wporg-themes' );
+ }
+
+ $this->create_tmp_dirs( $file_upload['name'] );
+ $this->unzip_package( $file_upload );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_files = $this->get_all_files( $this->theme_dir );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // First things first. Do we have something to work with?
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,11 +434,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Creates a temporary directory, and the theme dir within it.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function create_tmp_dirs() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_tmp_dirs( $base_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a temporary directory if it doesn't exist yet.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tmp = '/tmp/wporg-theme-upload';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tmp = self::TMP;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_dir( $tmp ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mkdir( $tmp, 0777 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( $tmp );
+ chmod( $tmp, 0777 );
</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"> // Create file with unique file name.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> chmod( $this->tmp_dir, 0777 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get a sanitized name for that theme and create a directory for it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_name = $this->get_sanitized_zip_name();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_name = $this->get_sanitized_zip_name( $base_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->theme_dir = "{$this->tmp_dir}/{$base_name}";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->tmp_svn_dir = "{$this->tmp_dir}/svn";
</span><span class="cx" style="display: block; padding: 0 10px"> mkdir( $this->theme_dir );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,12 +468,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Unzips the uploaded theme and saves it in the temporary theme dir.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function unwrap_package() {
- $base_name = $this->get_sanitized_zip_name();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function unzip_package( $file ) {
+ $base_name = $this->get_sanitized_zip_name( $file['name'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $zip_file = "{$this->tmp_dir}/{$base_name}.zip";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Move the uploaded zip in the temporary directory.
- move_uploaded_file( $_FILES['zip_file']['tmp_name'], $zip_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move the uploaded zip into the temporary directory.
+ move_uploaded_file( $file['tmp_name'], $zip_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $unzip = escapeshellarg( self::UNZIP );
</span><span class="cx" style="display: block; padding: 0 10px"> $zip_file = escapeshellarg( $zip_file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,11 +480,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tmp_dir = escapeshellarg( $this->tmp_dir );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Unzip it into the theme directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->exec_with_notify( escapeshellcmd( "{$unzip} -DD {$zip_file} -d {$tmp_dir}/{$base_name}" ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->exec_with_notify( escapeshellcmd( "{$unzip} -DDn {$zip_file} -d {$tmp_dir}/{$base_name}" ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Fix any permissions issues with the files. Sets 755 on directories, 644 on files
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fix any permissions issues with the files. Sets 755 on directories, 644 on files.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->exec_with_notify( escapeshellcmd( "chmod -R 755 {$tmp_dir}/{$base_name}" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->exec_with_notify( escapeshellcmd( "find {$tmp_dir}/{$base_name} -type f -print0" ) . ' | xargs -I% -0 chmod 644 %' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Remove any unexpected entries, we only need basic files and directories, anything else will cause problems when installed onto a site.
+ $this->exec_with_notify( escapeshellcmd( "find {$tmp_dir}/{$base_name} -not -type f -not -type d -delete" ) );
</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">@@ -1135,8 +1177,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function get_sanitized_zip_name() {
- return preg_replace( '|\W|', '', strtolower( basename( $_FILES['zip_file']['name'], '.zip') ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_sanitized_zip_name( $name ) {
+ return preg_replace( '|\W|', '', strtolower( basename( $name, '.zip') ) );
</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_htmlwpcontentpluginsthemedirectoryuploadphp"></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/theme-directory/upload.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/theme-directory/upload.php 2021-03-10 22:11:08 UTC (rev 10805)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php 2021-03-11 02:54:26 UTC (rev 10806)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_size_limit', 'wporg_themes_upload_size_limit', 10, 0 );
</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">+ * Allows upload of .zip files on Multisite.
+ */
+function wporg_themes_upload_allow_zip( $allowed ) {
+ return "$allowed zip";
+}
+add_filter( 'site_option_upload_filetypes', 'wporg_themes_upload_allow_zip' );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Renders the upload shortcode.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_render_upload_shortcode() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return __( 'You must be logged in to upload a new theme.', 'wporg-themes' );
</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 ( 0 !== $_FILES['zip_file']['error'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_FILES['zip_file'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return __( 'Error in file upload.', 'wporg-themes' );
</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">@@ -81,7 +89,7 @@
</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"> $upload = new WPORG_Themes_Upload;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = $upload->process_upload();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = $upload->process_upload( $_FILES['zip_file'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $message;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>