<!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>[2272] 2013/rmccue/trunk/lib/class-wp-json-media.php: Allow passing Content-MD5 headers</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">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2272">2272</a></dd>
<dt>Author</dt> <dd>rmccue</dd>
<dt>Date</dt> <dd>2013-09-11 04:31:25 +0000 (Wed, 11 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow passing Content-MD5 headers
This is only global and cannot be attached to the part in a multipart request.
I do love PHP some times.
See <a href="http://gsoc.trac.wordpress.org/ticket/272">#272</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013rmccuetrunklibclasswpjsonmediaphp">2013/rmccue/trunk/lib/class-wp-json-media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013rmccuetrunklibclasswpjsonmediaphp"></a>
<div class="modfile"><h4>Modified: 2013/rmccue/trunk/lib/class-wp-json-media.php (2271 => 2272)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/rmccue/trunk/lib/class-wp-json-media.php 2013-09-10 20:03:13 UTC (rev 2271)
+++ 2013/rmccue/trunk/lib/class-wp-json-media.php 2013-09-11 04:31:25 UTC (rev 2272)
</span><span class="lines">@@ -106,24 +106,17 @@
</span><span class="cx"> public function uploadAttachment( $_files, $_headers ) {
</span><span class="cx"> global $wp_json_server;
</span><span class="cx">
</span><ins>+ // Get the file via $_FILES or raw data
</ins><span class="cx"> if ( empty( $_files ) ) {
</span><span class="cx"> $file = $this->uploadFromData( $_files, $_headers );
</span><del>- if ( is_wp_error( $file ) )
- return $file;
</del><span class="cx"> }
</span><span class="cx"> else {
</span><del>- if ( empty( $_files['file'] ) )
- return new WP_Error( 'json_upload_no_data', __( 'No data supplied' ), array( 'status' => 400 ) );
</del><ins>+ $file = $this->uploadFromFile( $_files, $_headers );
+ }
</ins><span class="cx">
</span><del>- $overrides = array(
- 'test_form' => false,
- );
- $file = wp_handle_upload( $_files['file'], $overrides );
</del><ins>+ if ( is_wp_error( $file ) )
+ return $file;
</ins><span class="cx">
</span><del>- if ( isset($file['error']) )
- return new WP_Error( 'json_upload_unknown_error', $file['error'], array( 'status' => 500 ) );
- }
-
</del><span class="cx"> $name = basename( $file['file'] );
</span><span class="cx"> $name_parts = pathinfo( $name );
</span><span class="cx"> $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
</span><span class="lines">@@ -198,6 +191,14 @@
</span><span class="cx"> return new WP_Error( 'json_upload_invalid_disposition', __( 'Invalid Content-Disposition supplied' ), array( 'status' => 400 ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! empty( $_headers['CONTENT_MD5'] ) ) {
+ $expected = trim( $_headers['CONTENT_MD5'] );
+ $actual = md5( $data );
+ if ( $expected !== $actual ) {
+ return new WP_Error( 'json_upload_hash_mismatch', __( 'Content hash did not match expected' ), array( 'status' => 412 ) );
+ }
+ }
+
</ins><span class="cx"> // Get the content-type
</span><span class="cx"> $type = $_headers['CONTENT_TYPE'];
</span><span class="cx">
</span><span class="lines">@@ -231,4 +232,29 @@
</span><span class="cx">
</span><span class="cx"> return $sideloaded;
</span><span class="cx"> }
</span><ins>+
+ protected function uploadFromFile( $_files, $_headers ) {
+ if ( empty( $_files['file'] ) )
+ return new WP_Error( 'json_upload_no_data', __( 'No data supplied' ), array( 'status' => 400 ) );
+
+ // Verify hash, if given
+ if ( ! empty( $_headers['CONTENT_MD5'] ) ) {
+ $expected = trim( $_headers['CONTENT_MD5'] );
+ $actual = md5_file( $_files['file']['tmp_name'] );
+ if ( $expected !== $actual ) {
+ return new WP_Error( 'json_upload_hash_mismatch', __( 'Content hash did not match expected' ), array( 'status' => 412 ) );
+ }
+ }
+
+ // Pass off to WP to handle the actual upload
+ $overrides = array(
+ 'test_form' => false,
+ );
+ $file = wp_handle_upload( $_files['file'], $overrides );
+
+ if ( isset($file['error']) )
+ return new WP_Error( 'json_upload_unknown_error', $file['error'], array( 'status' => 500 ) );
+
+ return $file;
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>