Changeset 8484

Timestamp:

03/21/2019 06:57:33 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: ZIPs: Allow serving ZIP signature files at $zip_url.sig as used by r8483 and Core.

Currently no plugins ZIPs have signatures, but these will be generated after 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-serve.php (modified) (5 diffs)

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

@@ -38 +38 @@
         $zip  = basename( $path );
 
-        if ( preg_match( '!^(?P<slug>[a-z0-9-_]+)(\.(?P<version>.+?))?\.zip$!i', $zip, $m ) ) {
-            // ZIP
-            $checksum_request = false;
+        if ( preg_match( '!^(?P<slug>[a-z0-9-_]+)(\.(?P<version>.+?))?\.zip(?P<signature>\.sig)?$!i', $zip, $m ) ) {
+            // ZIP or Signature
+            $checksum_request  = false;
+            $signature_request = isset( $m['signature'] );
         } elseif ( preg_match( '!^/plugin-checksums/(?P<slug>[a-z0-9-_]+)/(?P<version>.+?)(\.json)?$!i', $path, $m ) ) {
             // Checksums
-            $checksum_request = true;
+            $checksum_request  = true;
+            $signature_request = false;
         } else {
             throw new Exception( __METHOD__ . ': Invalid URL.' );
@@ -67 +69 @@
         );
 
-        if ( $checksum_request ) {
+        if ( $checksum_request || $signature_request ) {
             $args['stats'] = false;
 
@@ -77 +79 @@
         }
 
-        return compact( 'zip', 'slug', 'version', 'args', 'checksum_request' );
+        return compact( 'zip', 'slug', 'version', 'args', 'checksum_request', 'signature_request' );
     }
 
@@ -145 +147 @@
 
         } elseif ( empty( $request['version'] ) || 'trunk' == $request['version'] ) {
-            return "{$request['slug']}/{$request['slug']}.zip";
+            $file = "{$request['slug']}/{$request['slug']}.zip";
 
         } else {
-            return "{$request['slug']}/{$request['slug']}.{$request['version']}.zip";
-        }
-
+            $file = "{$request['slug']}/{$request['slug']}.{$request['version']}.zip";
+        }
+
+        // Signature requests are valid for any ZIP requests, but not checksums.
+        if ( $request['signature_request'] ) {
+            $file .= '.sig';
+        }
+
+        return $file;
     }
 
@@ -166 +174 @@
             if ( $request['checksum_request'] ) {
                 header( 'Content-Type: application/json' );
+            } elseif ( $request['signature_request'] ) {
+                header( 'Content-Type: text/plain' );
             } else {
                 header( 'Content-Type: application/zip' );