Add jetpack signature class to connection package

_inc/lib/debugger/class-jetpack-cxn-tests.php

@@ -5,6 +5,7 @@
  * @package Jetpack
  */
 
+
 /**
  * Class Jetpack_Cxn_Tests contains all of the actual tests.
  */

class.jetpack-client.php

@@ -54,8 +54,6 @@ public static function remote_request( $args, $body = null ) {
 
 		$token_key = sprintf( '%s:%d:%d', $token_key, JETPACK__API_VERSION, $token->external_user_id );
 
-		require_once JETPACK__PLUGIN_DIR . 'class.jetpack-signature.php';
-
 		$time_diff = (int) Jetpack_Options::get_option( 'time_diff' );
 		$jetpack_signature = new Jetpack_Signature( $token->secret, $time_diff );
 
@@ -89,7 +87,7 @@ public static function remote_request( $args, $body = null ) {
 				return new Jetpack_Error( 'invalid_body', 'Body is malformed.' );
 			}
 
-			$body_hash = jetpack_sha1_base64( $body_to_hash );
+			$body_hash = Jetpack::connection()->sha1_base64( $body_to_hash );
 		}
 
 		$auth = array(

class.jetpack.php

@@ -5203,8 +5203,6 @@ function verify_xml_rpc_signature() {
 			return false;
 		}
 
-		require_once JETPACK__PLUGIN_DIR . 'class.jetpack-signature.php';
-
 		$jetpack_signature = new Jetpack_Signature( $token->secret, (int) Jetpack_Options::get_option( 'time_diff' ) );
 		if ( isset( $_POST['_jetpack_is_multipart'] ) ) {
 			$post_data   = $_POST;
@@ -5814,8 +5812,6 @@ function add_token_to_login_redirect_json_api_authorization( $redirect_to, $orig
 	 * @param null|array $environment
 	 */
 	function verify_json_api_authorization_request( $environment = null ) {
-		require_once JETPACK__PLUGIN_DIR . 'class.jetpack-signature.php';
-
 		$environment = is_null( $environment )
 			? $_REQUEST
 			: $environment;

functions.compat.php

@@ -1,5 +1,7 @@
 <?php
 
+use \Automattic\Jetpack\Connection\Manager as Connection_Manager;
+
 /**
 * Required for class.media-extractor.php to match expected function naming convention.
 *
@@ -88,3 +90,11 @@ function wp_in( $needle, $haystack ) {
 		return false !== strpos( $haystack, $needle );
 	}
 endif;
+
+/**
+ * @deprecated 7.5 Use Connection_Manager instead.
+ */
+function jetpack_sha1_base64( $text ) {
+	$connection = new Connection_Manager();
+	return $connection->sha1_base64( $text );
+}

jetpack.php

@@ -47,6 +47,12 @@
 	. '-----END PUBLIC KEY-----' . "\r\n"
 );
 
+// These constants can be set in wp-config.php to ensure sites behind proxies will still work.
+// Setting these constants, though, is *not* the preferred method. It's better to configure
+// the proxy to send the X-Forwarded-Port header.
+defined( 'JETPACK_SIGNATURE__HTTP_PORT'  ) or define( 'JETPACK_SIGNATURE__HTTP_PORT' , 80  );
+defined( 'JETPACK_SIGNATURE__HTTPS_PORT' ) or define( 'JETPACK_SIGNATURE__HTTPS_PORT', 443 );
+
 /**
  * Returns the location of Jetpack's lib directory. This filter is applied
  * in require_lib().

packages/connection/composer.json

@@ -14,7 +14,10 @@
 	"autoload": {
 		"psr-4": {
 			"Automattic\\Jetpack\\Connection\\": "src"
-		}
+		},
+		"classmap": [
+			"legacy"
+		]
 	},
 	"scripts": {
 		"phpunit": [