Changeset 24843

Timestamp:

07/29/2013 01:19:54 AM (11 years ago)

Author:

dd32

Message:

WP_HTTP: Abstract out the Redirection handling code into it's own method and fix a bunch of redirection edgecases at the same time.
Fixes #17588
Fixes 16889
Props wonderboymusic and kovshenin for initial patches

File:

• trunk/wp-includes/class-http.php (modified) (6 diffs)

trunk/wp-includes/class-http.php

@@ -594 +594 @@
         return $absolute_path . '/' . ltrim( $path, '/' );
     }
+
+    /**
+     * Handles HTTP Redirects and follows them if appropriate.
+     *
+     * @since 3.7
+     *
+     * @param $url The URL which was requested
+     * @param $args The Arguements which were used to make the request
+     * @param $response The Response of the HTTP request
+     * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise
+     */
+    static function handle_redirects( $url, $args, $response ) {
+        // If no redirects are present, or, redirects were not requested, perform no action.
+        if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+            return false;
+
+        // Only perform redirections on redirection http codes
+        if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+            return false;
+
+        // Don't redirect if we've run out of redirects
+        if ( $args['redirection']-- <= 0 )
+            return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+
+        $redirect_location = WP_HTTP::make_absolute_url( $response['headers']['location'], $url );
+
+        // POST requests should not POST to a redirected location
+        if ( 'POST' == $args['method'] ) {
+            if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+                $args['method'] = 'GET';
+        }
+
+        return wp_remote_request( $redirect_location, $args );  
+    }
 }
 
@@ -805 +839 @@
         $arrHeaders = WP_Http::processHeaders( $process['headers'] );
 
-        // If location is found, then assume redirect and redirect to location.
-        if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) {
-            if ( $r['redirection']-- > 0 ) {
-                return wp_remote_request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r);
-            } else {
-                return new WP_Error('http_request_failed', __('Too many redirects.'));
-            }
-        }
+        $response = array(
+            'headers' => $arrHeaders['headers'],
+            'body' => null, // Not yet processed
+            'response' => $arrHeaders['response'],
+            'cookies' => $arrHeaders['cookies'],
+            'filename' => $r['filename']
+        );
+
+        // Handle redirects
+        if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+            return $redirect_response;
 
         // If the body was chunk encoded, then decode it.
@@ -824 +861 @@
             $process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
 
-        return array( 'headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response'], 'cookies' => $arrHeaders['cookies'], 'filename' => $r['filename'] );
+        $response['body'] = $process['body'];
+
+        return $response;
     }
 
@@ -996 +1035 @@
             $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
 
-        if ( ! empty( $processedHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
-            if ( $r['redirection']-- > 0 ) {
-                return wp_remote_request( WP_HTTP::make_absolute_url( $processedHeaders['headers']['location'], $url ), $r );
-            } else {
-                return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
-            }
-        }
+        $response = array(
+            'headers' => $processedHeaders['headers'],
+            'body' => null,
+            'response' => $processedHeaders['response'],
+            'cookies' => $processedHeaders['cookies'],
+            'filename' => $r['filename']
+        );
+
+        // Handle redirects
+        if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+            return $redirect_response;
 
         if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
@@ -1010 +1053 @@
             $strResponse = WP_Http_Encoding::decompress( $strResponse );
 
-        return array( 'headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'], 'cookies' => $processedHeaders['cookies'], 'filename' => $r['filename'] );
+        $response['body'] = $strResponse;
+
+        return $response;
     }
 
@@ -1263 +1308 @@
             fclose( $this->stream_handle );
 
-        // See #11305 - When running under safe mode, redirection is disabled above. Handle it manually.
-        if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
-            if ( $r['redirection']-- > 0 ) {
-                return wp_remote_request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r );
-            } else {
-                return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
-            }
-        }
+        $response = array(
+            'headers' => $theHeaders['headers'],
+            'body' => null,
+            'response' => $response,
+            'cookies' => $theHeaders['cookies'],
+            'filename' => $r['filename']
+        );
+
+        // Handle redirects
+        if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+            return $redirect_response;
 
         if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
             $theBody = WP_Http_Encoding::decompress( $theBody );
 
-        return array( 'headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response, 'cookies' => $theHeaders['cookies'], 'filename' => $r['filename'] );
+        $response['body'] = $theBody;
+
+        return $response;
     }