Improve firewall detection by using socketfilterfw

F1248 · Dec 30, 2024 · f130ae7 · f130ae7
1 parent 8543bd6
commit f130ae7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/Genius/Extensions/Swift/Bool.swift b/Genius/Extensions/Swift/Bool.swift
@@ -24,15 +24,12 @@ extension Bool: DataInitializable {
 			"no",
 			"false",
 			"disabled",
-			"spfirewall_globalstate_allow_all",
 		]) {
 			self = false
 		} else if string.contains(any: [
 			"yes",
 			"true",
 			"enabled",
-			"spfirewall_globalstate_limit_connections",
-			"spfirewall_globalstate_block_all",
 		]) {
 			self = true
 		} else { return nil }

diff --git a/Genius/Models/Helpers/SystemProfiler.swift b/Genius/Models/Helpers/SystemProfiler.swift
@@ -10,7 +10,6 @@ import Foundation
 
 enum SystemProfiler {
 
-	static let firewall = get("Firewall")
 	static let hardware = get("Hardware")
 	static let software = get("Software")
 

diff --git a/Genius/Models/SystemInformation/MaintenanceChecks.swift b/Genius/Models/SystemInformation/MaintenanceChecks.swift
@@ -39,7 +39,7 @@ extension SystemInformation {
 				applicable: Software.OS.bootMode.value !=? .recovery
 			)
 			static let firewall = SystemInformationData<Bool?>(
-				{ Bool(SystemProfiler.firewall?["spfirewall_globalstate"]) },
+				{ Bool(Process("/usr/libexec/ApplicationFirewall/socketfilterfw", ["--getglobalstate"])?.runSafe()) },
 				applicable: Software.OS.bootMode.value !=? .recovery
 			)
 			static let gatekeeper = SystemInformationData<Bool?>(Bool(Process("/usr/sbin/spctl", ["--status"])?.runSafe()))