Add MDM URL detection

Author: almenscorner

SupportCompanion.xcodeproj/project.pbxproj

@@ -10,6 +10,9 @@
 		F60FAB742CE8D40A00ECAC53 /* AlertToast in Frameworks */ = {isa = PBXBuildFile; productRef = F60FAB732CE8D40A00ECAC53 /* AlertToast */; };
 		F60FAB872CEA108A00ECAC53 /* SidebarConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F60FAB862CEA108A00ECAC53 /* SidebarConfig.swift */; };
 		F64927372CF9EA8D00C34D90 /* com.github.macadmins.SupportCompanion.helper in CopyFiles */ = {isa = PBXBuildFile; fileRef = F6F8AE7D2CE345A8009B0A1F /* com.github.macadmins.SupportCompanion.helper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		F6575A992D117108007DBC83 /* ExecutionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F8AE9C2CE34E54009B0A1F /* ExecutionService.swift */; };
+		F6575A9A2D117114007DBC83 /* HelperRemoteProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F8AE9E2CE34E72009B0A1F /* HelperRemoteProvider.swift */; };
+		F6575A9D2D117141007DBC83 /* SupportCompanionErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F8AE952CE34B81009B0A1F /* SupportCompanionErrors.swift */; };
 		F6890EEB2CFF326D00244985 /* SupportCompanionCLI in CopyFiles */ = {isa = PBXBuildFile; fileRef = F6890EE22CFF308F00244985 /* SupportCompanionCLI */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		F6890EEC2CFF330D00244985 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E4D1D42CE4CE1E003EB8C0 /* Preferences.swift */; };
 		F6890EED2CFF331400244985 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6A4E0F62CEC9DFC002B4D74 /* Constants.swift */; };
@@ -118,6 +121,16 @@
 			);
 			target = F6F8AE7C2CE345A8009B0A1F /* com.github.macadmins.SupportCompanion.helper */;
 		};
+		F6575A9C2D117133007DBC83 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				HelperConstans.swift,
+				HelperProtocol.swift,
+				"OSStatus+Extensions.swift",
+				RemoteApplicationProtocol.swift,
+			);
+			target = F6890EE12CFF308F00244985 /* SupportCompanionCLI */;
+		};
 		F6890EEF2CFF332200244985 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
@@ -129,6 +142,7 @@
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Logger.swift,
+				MDMHelpers.swift,
 			);
 			target = F6890EE12CFF308F00244985 /* SupportCompanionCLI */;
 		};
@@ -208,7 +222,7 @@
 		F6E4D2842CE781B9003EB8C0 /* Components */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Components; sourceTree = "<group>"; };
 		F6E72E642CE3DEC300D78336 /* Models */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6890EEF2CFF332200244985 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Models; sourceTree = "<group>"; };
 		F6EB39E72CE1EE2800517FCD /* ViewModels */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6A4E0E52CEBD7D8002B4D74 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = ViewModels; sourceTree = "<group>"; };
-		F6F8AE7E2CE345A8009B0A1F /* Helper */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6A4E0E82CEBD7F8002B4D74 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, F649281C2CFA02C000C34D90 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Helper; sourceTree = "<group>"; };
+		F6F8AE7E2CE345A8009B0A1F /* Helper */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6A4E0E82CEBD7F8002B4D74 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, F649281C2CFA02C000C34D90 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, F6575A9C2D117133007DBC83 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Helper; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -469,6 +483,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				F6890EEC2CFF330D00244985 /* Preferences.swift in Sources */,
+				F6575A9D2D117141007DBC83 /* SupportCompanionErrors.swift in Sources */,
+				F6575A992D117108007DBC83 /* ExecutionService.swift in Sources */,
+				F6575A9A2D117114007DBC83 /* HelperRemoteProvider.swift in Sources */,
 				F6890EED2CFF331400244985 /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

SupportCompanion/Helpers/MDMHelpers.swift

@@ -31,6 +31,28 @@ func getMDMEnrollmentTime() async -> String {
     return "Unknown"
 }
 
+func getMDMUrl() async -> String {
+    do {
+        let commandOutput = try await ExecutionService.executeCommand(
+            "/usr/bin/profiles",
+            with: ["status", "-type", "enrollment"]
+        )
+
+        // Process the command output
+        let lines = commandOutput.split(separator: "\n")
+        for line in lines {
+            if line.contains("MDM server") {
+                let url = line.split(separator: "https://").last?.trimmingCharacters(in: .whitespacesAndNewlines)
+                return url ?? "Unknown"
+            }
+        }
+    } catch {
+        Logger.shared.logError("Error getting MDM URL: \(error)")
+    }
+
+    return "Unknown"
+}
+
 func getMDMStatus() async -> [String: String] {
     var mdmDetails: [String: String] = ["ABM": "", "Enrolled": "", "EnrollmentDate": ""]
 

SupportCompanion/Preferences.swift

@@ -134,9 +134,11 @@ class Preferences: ObservableObject {
 
     @AppStorage("ElevationSeverity") var elevationSeverity: Int = 6 // Default to "Informational"
 
+    var mdm: String = "Unknown"
+        
     init() {
         ensureDefaultsInitialized()
-
+        
         NotificationCenter.default.publisher(for: UserDefaults.didChangeNotification)
             .sink { [weak self] _ in
                 guard let self = self else { return }
@@ -155,11 +157,12 @@ class Preferences: ObservableObject {
                 self?.loadHiddenActions()
                 self?.loadDesktopInfoHideItems()
             }
-        
-        detectModeAndSetLogFolders()
+        Task {
+            await detectModeAndSetLogFolders()
+        }
     }
 
-    private func detectModeAndSetLogFolders() {
+    private func detectModeAndSetLogFolders() async {
         //if !logFolders.isEmpty {
         //    Logger.shared.logDebug("Log folders already initialized: \(logFolders)")
         //    return
@@ -173,12 +176,23 @@ class Preferences: ObservableObject {
         let fileManager = FileManager.default
         let companyPortalExists = fileManager.fileExists(atPath: Constants.AppPaths.companyPortal)
         let mscExists = fileManager.fileExists(atPath: Constants.AppPaths.MSC)
+        let mdmUrl = await getMDMUrl()
+        
+        print(mdmUrl)
 
+        if mdmUrl != "Unknown" {
+            Logger.shared.logDebug("MDM URL detected: \(mdmUrl)")
+            if mdmUrl.contains("i.manage.microsoft.com") {
+                Logger.shared.logDebug("MDM URL contains i.manage.microsoft.com, setting mdm to Intune.")
+                mdm = "Intune"
+            }
+        }
+        
         if companyPortalExists && mscExists {
             Logger.shared.logDebug("Both Munki and Company Portal paths exist, defaulting to Munki mode.")
             mode = Constants.modes.munki
             logFolders = ["/Library/Managed Installs/Logs", "/Library/Logs/Microsoft"]
-        } else if companyPortalExists {
+        } else if companyPortalExists && mdm == "Intune" {
             Logger.shared.logDebug("Company Portal path exists, setting mode to Intune.")
             mode = Constants.modes.intune
             logFolders = ["/Library/Logs/Microsoft"]
@@ -322,7 +336,10 @@ class Preferences: ObservableObject {
             executeShellCommand(command: writeCommand)
         }
 
-        detectModeAndSetLogFolders()
+        Task {
+            await detectModeAndSetLogFolders()
+        }
+        
         Logger.shared.logDebug("Defaults have been reset using defaults write.")
     }