Add explanation firewall inactive when not supported (#40880)

* Add tooltip text to let users know when firewall is disabled because of host * changelog * Show Inactive always if unsupported
Automattic · Jan 8, 2025 · 3dc2652 · 3dc2652
1 parent 1675c72
commit 3dc2652
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 15 deletions.
diff --git a/...my-jetpack/_inc/components/product-cards-section/protect-card/use-protect-tooltip-copy.ts b/...my-jetpack/_inc/components/product-cards-section/protect-card/use-protect-tooltip-copy.ts
@@ -49,6 +49,7 @@ export function useProtectTooltipCopy(): TooltipContent {
 		jetpack_waf_automatic_rules: isAutoFirewallEnabled,
 		blocked_logins: blockedLoginsCount,
 		brute_force_protection: hasBruteForceProtection,
+		waf_supported: wafSupported,
 	} = wafData || {};
 
 	const pluginsCount = fromScanPlugins.length || Object.keys( plugins ).length;
@@ -246,21 +247,26 @@ export function useProtectTooltipCopy(): TooltipContent {
 						),
 				  },
 		autoFirewallTooltip:
-			hasProtectPaidPlan && ! isAutoFirewallEnabled
+			( hasProtectPaidPlan && ! isAutoFirewallEnabled ) || ! wafSupported
 				? {
 						title: __( 'Auto-Firewall: Inactive', 'jetpack-my-jetpack' ),
-						text: createInterpolateElement(
-							__(
-								'You have Auto-Firewall disabled, visit your Protect <a>firewall settings</a> to activate.',
-								'jetpack-my-jetpack'
-							),
-							{
-								a: createElement( 'a', {
-									href: settingsLink,
-									onClick: trackFirewallSettingsLinkClick,
-								} ),
-							}
-						),
+						text: wafSupported
+							? createInterpolateElement(
+									__(
+										'You have Auto-Firewall disabled, visit your Protect <a>firewall settings</a> to activate.',
+										'jetpack-my-jetpack'
+									),
+									{
+										a: createElement( 'a', {
+											href: settingsLink,
+											onClick: trackFirewallSettingsLinkClick,
+										} ),
+									}
+							  )
+							: __(
+									'Auto-Firewall is disabled as your hosting provider already includes a built-in firewall with similar rules for your site.',
+									'jetpack-my-jetpack'
+							  ),
 				  }
 				: {
 						title: __( 'Auto-Firewall: Inactive', 'jetpack-my-jetpack' ),

diff --git a/projects/packages/my-jetpack/changelog/add-explanation-firewall-inactive-when-not-supported b/projects/packages/my-jetpack/changelog/add-explanation-firewall-inactive-when-not-supported
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add new WAF status on Protect card for when WAF is unsupported
diff --git a/projects/packages/my-jetpack/global.d.ts b/projects/packages/my-jetpack/global.d.ts
@@ -286,6 +286,7 @@ interface Window {
 				jetpack_waf_share_data: '1' | '';
 				jetpack_waf_share_debug_data: boolean;
 				standalone_mode: boolean;
+				waf_supported: boolean;
 			};
 		};
 		videopress: {

diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
@@ -236,9 +236,12 @@ public static function enqueue_scripts() {
 		$scan_data                      = Products\Protect::get_protect_data();
 		self::update_historically_active_jetpack_modules();
 
-		$waf_config = array();
+		$waf_config    = array();
+		$waf_supported = false;
+
 		if ( class_exists( 'Automattic\Jetpack\Waf\Waf_Runner' ) ) {
-			$waf_config = Waf_Runner::get_config();
+			$waf_config    = Waf_Runner::get_config();
+			$waf_supported = Waf_Runner::is_supported_environment();
 		}
 
 		wp_localize_script(
@@ -297,6 +300,9 @@ public static function enqueue_scripts() {
 					'scanData'  => $scan_data,
 					'wafConfig' => array_merge(
 						$waf_config,
+						array(
+							'waf_supported' => $waf_supported,
+						),
 						array( 'blocked_logins' => (int) get_site_option( 'jetpack_protect_blocked_attempts', 0 ) )
 					),
 				),