Changeset 41605

Timestamp:

09/27/2017 07:59:14 AM (7 years ago)

Author:

dd32

Message:

Standardise on performing api.WordPress.org requests over SSL when possible, falling back to non-SSL when appropriate.
This also standardises the User-Agent used when communicating with WordPress.org, allowing for more consistent version detection.

Fixes #42004.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-community-events.php (modified) (1 diff)
• wp-admin/includes/credits.php (modified) (2 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/import.php (modified) (1 diff)
• wp-admin/includes/plugin-install.php (modified) (2 diffs)
• wp-admin/includes/theme.php (modified) (2 diffs)
• wp-includes/update.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-community-events.php

@@ -93 +93 @@
         }
 
-        $api_url        = 'https://api.wordpress.org/events/1.0/';
-        $request_args   = $this->get_request_args( $location_search, $timezone );
+        // include an unmodified $wp_version
+        include( ABSPATH . WPINC . '/version.php' );
+
+        $api_url      = 'http://api.wordpress.org/events/1.0/';
+        $request_args = $this->get_request_args( $location_search, $timezone );
+        $request_args['user-agent'] = 'WordPress/' . $wp_version . '; ' . home_url( '/' );
+
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $api_url = set_url_scheme( $api_url, 'https' );
+        }
+
         $response       = wp_remote_get( $api_url, $request_args );
         $response_code  = wp_remote_retrieve_response_code( $response );

trunk/src/wp-admin/includes/credits.php

@@ -16 +16 @@
  */
 function wp_credits() {
-    $wp_version = get_bloginfo( 'version' );
+    // include an unmodified $wp_version
+    include( ABSPATH . WPINC . '/version.php' );
+
     $locale = get_user_locale();
 
@@ -25 +27 @@
         || ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
     ) {
-        $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}" );
+        $url = "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}";
+        $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
+
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
+        $response = wp_remote_get( $url, $options );
 
         if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )

trunk/src/wp-admin/includes/dashboard.php

@@ -1510 +1510 @@
 
     if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+        // include an unmodified $wp_version
+        include( ABSPATH . WPINC . '/version.php' );
+
+        $url = 'http://api.wordpress.org/core/browse-happy/1.1/';
         $options = array(
-            'body'          => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
-            'user-agent'    => 'WordPress/' . get_bloginfo( 'version' ) . '; ' . home_url()
+            'body'       => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
+            'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
         );
 
-        $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
+        $response = wp_remote_post( $url, $options );
 
         if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )

trunk/src/wp-admin/includes/import.php

@@ -132 +132 @@
     if ( ! $popular_importers ) {
         $url = add_query_arg( array(
-            'locale'  => get_user_locale(),
+            'locale'  => $locale,
             'version' => $wp_version,
         ), 'http://api.wordpress.org/core/importers/1.1/' );
-        $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
+        $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
+
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
         $response = wp_remote_get( $url, $options );
         $popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );

trunk/src/wp-admin/includes/plugin-install.php

@@ -142 +142 @@
 
     if ( false === $res ) {
+        // include an unmodified $wp_version
+        include( ABSPATH . WPINC . '/version.php' );
+
         $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
         if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
@@ -148 +151 @@
         $http_args = array(
             'timeout' => 15,
+            'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
             'body' => array(
                 'action' => $action,

trunk/src/wp-admin/includes/theme.php

@@ -449 +449 @@
 
     if ( ! $res ) {
+        // include an unmodified $wp_version
+        include( ABSPATH . WPINC . '/version.php' );
+
         $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
         if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
@@ -454 +457 @@
 
         $http_args = array(
+            'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
             'body' => array(
                 'action' => $action,

trunk/src/wp-includes/update.php

@@ -302 +302 @@
             'all'          => wp_json_encode( true ),
         ),
-        'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
+        'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
     );
 
@@ -480 +480 @@
             'locale'       => wp_json_encode( $locales ),
         ),
-        'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
+        'user-agent'    => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
     );