Merge pull request #102 from salopensource/rsr

Support for rsr version

Makefile

@@ -33,7 +33,9 @@ pack-sal-scripts: l_usr_local
 	@sudo chmod -R 755 ${WORK_D}
 
 install: pkg
-	@sudo installer -pkg sal_scripts.pkg -target /
+	@sudo ${RM} -f /tmp/sal_scripts.pkg
+	@sudo ${CP} sal_scripts.pkg /tmp/sal_scripts.pkg
+	@sudo installer -pkg /tmp/sal_scripts.pkg -target /
 
 pack-python: clean-python build-python
 	@sudo ${CP} -R Python.framework ${WORK_D}/usr/local/sal/

payload/usr/local/sal/checkin_modules/machine_checkin.py

@@ -50,11 +50,18 @@ def process_system_profile():
         os_version = (
             system_profile["SPSoftwareDataType"][0].get("os_version").split()[2]
         )
+
     machine_results["operating_system"] = os_version
     machine_results["machine_model"] = system_profile["SPHardwareDataType"][0].get(
         "machine_model"
     )
 
+    if rsr_supported(os_version):
+        rsr_version = get_rsr_version()
+        machine_results["rsr_version"] = rsr_version
+        if rsr_version != "":
+            machine_results["operating_system"] = os_version + " " + rsr_version
+
     udid = system_profile["SPHardwareDataType"][0].get("provisioning_UDID")
     if udid is None:
         # plaform_UUID was the unique id until macOS 10.15
@@ -96,6 +103,22 @@ def process_system_profile():
     return machine_results
 
 
+def rsr_supported(os_version):
+    major_os = os_version.split(".")[0]
+    if int(major_os) >= 13:
+        return True
+    return False
+
+
+def get_rsr_version():
+    try:
+        return subprocess.check_output(
+            ["/usr/bin/sw_vers", "--ProductVersionExtra"], text=True
+        ).strip()
+    except:
+        return ""
+
+
 def get_hostname():
     name_type = sal.sal_pref("NameType", default="ComputerName")
     net_config = SCDynamicStoreCreate(None, "net", None, None)

sal_python_pkg/sal/client.py

@@ -12,7 +12,6 @@
 
 
 class SalClient:
-
     session_class = requests.Session
     _base_url = ""
     _auth = None
@@ -94,7 +93,6 @@ def build_url(self, url):
 
 
 class MacKeychainClient(SalClient):
-
     session_class = MacSeshSession
 
 

sal_python_pkg/sal/version.py

@@ -1 +1 @@
-__version__ = "4.3.0"
+__version__ = "4.4.0"