Status: Do not check WP.com for protect multisite option (#33196)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6241494452
Automattic · Sep 19, 2023 · 1f3abe8 · 1f3abe8
1 parent d660d14
commit 1f3abe8
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 71 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -8,7 +8,7 @@
 		"automattic/jetpack-admin-ui": "^0.2.23",
 		"automattic/jetpack-constants": "^1.6.23",
 		"automattic/jetpack-roles": "^1.4.25",
-		"automattic/jetpack-status": "^1.18.4",
+		"automattic/jetpack-status": "^1.18.5-alpha",
 		"automattic/jetpack-redirect": "^1.7.27"
 	},
 	"require-dev": {

diff --git a/jetpack_vendor/automattic/jetpack-identity-crisis/composer.json b/jetpack_vendor/automattic/jetpack-identity-crisis/composer.json
@@ -6,7 +6,7 @@
 	"require": {
 		"automattic/jetpack-connection": "^1.57.5",
 		"automattic/jetpack-constants": "^1.6.23",
-		"automattic/jetpack-status": "^1.18.4",
+		"automattic/jetpack-status": "^1.18.5-alpha",
 		"automattic/jetpack-logo": "^1.6.3",
 		"automattic/jetpack-assets": "^1.18.11"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-jitm/composer.json b/jetpack_vendor/automattic/jetpack-jitm/composer.json
@@ -11,7 +11,7 @@
 		"automattic/jetpack-logo": "^1.6.3",
 		"automattic/jetpack-partner": "^1.7.25",
 		"automattic/jetpack-redirect": "^1.7.27",
-		"automattic/jetpack-status": "^1.18.4"
+		"automattic/jetpack-status": "^1.18.5-alpha"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",

diff --git a/jetpack_vendor/automattic/jetpack-partner/composer.json b/jetpack_vendor/automattic/jetpack-partner/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"automattic/jetpack-connection": "^1.57.5",
-		"automattic/jetpack-status": "^1.18.4"
+		"automattic/jetpack-status": "^1.18.5-alpha"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",

diff --git a/jetpack_vendor/automattic/jetpack-redirect/composer.json b/jetpack_vendor/automattic/jetpack-redirect/composer.json
@@ -4,7 +4,7 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-status": "^1.18.4"
+		"automattic/jetpack-status": "^1.18.5-alpha"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",

diff --git a/jetpack_vendor/automattic/jetpack-status/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-status/CHANGELOG.md
@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.18.5-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Changed
+- WP.com Compatibility: abort out early checking if Protect is active. WP.com's protection is not site option based.
+
 ## [1.18.4] - 2023-09-19
+
 - Minor internal updates.
 
 ## [1.18.3] - 2023-09-11
@@ -279,6 +287,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Introduce a status package
 
+[1.18.5-alpha]: https://github.com/Automattic/jetpack-status/compare/v1.18.4...v1.18.5-alpha
 [1.18.4]: https://github.com/Automattic/jetpack-status/compare/v1.18.3...v1.18.4
 [1.18.3]: https://github.com/Automattic/jetpack-status/compare/v1.18.2...v1.18.3
 [1.18.2]: https://github.com/Automattic/jetpack-status/compare/v1.18.1...v1.18.2

diff --git a/jetpack_vendor/automattic/jetpack-status/src/class-modules.php b/jetpack_vendor/automattic/jetpack-status/src/class-modules.php
@@ -9,6 +9,7 @@
 
 use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
 use Automattic\Jetpack\IP\Utils as IP_Utils;
+use Automattic\Jetpack\Status\Host;
 
 /**
  * Class Automattic\Jetpack\Modules
@@ -193,8 +194,11 @@ public function get_active() {
 			$active = array_diff( $active, array( 'vaultpress' ) );
 		}
 
-		// If protect is active on the main site of a multisite, it should be active on all sites.
-		if ( ! in_array( 'protect', $active, true ) && is_multisite() && get_site_option( 'jetpack_protect_active' ) ) {
+		// If protect is active on the main site of a multisite, it should be active on all sites. Doesn't apply to WP.com.
+		if ( ! in_array( 'protect', $active, true )
+			&& ! ( new Host() )->is_wpcom_simple()
+			&& is_multisite()
+			&& get_site_option( 'jetpack_protect_active' ) ) {
 			$active[] = 'protect';
 		}
 

diff --git a/jetpack_vendor/automattic/jetpack-sync/composer.json b/jetpack_vendor/automattic/jetpack-sync/composer.json
@@ -10,7 +10,7 @@
 		"automattic/jetpack-password-checker": "^0.2.14",
 		"automattic/jetpack-ip": "^0.1.6",
 		"automattic/jetpack-roles": "^1.4.25",
-		"automattic/jetpack-status": "^1.18.4"
+		"automattic/jetpack-status": "^1.18.5-alpha"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^3.3.9",

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "498d26ad83ac33fa48e51f7ce3b6eda9977e5840"
+                "reference": "d4640b82cc6e5dd7b026565a6d7048766f2e88df"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -57,7 +57,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "941cd41563ec0d065ed8e35c71e1f9aecb8c7404"
+                "reference": "ef07a92844c85ddb06f7d2dc3576648b6f719c5c"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -119,7 +119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "2dfd85ffac6d4c0b5d90150d40a71cc1060f9e9c"
+                "reference": "981ab6ebd7d35638e79afedec1904de84a54f10a"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -187,7 +187,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "04b630c3437de8a1cf5a391be55abb09f128d595"
+                "reference": "d88105ca1906951356d652af2d7d020d3f8fb7c0"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -249,7 +249,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "bb45afc3fd912506130180a8c882f4cbf7af51b9"
+                "reference": "8f667c76bcbfe6ab0cc969fe3cd9cf5eb7cf6222"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -308,7 +308,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "260b8c65bd06522d578277c410b25a8535a1bddf"
+                "reference": "929240fcb535c8c6563056ce84d6ae4389831c69"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9"
@@ -350,15 +350,15 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "1edbf692341fc083d31d6a4b223f0473239640b9"
+                "reference": "9eeca17bd082d7fe456c5080f7d39df28a7cd22a"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
                 "automattic/jetpack-admin-ui": "^0.2.23",
                 "automattic/jetpack-constants": "^1.6.23",
                 "automattic/jetpack-redirect": "^1.7.27",
                 "automattic/jetpack-roles": "^1.4.25",
-                "automattic/jetpack-status": "^1.18.4"
+                "automattic/jetpack-status": "^1.18.5-alpha"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -428,7 +428,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "3b2dc6533ca00fbb5ee989db7b6a4744ebbc29a8"
+                "reference": "80440dd15874daef294839306c06256ab0a0314f"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -479,7 +479,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "19323d0925d7be115b44a7144f49834e18a3d17c"
+                "reference": "a681b7fd3fb9f199c39e07df88c3dec6da87c28d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -529,14 +529,14 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
-                "reference": "622e09c4a33cab3011fe9d7ea2dab9df4c3f7567"
+                "reference": "d154510da54088b631c3b0fa6a2a7894d203ac62"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.11",
                 "automattic/jetpack-connection": "^1.57.5",
                 "automattic/jetpack-constants": "^1.6.23",
                 "automattic/jetpack-logo": "^1.6.3",
-                "automattic/jetpack-status": "^1.18.4"
+                "automattic/jetpack-status": "^1.18.5-alpha"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -607,7 +607,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "967c1c235536c9ee295070af9c1f9c24c04b6dcb"
+                "reference": "0686bb5cbaae8fe56466d6d0afa70896d93849a7"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -662,7 +662,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "c7e39c9be0568deed07f7a0b0933b0ca08542c66"
+                "reference": "e52c7d41389f086bf84053e1892c9ab30a6da138"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -672,7 +672,7 @@
                 "automattic/jetpack-logo": "^1.6.3",
                 "automattic/jetpack-partner": "^1.7.25",
                 "automattic/jetpack-redirect": "^1.7.27",
-                "automattic/jetpack-status": "^1.18.4"
+                "automattic/jetpack-status": "^1.18.5-alpha"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -737,7 +737,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "5540db9fcb8219167f0bd04ce7d61803cb3828c5"
+                "reference": "c8c044b9f447d5b792cc762f7a2c755e8d7fc6fa"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.57.5"
@@ -798,7 +798,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "556b829fffc57574522be362be11b4fb11d7d177"
+                "reference": "2013f42c1c68bbcca88b47507fa57d45ff863495"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -848,7 +848,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "18bb8e40958b59811dcfaeac726e6ac7e586be4b"
+                "reference": "dc4c034e1ebcbf856072a2e99f3c10e643dc74cf"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.2.23",
@@ -938,11 +938,11 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-partner",
-                "reference": "f8bc250dae35916f7f85989b21fa9016357e1bf0"
+                "reference": "2303a2e965c1e79ee815acd09b50867e477f5c68"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.57.5",
-                "automattic/jetpack-status": "^1.18.4"
+                "automattic/jetpack-status": "^1.18.5-alpha"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -1000,7 +1000,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "4191bf28b6f392cfabb3390dbeb8566391ed4f77"
+                "reference": "6684c4e6d3def292b4d014a5c0b4c6a0ef9e5bc0"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -1058,7 +1058,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "786724fe48423a7a5b825fc7036932cefa5ee8bd"
+                "reference": "e4e82655af5e02f16bbc57ec06c2f73bba707585"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22"
@@ -1112,10 +1112,10 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "b0eb4f5b0b355cc0609d484f023b338523af8e58"
+                "reference": "60b58b68d7c50edff09774dde0caf2db0cd53a62"
             },
             "require": {
-                "automattic/jetpack-status": "^1.18.4"
+                "automattic/jetpack-status": "^1.18.5-alpha"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -1166,7 +1166,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "0b268ece0b6e19f90132c303d45a43571fafc42c"
+                "reference": "add8ccbff0ef6dd7ff73dd91526db41984bd7a55"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",
@@ -1212,12 +1212,12 @@
         },
         {
             "name": "automattic/jetpack-status",
-            "version": "1.18.4",
-            "version_normalized": "1.18.4.0",
+            "version": "1.18.5-alpha.1695161834",
+            "version_normalized": "1.18.5.0-alpha1695161834",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "fec87466ec3dba34200043292ff41003d606cf05"
+                "reference": "f62ed8d8384dac08568381422fb64f1919e4121e"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -1272,7 +1272,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "4a6909894d0fe641a505ff37f14f98d5f7de82b2"
+                "reference": "d2a7db48b8d65f41b0551bb476fc75c26e5fb7a7"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.57.5",
@@ -1281,7 +1281,7 @@
                 "automattic/jetpack-ip": "^0.1.6",
                 "automattic/jetpack-password-checker": "^0.2.14",
                 "automattic/jetpack-roles": "^1.4.25",
-                "automattic/jetpack-status": "^1.18.4"
+                "automattic/jetpack-status": "^1.18.5-alpha"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.9",