neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-19 19:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[AltServer] Throws coder CocoaErrors if source JSON is invalid

Browse Source 
Uses same error code with different debug descriptions. These errors should never be thrown in production so no need for unique codes, but if they do get thrown then they include enough technical information to debug.

Replaces OperationError.appNotFound
This commit is contained in:
Riley Testut
2022-11-28 12:23:25 -06:00
parent b89462016f
commit 223495cdb9
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
AltServer/Devices/ALTDeviceManager+Installation.swift
View File

@@ -44,17 +44,12 @@ extension OperationError
case noTeam case noTeam
case missingPrivateKey case missingPrivateKey
case missingCertificate case missingCertificate
// Source JSON
case appNotFound
} }
static let cancelled = OperationError(code: .cancelled) static let cancelled = OperationError(code: .cancelled)
static let noTeam = OperationError(code: .noTeam) static let noTeam = OperationError(code: .noTeam)
static let missingPrivateKey = OperationError(code: .missingPrivateKey) static let missingPrivateKey = OperationError(code: .missingPrivateKey)
static let missingCertificate = OperationError(code: .missingCertificate) static let missingCertificate = OperationError(code: .missingCertificate)
static func appNotFound(bundleID: String) -> OperationError { OperationError(code: .appNotFound, bundleID: bundleID) }
} }
struct OperationError: ALTLocalizedError struct OperationError: ALTLocalizedError
@@ -63,8 +58,6 @@ struct OperationError: ALTLocalizedError
var errorTitle: String? var errorTitle: String?
var errorFailure: String? var errorFailure: String?
var bundleID: String?
var errorFailureReason: String { var errorFailureReason: String {
switch self.code switch self.code
{ {
@@ -72,9 +65,6 @@ struct OperationError: ALTLocalizedError
case .noTeam: return NSLocalizedString("You are not a member of any developer teams.", comment: "") case .noTeam: return NSLocalizedString("You are not a member of any developer teams.", comment: "")
case .missingPrivateKey: return NSLocalizedString("The developer certificate's private key could not be found.", comment: "") case .missingPrivateKey: return NSLocalizedString("The developer certificate's private key could not be found.", comment: "")
case .missingCertificate: return NSLocalizedString("The developer certificate could not be found.", comment: "") case .missingCertificate: return NSLocalizedString("The developer certificate could not be found.", comment: "")
case .appNotFound:
let appBundleID = self.bundleID.map { "“\($0)”" } ?? "AltStore"
return String(format: NSLocalizedString("%@ could not be located in the source JSON.", comment: ""), appBundleID)
} }
} }
} }
@@ -356,13 +346,20 @@ private extension ALTDeviceManager
let (data, _) = try Result((data, response), error).get() let (data, _) = try Result((data, response), error).get()
let source = try Foundation.JSONDecoder().decode(Source.self, from: data) let source = try Foundation.JSONDecoder().decode(Source.self, from: data)
guard let altstore = source.apps.first(where: { $0.bundleIdentifier == altstoreBundleID }) else {
let debugDescription = String(format: NSLocalizedString("App with bundle ID '%@' does not exist in source JSON.", comment: ""), altstoreBundleID)
throw CocoaError(.coderValueNotFound, userInfo: [NSDebugDescriptionErrorKey: debugDescription])
}
guard let versions = altstore.versions else {
let debugDescription = String(format: NSLocalizedString("There is no 'versions' key for %@.", comment: ""), altstore.bundleIdentifier)
throw CocoaError(.coderReadCorrupt, userInfo: [NSDebugDescriptionErrorKey: debugDescription])
}
guard let latestVersion = versions.first else {
let debugDescription = String(format: NSLocalizedString("The 'versions' array is empty for %@.", comment: ""), altstore.bundleIdentifier)
throw CocoaError(.coderValueNotFound, userInfo: [NSDebugDescriptionErrorKey: debugDescription])
}
let osName = device.type.osName ?? "iOS" let osName = device.type.osName ?? "iOS"
guard let altstore = source.apps.first(where: { $0.bundleIdentifier == altstoreBundleID }) else { throw OperationError.appNotFound(bundleID: altstoreBundleID) }
guard let latestVersion = altstore.versions?.first else { throw ALTServerError(.unsupportediOSVersion, userInfo: [ALTAppNameErrorKey: "AltStore",
ALTOperatingSystemNameErrorKey: osName,
ALTOperatingSystemVersionErrorKey: "12.2"]) }
let minOSVersionString = latestVersion.minimumOSVersion?.stringValue ?? "12.2" let minOSVersionString = latestVersion.minimumOSVersion?.stringValue ?? "12.2"
guard let latestSupportedVersion = altstore.versions?.first(where: { appVersion in guard let latestSupportedVersion = altstore.versions?.first(where: { appVersion in
@@ -406,9 +403,14 @@ private extension ALTDeviceManager
} }
} }
catch catch let serverError as ALTServerError where serverError.code == .unsupportediOSVersion
{ {
completion(.failure(error)) // Don't add localized failure for unsupported iOS version errors.
completion(.failure(serverError))
}
catch let error as NSError
{
completion(.failure(error.withLocalizedFailure("The download URL could not be determined.")))
} }
} }