Merge branch 'develop' into Sidekit-jit-implementation

Signed-off-by: Spidy123222 <64176728+Spidy123222@users.noreply.github.com>

AltStore/Operations/BackgroundRefreshAppsOperation.swift

@@ -11,6 +11,7 @@ import CoreData
 
 import AltStoreCore
 import EmotionalDamage
+import minimuxer
 
 enum RefreshError: LocalizedError
 {
@@ -97,6 +98,14 @@ final class BackgroundRefreshAppsOperation: ResultOperation<[String: Result<Inst
             return
         }
         start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        target_minimuxer_address()
+        let documentsDirectory = FileManager.default.documentsDirectory.absoluteString
+        do {
+            try minimuxer.start(try String(contentsOf: FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)")), documentsDirectory)
+        } catch {
+            self.finish(.failure(error))
+        }
+        start_auto_mounter(documentsDirectory)
         
         self.managedObjectContext.perform {
             print("Apps to refresh:", self.installedApps.map(\.bundleIdentifier))

AltStore/Operations/DeactivateAppOperation.swift

@@ -44,14 +44,9 @@ final class DeactivateAppOperation: ResultOperation<InstalledApp>
             
             for profile in allIdentifiers {
                 do {
-                    let res = try remove_provisioning_profile(id: profile)
-                    if case Uhoh.Bad(let code) = res {
-                        self.finish(.failure(minimuxer_to_operation(code: code)))
-                    }
-                } catch Uhoh.Bad(let code) {
-                    self.finish(.failure(minimuxer_to_operation(code: code)))
+                    try remove_provisioning_profile(profile)
                 } catch {
-                    self.finish(.failure(ALTServerError(.unknownResponse)))
+                    return self.finish(.failure(error))
                 }
             }
             

AltStore/Operations/EnableJITOperation.swift

@@ -45,23 +45,13 @@ final class EnableJITOperation<Context: EnableJITContext>: ResultOperation<Void>
         guard let installedApp = self.context.installedApp else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         installedApp.managedObjectContext?.perform {
-            let v = minimuxer_to_operation(code: 1)
-                        
             do {
-                var x = try debug_app(app_id: installedApp.resignedBundleIdentifier)
-                switch x {
-                case .Good:
-                    self.finish(.success(()))
-                case .Bad(let code):
-                    self.finish(.failure(minimuxer_to_operation(code: code)))
-                }
-            } catch Uhoh.Bad(let code) {
-                self.finish(.failure(minimuxer_to_operation(code: code)))
+                try debug_app(installedApp.resignedBundleIdentifier)
             } catch {
-                self.finish(.failure(OperationError.unknown))
+                return self.finish(.failure(error))
             }
             
-            
+            self.finish(.success(()))
         }
     }
 }

AltStore/Operations/FetchProvisioningProfilesOperation.swift

@@ -268,8 +268,17 @@ extension FetchProvisioningProfilesOperation
                             }
                         }
                     }
+                    //App ID name must be ascii. If the name is not ascii, using bundleID instead
+                    let appIDName: String
+                    if !name.allSatisfy({ $0.isASCII }) {
+                        //Contains non ASCII (Such as Chinese/Japanese...), using bundleID
+                        appIDName = bundleIdentifier
+                    }else {
+                        //ASCII text, keep going as usual
+                        appIDName = name
+                    }
                     
-                    ALTAppleAPI.shared.addAppID(withName: name, bundleIdentifier: bundleIdentifier, team: team, session: session) { (appID, error) in
+                    ALTAppleAPI.shared.addAppID(withName: appIDName, bundleIdentifier: bundleIdentifier, team: team, session: session) { (appID, error) in
                         do
                         {
                             do
@@ -384,19 +393,39 @@ extension FetchProvisioningProfilesOperation
         
         if app.isAltStoreApp
         {
+            print("Application groups before modifying for SideStore: \(applicationGroups)")
+            
+            // Remove app groups that contain AltStore since they can be problematic (cause SideStore to expire early)
+            for (index, group) in applicationGroups.enumerated() {
+                if group.contains("AltStore") {
+                    print("Removing application group: \(group)")
+                    applicationGroups.remove(at: index)
+                }
+            }
+            
+            // Make sure we add .AltWidget for the widget
+            var altStoreAppGroupID = Bundle.baseAltStoreAppGroupID
+            for (_, group) in applicationGroups.enumerated() {
+                if group.contains("AltWidget") {
+                    altStoreAppGroupID += ".AltWidget"
+                    break
+                }
+            }
+            
             // Potentially updating app groups for this specific AltStore.
             // Find the (unique) AltStore app group, then replace it
             // with the correct "base" app group ID.
             // Otherwise, we may append a duplicate team identifier to the end.
             if let index = applicationGroups.firstIndex(where: { $0.contains(Bundle.baseAltStoreAppGroupID) })
             {
-                applicationGroups[index] = Bundle.baseAltStoreAppGroupID
+                applicationGroups[index] = altStoreAppGroupID
             }
             else
             {
-                applicationGroups.append(Bundle.baseAltStoreAppGroupID)
+                applicationGroups.append(altStoreAppGroupID)
             }
         }
+        print("Application groups: \(applicationGroups)")
         
         // Dispatch onto global queue to prevent appGroupsLock deadlock.
         DispatchQueue.global().async {
@@ -478,10 +507,13 @@ extension FetchProvisioningProfilesOperation
                 ALTAppleAPI.shared.delete(profile, for: team, session: session) { (success, error) in
                     switch Result(success, error)
                     {
-                    case .failure(let error): completionHandler(.failure(error))
-                    case .success:
+                    case .failure:
+                        // As of March 20, 2023, the free provisioning profile is re-generated each fetch, and you can no longer delete it.
+                        // So instead, we just return the fetched profile from above.
+                        completionHandler(.success(profile))
                         
-                        // Fetch new provisiong profile
+                    case .success:
+                        // Fetch new provisioning profile
                         ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, deviceType: .iphone, team: team, session: session) { (profile, error) in
                             completionHandler(Result(profile, error))
                         }

AltStore/Operations/InstallAppOperation.swift

@@ -11,6 +11,7 @@ import Network
 import AltStoreCore
 import AltSign
 import Roxas
+import minimuxer
 
 @objc(InstallAppOperation)
 final class InstallAppOperation: ResultOperation<InstalledApp>
@@ -148,17 +149,72 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
                 })
             }
             
-            let ns_bundle = NSString(string: installedApp.bundleIdentifier)
-            let ns_bundle_ptr = UnsafeMutablePointer<CChar>(mutating: ns_bundle.utf8String)
-            
-            let res = minimuxer_install_ipa(ns_bundle_ptr)
-            if res == 0 {
-                installedApp.refreshedDate = Date()
-                self.finish(.success(installedApp))
-
-            } else {
-                self.finish(.failure(minimuxer_to_operation(code: res)))
+            var installing = true
+            if installedApp.storeApp?.bundleIdentifier == Bundle.Info.appbundleIdentifier {
+                // Reinstalling ourself will hang until we leave the app, so we need to exit it without force closing
+                DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
+                    if UIApplication.shared.applicationState != .active {
+                        print("We are not in the foreground, let's not do anything")
+                        return
+                    }
+                    if !installing {
+                        print("Installing finished")
+                        return
+                    }
+                    print("We are still installing after 3 seconds")
+                    
+                    UNUserNotificationCenter.current().getNotificationSettings { settings in
+                        switch (settings.authorizationStatus) {
+                        case .authorized, .ephemeral, .provisional:
+                            print("Notifications are enabled")
+                            
+                            let content = UNMutableNotificationContent()
+                            content.title = "Refreshing..."
+                            content.body = "To finish refreshing, SideStore must be moved to the background, which it does by opening Safari. Please reopen SideStore after it is done refreshing!"
+                            let notification = UNNotificationRequest(identifier: Bundle.Info.appbundleIdentifier + ".FinishRefreshNotification", content: content, trigger: UNTimeIntervalNotificationTrigger(timeInterval: 2, repeats: false))
+                            UNUserNotificationCenter.current().add(notification)
+                            
+                            DispatchQueue.main.async { UIApplication.shared.open(URL(string: "x-web-search://")!) }
+                            
+                            break
+                        default:
+                            print("Notifications are not enabled")
+                            
+                            let alert = UIAlertController(title: "Finish Refresh", message: "To finish refreshing, SideStore must be moved to the background. To do this, you can either go to the Home Screen or open Safari by pressing Continue. Please reopen SideStore after doing this.", preferredStyle: .alert)
+                            alert.addAction(UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default, handler: { _ in
+                                print("Opening Safari")
+                                DispatchQueue.main.async { UIApplication.shared.open(URL(string: "x-web-search://")!) }
+                            }))
+                            
+                            DispatchQueue.main.async {
+                                let keyWindow = UIApplication.shared.windows.filter { $0.isKeyWindow }.first
+                                if var topController = keyWindow?.rootViewController {
+                                    while let presentedViewController = topController.presentedViewController {
+                                        topController = presentedViewController
+                                    }
+                                    topController.present(alert, animated: true)
+                                } else {
+                                    print("No key window? Let's just open Safari")
+                                    UIApplication.shared.open(URL(string: "x-web-search://")!)
+                                }
+                            }
+                            
+                            break
+                        }
+                    }
+                }
             }
+            
+            do {
+                try install_ipa(installedApp.bundleIdentifier)
+                installing = false
+            } catch {
+                installing = false
+                return self.finish(.failure(error))
+            }
+            
+            installedApp.refreshedDate = Date()
+            self.finish(.success(installedApp))
         }
     }
     
@@ -174,10 +230,11 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
             do
             {
                 try FileManager.default.removeItem(at: fileURL)
+                print("Removed refreshed IPA")
             }
             catch
             {
-                print("Failed to remove refreshed .ipa:", error)
+                print("Failed to remove refreshed .ipa: \(error)")
             }
         }
         

AltStore/Operations/OperationError.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import AltSign
+import minimuxer
 
 enum OperationError: LocalizedError
 {
@@ -33,20 +34,6 @@ enum OperationError: LocalizedError
     case openAppFailed(name: String)
     case missingAppGroup
     
-    case noDevice
-    case createService(name: String)
-    case getFromDevice(name: String)
-    case setArgument(name: String)
-    case afc
-    case install
-    case uninstall
-    case lookupApps
-    case detach
-    case functionArguments
-    case profileInstall
-    case noConnection
-    case attach
-    
     var failureReason: String? {
         switch self {
         case .unknown: return NSLocalizedString("An unknown error occured.", comment: "")
@@ -62,19 +49,6 @@ enum OperationError: LocalizedError
         case .openAppFailed(let name): return String(format: NSLocalizedString("SideStore was denied permission to launch %@.", comment: ""), name)
         case .missingAppGroup: return NSLocalizedString("SideStore's shared app group could not be found.", comment: "")
         case .maximumAppIDLimitReached: return NSLocalizedString("Cannot register more than 10 App IDs.", comment: "")
-        case .noDevice: return NSLocalizedString("Cannot fetch the device from the muxer", comment: "")
-        case .createService(let name): return String(format: NSLocalizedString("Cannot start a %@ server on the device.", comment: ""), name)
-        case .getFromDevice(let name): return String(format: NSLocalizedString("Cannot fetch %@ from the device.", comment: ""), name)
-        case .setArgument(let name): return String(format: NSLocalizedString("Cannot set %@ on the device.", comment: ""), name)
-        case .afc: return NSLocalizedString("AFC was unable to manage files on the device", comment: "")
-        case .install: return NSLocalizedString("Unable to install the app from the staging directory", comment: "")
-        case .uninstall: return NSLocalizedString("Unable to uninstall the app", comment: "")
-        case .lookupApps: return NSLocalizedString("Unable to fetch apps from the device", comment: "")
-        case .detach: return NSLocalizedString("Unable to detach from the app's process", comment: "")
-        case .functionArguments: return NSLocalizedString("A function was passed invalid arguments", comment: "")
-        case .profileInstall: return NSLocalizedString("Unable to manage profiles on the device", comment: "")
-        case .noConnection: return NSLocalizedString("Unable to connect to the device, make sure Wireguard is enabled and you're connected to WiFi", comment: "")
-        case .attach: return NSLocalizedString("Unable to attach to the app's process", comment: "")
         }
     }
     
@@ -119,44 +93,6 @@ enum OperationError: LocalizedError
         }
     }
 }
-
-func minimuxer_to_operation(code: Int32) -> OperationError {
-    switch code {
-    case 1:
-        return OperationError.noDevice
-    case 2:
-        return OperationError.createService(name: "debug")
-    case 3:
-        return OperationError.createService(name: "instproxy")
-    case 4:
-        return OperationError.getFromDevice(name: "installed apps")
-    case 5:
-        return OperationError.getFromDevice(name: "path to the app")
-    case 6:
-        return OperationError.getFromDevice(name: "bundle path")
-    case 7:
-        return OperationError.setArgument(name: "max packet")
-    case 8:
-        return OperationError.setArgument(name: "working directory")
-    case 9:
-        return OperationError.setArgument(name: "argv")
-    case 10:
-        return OperationError.getFromDevice(name: "launch success")
-    case 11:
-        return OperationError.detach
-    case 12:
-        return OperationError.functionArguments
-    case 13:
-        return OperationError.createService(name: "AFC")
-    case 14:
-        return OperationError.afc
-    case 15:
-        return OperationError.install
-    case 16:
-        return OperationError.uninstall
-    case 17:
-        return OperationError.createService(name: "misagent")
-    case 18:
         return OperationError.profileInstall
     case 19:
         return OperationError.profileInstall
@@ -166,5 +102,66 @@ func minimuxer_to_operation(code: Int32) -> OperationError {
         return OperationError.attach
     default:
         return OperationError.unknown
+extension MinimuxerError: LocalizedError {
+    public var failureReason: String? {
+        switch self {
+        case .NoDevice:
+            return NSLocalizedString("Cannot fetch the device from the muxer", comment: "")
+        case .NoConnection:
+            return NSLocalizedString("Unable to connect to the device, make sure Wireguard is enabled and you're connected to WiFi", comment: "")
+        case .PairingFile:
+            return NSLocalizedString("Invalid pairing file. Your pairing file either didn't have a UDID, or it wasn't a valid plist. Please use jitterbugpair to generate it", comment: "")
+            
+        case .CreateDebug:
+            return self.createService(name: "debug")
+        case .LookupApps:
+            return self.getFromDevice(name: "installed apps")
+        case .FindApp:
+            return self.getFromDevice(name: "path to the app")
+        case .BundlePath:
+            return self.getFromDevice(name: "bundle path")
+        case .MaxPacket:
+            return self.setArgument(name: "max packet")
+        case .WorkingDirectory:
+            return self.setArgument(name: "working directory")
+        case .Argv:
+            return self.setArgument(name: "argv")
+        case .LaunchSuccess:
+            return self.getFromDevice(name: "launch success")
+        case .Detach:
+            return NSLocalizedString("Unable to detach from the app's process", comment: "")
+        case .Attach:
+            return NSLocalizedString("Unable to attach to the app's process", comment: "")
+            
+        case .CreateInstproxy:
+            return self.createService(name: "instproxy")
+        case .CreateAfc:
+            return self.createService(name: "AFC")
+        case .RwAfc:
+            return NSLocalizedString("AFC was unable to manage files on the device", comment: "")
+        case .InstallApp:
+            return NSLocalizedString("Unable to install the app from the staging directory", comment: "")
+        case .UninstallApp:
+            return NSLocalizedString("Unable to uninstall the app", comment: "")
+
+        case .CreateMisagent:
+            return self.createService(name: "misagent")
+        case .ProfileInstall:
+            return NSLocalizedString("Unable to manage profiles on the device", comment: "")
+        case .ProfileRemove:
+            return NSLocalizedString("Unable to manage profiles on the device", comment: "")
+        }
+    }
+    
+    fileprivate func createService(name: String) -> String {
+        return String(format: NSLocalizedString("Cannot start a %@ server on the device.", comment: ""), name)
+    }
+    
+    fileprivate func getFromDevice(name: String) -> String {
+        return String(format: NSLocalizedString("Cannot fetch %@ from the device.", comment: ""), name)
+    }
+    
+    fileprivate func setArgument(name: String) -> String {
+        return String(format: NSLocalizedString("Cannot set %@ on the device.", comment: ""), name)
     }
 }

AltStore/Operations/RefreshAppOperation.swift

@@ -49,15 +49,12 @@ final class RefreshAppOperation: ResultOperation<InstalledApp>
 
                 for p in profiles {
                     do {
-                        let x = try install_provisioning_profile(plist: p.value.data)
-                        if case .Bad(let code) = x {
-                            self.finish(.failure(minimuxer_to_operation(code: code)))
-                        }
-                    } catch Uhoh.Bad(let code) {
-                        self.finish(.failure(minimuxer_to_operation(code: code)))
+                        let bytes = p.value.data.toRustByteSlice()
+                        try install_provisioning_profile(bytes.forRust())
                     } catch {
-                        self.finish(.failure(OperationError.unknown))
+                        return self.finish(.failure(error))
                     }
+                    
                     self.progress.completedUnitCount += 1
                     
                     let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), app.bundleIdentifier)

AltStore/Operations/RemoveAppOperation.swift

@@ -39,15 +39,11 @@ final class RemoveAppOperation: ResultOperation<InstalledApp>
             let resignedBundleIdentifier = installedApp.resignedBundleIdentifier
             
             do {
-                let res = try remove_app(app_id: resignedBundleIdentifier)
-                if case Uhoh.Bad(let code) = res {
-                    self.finish(.failure(minimuxer_to_operation(code: code)))
-                }
-            } catch Uhoh.Bad(let code) {
-                self.finish(.failure(minimuxer_to_operation(code: code)))
+                try remove_app(resignedBundleIdentifier)
             } catch {
-                self.finish(.failure(ALTServerError(.appDeletionFailed)))
+                return self.finish(.failure(error))
             }
+            
             DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
                 self.progress.completedUnitCount += 1
                 

AltStore/Operations/ResignAppOperation.swift

@@ -61,6 +61,7 @@ final class ResignAppOperation: ResultOperation<ALTApplication>
                 {
                     let destinationURL = InstalledApp.refreshedIPAURL(for: app)
                     try FileManager.default.copyItem(at: resignedURL, to: destinationURL, shouldReplace: true)
+                    print("Successfully resigned app to \(destinationURL.absoluteString)")
                     
                     // Use appBundleURL since we need an app bundle, not .ipa.
                     guard let resignedApplication = ALTApplication(fileURL: appBundleURL) else { throw OperationError.invalidApp }
@@ -147,6 +148,14 @@ private extension ResignAppOperation
             infoDictionary[Bundle.Info.exportedUTIs] = exportedUTIs
             
             try (infoDictionary as NSDictionary).write(to: bundle.infoPlistURL)
+            
+            // Remove _CodeSignature folder (if it exists) because it will be added when resigning and it may have files that aren't overwritten when resigning
+            // These files might be the cause of some ApplicationVerificationFailed errors
+            let codeSignaturePath = bundle.bundleURL.appendingPathComponent("_CodeSignature").absoluteString.replacingOccurrences(of: "file://", with: "")
+            if FileManager.default.fileExists(atPath: codeSignaturePath) {
+                try FileManager.default.removeItem(atPath: codeSignaturePath)
+                print("Removed _CodeSignature folder at \(codeSignaturePath)")
+            }
         }
         
         DispatchQueue.global().async {

AltStore/Operations/SendAppOperation.swift

@@ -9,6 +9,7 @@ import Foundation
 import Network
 
 import AltStoreCore
+import minimuxer
 
 @objc(SendAppOperation)
 final class SendAppOperation: ResultOperation<()>
@@ -44,24 +45,18 @@ final class SendAppOperation: ResultOperation<()>
         
         print("AFC App `fileURL`: \(fileURL.absoluteString)")
         
-        let ns_bundle = NSString(string: app.bundleIdentifier)
-        let ns_bundle_ptr = UnsafeMutablePointer<CChar>(mutating: ns_bundle.utf8String)
-
         if let data = NSData(contentsOf: fileURL) {
-            let pls = UnsafeMutablePointer<UInt8>.allocate(capacity: data.length)
-            for (index, data) in data.enumerated() {
-                pls[index] = data
-            }
-            let res = minimuxer_yeet_app_afc(ns_bundle_ptr, pls, UInt(data.length))
-            if res == 0 {
-                print("minimuxer_yeet_app_afc `res` == \(res)")
-                self.progress.completedUnitCount += 1
-                self.finish(.success(()))
-            } else {
-                self.finish(.failure(minimuxer_to_operation(code: res)))
+            do {
+                let bytes = Data(data).toRustByteSlice()
+                try yeet_app_afc(app.bundleIdentifier, bytes.forRust())
+            } catch {
+                return self.finish(.failure(error))
             }
             
+            self.progress.completedUnitCount += 1
+            self.finish(.success(()))
         } else {
+            print("IPA doesn't exist????")
             self.finish(.failure(ALTServerError(.underlyingError)))
         }
     }