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

Timestamp:

03/13/2017 05:56:27 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: ZIPs: Do not build zips on demand, instead store them within a SVN repository.

See #1578

File:

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

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

@@ -13 +13 @@
 class Serve {
 
-        const ZIP_DIR = '/tmp/plugin-zipfiles';
-
         public function __construct() {
                 try {
                         $request = $this->determine_request();
 
-                        // Serve & perhaps build if need be
-                        $files = $this->get_files( $request );
-                        if ( ! file_exists( $files['zip'] ) ) {
-                                $builder = new Builder( $request['slug'], $request['version'] );
-                                $builder->build();
-                                clearstatcache();
-                        }
-
-                        $this->serve_zip( $files, $request );
+                        $this->serve_zip( $request );
 
                         if ( $request['args']['stats'] ) {
@@ -34 +24 @@
 
                 } catch ( Exception $e )  {
-                        $this->error( $e->getCode() );
+                        $this->error();
                 }
 
@@ -51 +41 @@
 
                 if ( ! preg_match( "!^(?P<slug>[a-z0-9-]+)(.(?P<version>.+))?.zip$!i", $zip, $m ) ) {
-                        throw new Exception( __METHOD__ . ": Invalid URL" );
+                        throw new Exception( __METHOD__ . ": Invalid URL." );
                 }
 
@@ -96 +86 @@
                 }
                 if ( ! $version ) {
-                        throw new Exception( __METHOD__ . ": A version for $plugin_slug cannot be determined.", 404 );
+                        throw new Exception( __METHOD__ . ": A version for $plugin_slug cannot be determined." );
                 }
 
@@ -121 +111 @@
 
                 if ( ! $post_id ) {
-                        throw new Exception( __METHOD__ . ": A post_id for $plugin_slug cannot be determined.", 404 );
+                        throw new Exception( __METHOD__ . ": A post_id for $plugin_slug cannot be determined." );
                 }
 
@@ -133 +123 @@
          * @return array An array containing the files to use for the request, 'zip' and 'md5'.
          */
-        protected function get_files( $request ) {
+        protected function get_file( $request ) {
                 if ( empty( $request['version'] ) || 'trunk' == $request['version'] ) {
-                        $zip = self::ZIP_DIR . "/{$request['slug']}/{$request['slug']}.zip";
+                        return "{$request['slug']}/{$request['slug']}.zip";
                 } else {
-                        $zip = self::ZIP_DIR . "/{$request['slug']}/{$request['slug']}.{$request['version']}.zip";
-                }
-                $md5 = $zip . '.md5';
-
-                return compact( 'zip', 'md5' );
+                        return "{$request['slug']}/{$request['slug']}.{$request['version']}.zip";
+                }
         }
 
@@ -147 +134 @@
          * Output a ZIP file with all headers.
          *
-         * @param array $files {
-         *   Array of files for the request.
-         *
-         *   @type string $zip The Zip file to serve.
-         *   @type string $md5 The MD5 file to use for the Content-MD5 header. Optional.
-         * }
          * @param array $request The request array for the request.
          */
-        protected function serve_zip( $files, $request ) {
-                header( 'Content-Type: application/zip' );
-                header( 'Content-Disposition: attachment; filename=' . basename( $files['zip'] ) );
-                if ( !empty( $files['md5'] ) && ( $md5 = file_get_contents( $files['md5'] ) )  ) {
-                        header( 'Content-MD5: ' . $md5 );
-                }
-
-                // TODO: Accel Redirect allows for ZIP files to be cached on the LB's
-                // header('X-Accel-Redirect: ' . $accel_redirect );
-
-                header( 'Content-Length: ' . filesize( $files['zip'] ) );
-                readfile( $files['zip'] );
+        protected function serve_zip( $request ) {
+                $zip = $this->get_file( $request );
+
+                if ( defined( 'PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION' ) ) {
+                        $zip_url = PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION . $zip;
+
+                        header( 'Content-Type: application/zip' );
+                        header( 'Content-Disposition: attachment; filename=' . basename( $zip ) );
+                        header( "X-Accel-Redirect: $zip_url" );
+                } else {
+                        header( 'Content-Type: text/plain' );
+                        echo "This is a request for $zip, this server isn't currently configured to serve zip files.\n";
+                }
+
+                if ( function_exists( 'fastcgi_finish_request' ) ) {
+                        fastcgi_finish_request();
+                }
+
         }
 
@@ -225 +212 @@
 
         /**
-         * Quit with an Error code.
-         *
-         * @param int $code The HTTP Error code, 404 or 503.
-         */
-        protected function error( $code = 404 ) {
+         * Bail with a 404.
+         */
+        protected function error() {
                 $protocol = isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
                 $protocol .= ' ';
-                switch ( $code ) {
-                        case 503:
-                                header( $protocol . '503 Service Unavailable' );
-                                die( '503 Service Unavailable' );
-
-                        default:
-                        case 404:
-                                header( $protocol . '404 File not found' );
-                                die( '404 File not found' );
-                }
+
+                header( $protocol . '404 File not found' );
+                die( '404 file not found' );
         }