Changeset 6163

Timestamp:

11/23/2017 05:51:26 AM (9 years ago)

Author:

dd32

Message:

Plugin Directory: Checksums: Move the checksums to their final URL, https://downloads.wordpress.org/plugin-checksums/$plugin/$version.json.

See #3192

File:

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

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

@@ -35 +35 @@
          */
         protected function determine_request() {
-                $zip = basename( parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) );
-
-                if ( ! preg_match( "!^(?P<slug>[a-z0-9-_]+)(\.(?P<version>.+?))?\.(?P<request_type>zip|checksums\.json)$!i", $zip, $m ) ) {
+                $path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+                $zip  = basename( $path );
+
+                if ( preg_match( "!^(?P<slug>[a-z0-9-_]+)(\.(?P<version>.+?))?\.zip$!i", $zip, $m ) ) {
+                        // ZIP
+                        $checksum_request = false;
+                } elseif ( preg_match( "!^/plugin-checksums/(?P<slug>[a-z0-9-_]+)/(?P<version>.+?)(\.json)?$!i", $path, $m ) ) {
+                        // Checksums
+                        $checksum_request = true;
+                } else {
                         throw new Exception( __METHOD__ . ": Invalid URL." );
                 }
@@ -51 +58 @@
                 }
 
-                if ( 'zip' == strtolower( $m['request_type'] ) ) {
-                        $checksum_request = false;
-                } else {
-                        $checksum_request = true;
-
-                        // Checksum requests for 'trunk' are not possible.
-                        if ( 'trunk' == $version ) {
-                                throw new Exception( __METHOD__ . ": Checksum requests must include a version." );
-                        }
-
+                // Checksum requests for 'trunk' are not possible.
+                if ( $checksum_request && 'trunk' == $version ) {
+                        throw new Exception( __METHOD__ . ": Checksum requests must include a version." );
                 }