Improve SIP detection by using csrutil

F1248 · Dec 30, 2024 · 0d48695 · 0d48695
1 parent 819f1de
commit 0d48695
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Genius/Extensions/Swift/Bool.swift b/Genius/Extensions/Swift/Bool.swift
@@ -22,14 +22,14 @@ extension Bool: DataInitializable {
 		guard
 			let string = string.map({ $0[($0.range(of: ":", options: .backwards)?.upperBound ?? $0.startIndex)...] })?.lowercased()
 		else { return nil }
-		if string.contains(any: [
+		if string.contains(anyWholeWord: [
 			"yes",
 			"on",
 			"true",
 			"enabled",
 		]) {
 			self = true
-		} else if string.contains(any: [
+		} else if string.contains(anyWholeWord: [
 			"no",
 			"off",
 			"false",

diff --git a/Genius/Extensions/Swift/StringProtocol.swift b/Genius/Extensions/Swift/StringProtocol.swift
@@ -19,8 +19,12 @@ extension StringProtocol {
 		self.init(data)
 	}
 
-	func contains(any strings: [some StringProtocol]) -> Bool {
-		strings.contains(where: contains)
+	func contains(anyWholeWord strings: [String]) -> Bool {
+		strings.contains { contains(wholeWord: $0) }
+	}
+
+	func contains(wholeWord: String) -> Bool {
+		components(separatedBy: .alphanumerics.inverted).contains(wholeWord)
 	}
 
 	func remove(_ string: some StringProtocol) -> String {

diff --git a/Genius/Models/SystemInformation/MaintenanceChecks.swift b/Genius/Models/SystemInformation/MaintenanceChecks.swift
@@ -35,7 +35,7 @@ extension SystemInformation {
 		enum MalwareProtection {
 
 			static let systemIntegrityProtection = SystemInformationData<Bool?>(
-				{ Bool(SystemProfiler.software?["system_integrity"] as? String) },
+				{ Bool(Process("/usr/bin/csrutil", ["status"])?.runSafe()) },
 				applicable: Software.OS.bootMode.value !=? .recovery
 			)
 			static let firewall = SystemInformationData<Bool?>(