Changeset 8483

Timestamp:

03/21/2019 06:55:35 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: ZIPs: When building ZIP files, generate the signatures for them too.

Signature generation is currently disabled pending some WordPress.org changes.

See #4308.
See ​https://core.trac.wordpress.org/ticket/39309.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php

@@ -16 +16 @@
     const ZIP_SVN_URL = PLUGIN_ZIP_SVN_URL;
 
-    protected $zip_file      = '';
-    protected $checksum_file = '';
-    protected $tmp_build_dir = '';
-    protected $tmp_dir       = '';
+    protected $zip_file       = '';
+    protected $checksum_file  = '';
+    protected $signature_file = '';
+    protected $tmp_build_dir  = '';
+    protected $tmp_dir        = '';
 
     protected $slug       = '';
@@ -117 +118 @@
                 $this->generate_zip();
 
+                $this->generate_zip_signatures();
+
                 $this->generate_checksums();
 
@@ -130 +133 @@
                     SVN::up( $this->checksum_file );
                 }
+                if ( $this->signature_file ) {
+                    SVN::up( $this->signature_file );
+                }
                 continue;
             }
@@ -137 +143 @@
             if ( $this->checksum_file ) {
                 SVN::add( $this->checksum_file );
+            }
+            if ( $this->signature_file ) {
+                SVN::add( $this->signature_file );
             }
         }
@@ -434 +443 @@
     }
 
+    /**
+     * Generate the signature for a ZIP file.
+     */
+    protected function generate_zip_signatures() {
+
+        // TODO: Currently disabled, enable when ready.
+        return false;
+
+        if ( ! function_exists( 'wporg_sign_file' ) ) {
+            return false;
+        }
+
+        $signatures = wporg_sign_file( $this->zip_file, 'plugin' );
+        if ( $signatures ) {
+            $this->signature_file = $this->zip_file . '.sig';
+
+            // Fetch any existing signatures if needed.
+            SVN::up( $this->signature_file );
+
+            // If this file was previously signed, keep the previous version.
+            // This would only occur if a ZIP file was replaced in the few moments between ZIP download starting, and fetching the signature for verification.
+            if ( file_exists( $this->signature_file ) ) {
+                $existing_signatures = file( $this->signature_file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES );
+                $signatures = array_unique( array_merge( $signatures, $existing_signatures ) );
+            }
+
+            file_put_contents( $this->signature_file, implode( "\n", $signatures ) );
+        }
+    }
 
     /**