Merge pull request #32 from john-shaffer/30-add-object-acl-option

Add Object ACL option

Author: leonstafford

src/Controller.php

@@ -195,6 +195,16 @@ public static function seedOptions() : void {
 
         $wpdb->query( $query );
 
+        $query = $wpdb->prepare(
+            $query_string,
+            's3ObjectACL',
+            'public-read',
+            'Object ACL',
+            ''
+        );
+
+        $wpdb->query( $query );
+
         $query = $wpdb->prepare(
             $query_string,
             'cfMaxPathsToInvalidate',
@@ -433,6 +443,12 @@ public static function saveOptionsFromUI() : void {
             [ 'name' => 's3CacheControl' ]
         );
 
+        $wpdb->update(
+            $table_name,
+            [ 'value' => sanitize_text_field( $_POST['s3ObjectACL'] ) ],
+            [ 'name' => 's3ObjectACL' ]
+        );
+
         $wpdb->update(
             $table_name,
             [ 'value' => sanitize_text_field( $_POST['cfMaxPathsToInvalidate'] ) ],
@@ -477,4 +493,5 @@ public function addOptionsPage() : void {
              [ $this, 'renderS3Page' ]
          );
     }
-}
+}
+

src/Deployer.php

@@ -39,9 +39,10 @@ public function upload_files( string $processed_site_path ) : void {
             )
         );
 
+        $object_acl = Controller::getValue( 's3ObjectACL' );
         $put_data = [
             'Bucket' => Controller::getValue( 's3Bucket' ),
-            'ACL'    => 'public-read',
+            'ACL'    => $object_acl === '' ? 'public-read' : $object_acl,
         ];
 
         $cache_control = Controller::getValue( 's3CacheControl' );
@@ -64,10 +65,6 @@ public function upload_files( string $processed_site_path ) : void {
 
                 $cache_key = str_replace( $processed_site_path, '', $filename );
 
-                if ( \WP2Static\DeployCache::fileisCached( $cache_key, $namespace ) ) {
-                    continue;
-                }
-
                 if ( ! $real_filepath ) {
                     $err = 'Trying to deploy unknown file to S3: ' . $filename;
                     \WP2Static\WsLog::l( $err );
@@ -93,13 +90,26 @@ public function upload_files( string $processed_site_path ) : void {
                 }
 
                 $put_data['Key'] = $s3_key;
-                $put_data['Body'] = file_get_contents( $filename );
                 $put_data['ContentType'] = $mime_type;
+                $put_data_hash = md5( json_encode( $put_data ) );
+                $put_data['Body'] = file_get_contents( $filename );
+                $body_hash = md5( $put_data['Body'] );
+                $hash = md5( $put_data_hash . $body_hash );
+
+                $is_cached = \WP2Static\DeployCache::fileisCached(
+                    $cache_key,
+                    $namespace,
+                    $hash,
+                );
+
+                if ( $is_cached ) {
+                    continue;
+                }
 
                 $result = $s3->putObject( $put_data );
 
                 if ( $result['@metadata']['statusCode'] === 200 ) {
-                    \WP2Static\DeployCache::addFile( $cache_key, $namespace );
+                    \WP2Static\DeployCache::addFile( $cache_key, $namespace, $hash );
 
                     if ( $cf_max_paths >= count( $cf_stale_paths ) ) {
                         $cf_key = $cache_key;
@@ -118,23 +128,12 @@ public function upload_files( string $processed_site_path ) : void {
         $redirects = apply_filters( 'wp2static_list_redirects', [] );
 
         foreach ( $redirects as $redirect ) {
-            $file_hash = md5( '301' . $redirect['redirect_to'] );
             $cache_key = $redirect['url'];
 
             if ( mb_substr( $cache_key, -1 ) === '/' ) {
                 $cache_key = $cache_key . 'index.html';
             }
 
-            $is_cached = \WP2Static\DeployCache::fileisCached(
-                $cache_key,
-                $namespace,
-                $file_hash
-            );
-
-            if ( $is_cached ) {
-                continue;
-            }
-
             $s3_key =
                 Controller::getValue( 's3RemotePath' ) ?
                 Controller::getValue( 's3RemotePath' ) . '/' .
@@ -143,11 +142,22 @@ public function upload_files( string $processed_site_path ) : void {
 
             $put_data['Key'] = $s3_key;
             $put_data['WebsiteRedirectLocation'] = $redirect['redirect_to'];
+            $hash = md5( json_encode( $put_data ) );
+
+            $is_cached = \WP2Static\DeployCache::fileisCached(
+                $cache_key,
+                $namespace,
+                $hash,
+            );
+
+            if ( $is_cached ) {
+                continue;
+            }
 
             $result = $s3->putObject( $put_data );
 
             if ( $result['@metadata']['statusCode'] === 200 ) {
-                \WP2Static\DeployCache::addFile( $cache_key, $namespace, $file_hash );
+                \WP2Static\DeployCache::addFile( $cache_key, $namespace, $hash );
 
                 if ( $cf_max_paths >= count( $cf_stale_paths ) ) {
                     $cf_key = $cache_key;

views/s3-page.php

@@ -127,6 +127,27 @@
             </td>
         </tr>
 
+        <tr>
+            <td style="width:50%;">
+                <label
+                    for="<?php echo $view['options']['s3ObjectACL']->name; ?>"
+                ><?php echo $view['options']['s3ObjectACL']->label; ?></label>
+            </td>
+            <td>
+                <select
+                    id="<?php echo $view['options']['s3ObjectACL']->name; ?>"
+                    name="<?php echo $view['options']['s3ObjectACL']->name; ?>"
+                >
+                    <option
+                        <?php if ( $view['options']['s3ObjectACL']->value === 'public-read' ) { echo "selected"; } ?>
+                        value="public-read">public-read</option>
+                    <option
+                        <?php if ( $view['options']['s3ObjectACL']->value === 'private' ) { echo "selected"; } ?>
+                        value="private">private</option>
+                </select>
+            </td>
+        </tr>
+
     </tbody>
 </table>