Use device_probe

Resources/Utilities.py

@@ -3,11 +3,13 @@ from __future__ import print_function
 
 import os
 import math
+from pathlib import Path
 import plistlib
 import subprocess
 
 from Resources import Constants
 
+
 def hexswap(input_hex: str):
     hex_pairs = [input_hex[i : i + 2] for i in range(0, len(input_hex), 2)]
     hex_rev = hex_pairs[::-1]
@@ -25,12 +27,17 @@ def header(lines):
     print("#" * total_length)
 
 
+RECOVERY_STATUS = None
+
+
 def check_recovery():
-    root_partition_info = plistlib.loads(subprocess.run("diskutil info -plist /".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-    if root_partition_info["VolumeName"] == "macOS Base System" and root_partition_info["FilesystemType"] == "apfs" and root_partition_info["BusProtocol"] == "Disk Image":
-        return True
-    else:
-        return False
+    global RECOVERY_STATUS  # pylint: disable=global-statement # We need to cache the result
+
+    if RECOVERY_STATUS is None:
+        RECOVERY_STATUS = Path("/System/Library/BaseSystem").exists()
+
+    return RECOVERY_STATUS
+
 
 def get_disk_path():
     root_partition_info = plistlib.loads(subprocess.run("diskutil info -plist /".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
@@ -38,39 +45,40 @@ def get_disk_path():
     root_mount_path = root_mount_path[:-2] if root_mount_path.count("s") > 1 else root_mount_path
     return root_mount_path
 
+
 def csr_decode(csr_active_config):
     if csr_active_config is None:
         csr_active_config = b"\x00\x00\x00\x00"
     sip_int = int.from_bytes(csr_active_config, byteorder="little")
     i = 0
-    for current_sip_bit in Constants.Constants().csr_values:
+    for current_sip_bit in Constants.Constants.csr_values:
         if sip_int & (1 << i):
-            Constants.Constants().csr_values[current_sip_bit] = True
+            Constants.Constants.csr_values[current_sip_bit] = True
         i = i + 1
 
     # Can be adjusted to whatever OS needs patching
-    sip_needs_change = all(
-        Constants.Constants().csr_values[i]
-        for i in Constants.Constants().root_patch_sip_big_sur
-    )
+    sip_needs_change = all(Constants.Constants.csr_values[i] for i in Constants.Constants.root_patch_sip_big_sur)
     if sip_needs_change is True:
         return False
     else:
         return True
 
+def friendly_hex(integer: int):
+    return "{:02X}".format(integer)
+
 def patching_status():
     # Detection for Root Patching
     sip_enabled = True  # System Integrity Protection
     sbm_enabled = True  # Secure Boot Status (SecureBootModel)
-    amfi_enabled = True # Apple Mobile File Integrity
-    fv_enabled = True   # FileVault
+    amfi_enabled = True  # Apple Mobile File Integrity
+    fv_enabled = True  # FileVault
 
     amfi_1 = "amfi_get_out_of_my_way=0x1"
     amfi_2 = "amfi_get_out_of_my_way=1"
 
-    if get_nvram("boot-args", decode=False) and (amfi_1 in get_nvram("boot-args", decode=False) or amfi_2 in get_nvram("boot-args", decode=False)):
+    if get_nvram("boot-args", decode=False) and amfi_1 in get_nvram("boot-args", decode=False) or amfi_2 in get_nvram("boot-args", decode=False):
         amfi_enabled = False
-    if get_nvram("HardwareModel", "94B73556-2197-4702-82A8-3E1337DAFBFB", decode=False) not in Constants.Constants().sbm_values:
+    if get_nvram("HardwareModel", "94B73556-2197-4702-82A8-3E1337DAFBFB", decode=False) not in Constants.Constants.sbm_values:
         sbm_enabled = False
 
     if get_nvram("csr-active-config", decode=False) and csr_decode(get_nvram("csr-active-config", decode=False)) is False:
@@ -82,14 +90,18 @@ def patching_status():
 
     return sip_enabled, sbm_enabled, amfi_enabled, fv_enabled
 
+
 def cls():
     if not check_recovery():
         os.system("cls" if os.name == "nt" else "clear")
     else:
         print("\u001Bc")
 
+
 def get_nvram(variable: str, uuid: str = None, *, decode: bool = False):
-    if uuid != None:
+    # TODO: Properly fix for El Capitan, which does not print the XML representation even though we say to
+
+    if uuid is not None:
         uuid += ":"
     else:
         uuid = ""
@@ -102,6 +114,7 @@ def get_nvram(variable: str, uuid: str = None, *, decode: bool = False):
         value = value.strip(b"\0").decode()
     return value
 
+
 # def menu(title, prompt, menu_options, add_quit=True, auto_number=False, in_between=[], top_level=False):
 #     return_option = ["Q", "Quit", None] if top_level else ["B", "Back", None]
 #     if add_quit: menu_options.append(return_option)