Update jetpack 8.0

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 6 insertions, 121 deletions

diff --git a/plugins/jetpack/class.jetpack-data.php b/plugins/jetpack/class.jetpack-data.php
index 13b15bbc..6dbb8de2 100644
--- a/plugins/jetpack/class.jetpack-data.php
+++ b/plugins/jetpack/class.jetpack-data.php
@@ -1,128 +1,13 @@
 <?php
 
-class Jetpack_Data {
-	/**
-	 * Gets locally stored token
-	 *
-	 * @return object|false
-	 */
-	public static function get_access_token( $user_id = false ) {
-		if ( $user_id ) {
-			if ( !$tokens = Jetpack_Options::get_option( 'user_tokens' ) ) {
-				return false;
-			}
-			if ( $user_id === JETPACK_MASTER_USER ) {
-				if ( !$user_id = Jetpack_Options::get_option( 'master_user' ) ) {
-					return false;
-				}
-			}
-			if ( !isset( $tokens[$user_id] ) || !$token = $tokens[$user_id] ) {
-				return false;
-			}
-			$token_chunks = explode( '.', $token );
-			if ( empty( $token_chunks[1] ) || empty( $token_chunks[2] ) ) {
-				return false;
-			}
-			if ( $user_id != $token_chunks[2] ) {
-				return false;
-			}
-			$token = "{$token_chunks[0]}.{$token_chunks[1]}";
-		} else {
-			$token = Jetpack_Options::get_option( 'blog_token' );
-			if ( empty( $token ) ) {
-				return false;
-			}
-		}
-
-		return (object) array(
-			'secret' => $token,
-			'external_user_id' => (int) $user_id,
-		);
-	}
-
-	/**
-	 * This function mirrors Jetpack_Data::is_usable_domain() in the WPCOM codebase.
-	 *
-	 * @param $domain
-	 * @param array $extra
-	 *
-	 * @return bool|WP_Error
-	 */
-	public static function is_usable_domain( $domain, $extra = array() ) {
-
-		// If it's empty, just fail out.
-		if ( ! $domain ) {
-			return new WP_Error( 'fail_domain_empty', sprintf( __( 'Domain `%1$s` just failed is_usable_domain check as it is empty.', 'jetpack' ), $domain ) );
-		}
-
-		/**
-		 * Skips the usuable domain check when connecting a site.
-		 *
-		 * Allows site administrators with domains that fail gethostname-based checks to pass the request to WP.com
-		 *
-		 * @since 4.1.0
-		 *
-		 * @param bool If the check should be skipped. Default false.
-		 */
-		if ( apply_filters( 'jetpack_skip_usuable_domain_check', false ) ) {
-			return true;
-		}
-
-		// None of the explicit localhosts.
-		$forbidden_domains = array(
-			'wordpress.com',
-			'localhost',
-			'localhost.localdomain',
-			'127.0.0.1',
-			'local.wordpress.test',         // VVV
-			'local.wordpress-trunk.test',   // VVV
-			'src.wordpress-develop.test',   // VVV
-			'build.wordpress-develop.test', // VVV
-		);
-		if ( in_array( $domain, $forbidden_domains ) ) {
-			return new WP_Error( 'fail_domain_forbidden', sprintf( __( 'Domain `%1$s` just failed is_usable_domain check as it is in the forbidden array.', 'jetpack' ), $domain ) );
-		}
-
-		// No .test or .local domains
-		if ( preg_match( '#\.(test|local)$#i', $domain ) ) {
-			return new WP_Error( 'fail_domain_tld', sprintf( __( 'Domain `%1$s` just failed is_usable_domain check as it uses an invalid top level domain.', 'jetpack' ), $domain ) );
-		}
-
-		// No WPCOM subdomains
-		if ( preg_match( '#\.wordpress\.com$#i', $domain ) ) {
-			return new WP_Error( 'fail_subdomain_wpcom', sprintf( __( 'Domain `%1$s` just failed is_usable_domain check as it is a subdomain of WordPress.com.', 'jetpack' ), $domain ) );
-		}
-
-		// If PHP was compiled without support for the Filter module (very edge case)
-		if ( ! function_exists( 'filter_var' ) ) {
-			// Just pass back true for now, and let wpcom sort it out.
-			return true;
-		}
-
-		return true;
-	}
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 
+class Jetpack_Data {
 	/**
-	 * Returns true if the IP address passed in should not be in a reserved range, even if PHP says that it is.
-	 * See: https://bugs.php.net/bug.php?id=66229 and https://github.com/php/php-src/commit/d1314893fd1325ca6aa0831101896e31135a2658
-	 *
-	 * This function mirrors Jetpack_Data::php_bug_66229_check() in the WPCOM codebase.
+	 * @deprecated 7.5 Use Connection_Manager instead.
 	 */
-	public static function php_bug_66229_check( $ip ) {
-		if ( ! filter_var( $ip, FILTER_VALIDATE_IP ) ) {
-			return false;
-		}
-
-		$ip_arr = array_map( 'intval', explode( '.', $ip ) );
-
-		if ( 128 == $ip_arr[0] && 0 == $ip_arr[1] ) {
-			return true;
-		}
-
-		if ( 191 == $ip_arr[0] && 255 == $ip_arr[1] ) {
-			return true;
-		}
-
-		return false;
+	public static function get_access_token( $user_id = false, $token_key = false, $suppress_errors = true ) {
+		$connection = new Connection_Manager();
+		return $connection->get_access_token( $user_id, $token_key, $suppress_errors );
 	}
 }