Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.
Use SupersetteD
Kabir Oberai5264930ce832
diff --git a/Dockerfile b/Dockerfileindex dbd7adb..8092c03 100644--- a/Dockerfile+++ b/Dockerfile@@ -4,7 +4,7 @@FROM ubuntu:focal AS limd-buildRUN apt-get update \- && apt-get install -y --no-install-recommends \+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ca-certificates \build-essential \checkinstall \@@ -14,11 +14,14 @@ RUN apt-get update \libtool-bin \libssl-dev \pkg-config \- libcurl4-openssl-dev \+ libxml2 \+ curl libcurl4-openssl-dev \&& rm -rf /var/lib/apt/lists/*RUN mkdir /prefix+RUN curl -fsS https://dlang.org/install.sh | bash -s ldc+RUN git clone https://github.com/libimobiledevice/libplist.git \&& cd libplist \&& ./autogen.sh --prefix /usr --without-cython \@@ -64,6 +67,14 @@ RUN git clone https://github.com/libimobiledevice/libimobiledevice.git \&& cd .. \&& rm -rf libimobiledevice+ADD https://api.github.com/repos/SuperchargeApp/SupersetteD/git/refs/heads/main Supersette-version.json++RUN git clone https://github.com/SuperchargeApp/SupersetteD.git \+ && cd SupersetteD \+ && /bin/bash -c 'source $(/root/dlang/install.sh ldc -a) && dub build --build=release' \+ && cp -r bin/libsupersette.so /prefix/usr/lib/libsupersette.so \+ && cd .. \+ && rm -rf SupersetteDFROM swift:6.0-focaldiff --git a/Package.resolved b/Package.resolvedindex 4f5715c..f6aaa2c 100644--- a/Package.resolved+++ b/Package.resolved@@ -177,8 +177,8 @@"repositoryURL": "https://github.com/SuperchargeApp/SwiftyMobileDevice","state": {"branch": null,- "revision": "35bfb6b02513561b332e198df6cfb359eb75d922",- "version": "1.1.0"+ "revision": "1823b7de02130e64ca4e42947056f78a85a12b39",+ "version": "1.1.1"}},{@@ -195,8 +195,8 @@"repositoryURL": "https://github.com/kabiroberai/zsign","state": {"branch": null,- "revision": "11da02bf9f0626da2df16a12461a4b4bacfa1e01",- "version": "1.1.0"+ "revision": "45fa854a214c5a68bd35d1e35e90dfe9be28c7d4",+ "version": "1.2.4"}}]diff --git a/Package.swift b/Package.swiftindex 80cdd22..1c5571a 100644--- a/Package.swift+++ b/Package.swift@@ -28,8 +28,8 @@ let package = Package(],dependencies: [.package(url: "https://github.com/SuperchargeApp/SuperchargeCore", .upToNextMinor(from: "1.1.1")),- .package(url: "https://github.com/SuperchargeApp/SwiftyMobileDevice", .upToNextMinor(from: "1.1.0")),- .package(url: "https://github.com/kabiroberai/zsign", .upToNextMinor(from: "1.1.0")),+ .package(url: "https://github.com/SuperchargeApp/SwiftyMobileDevice", .upToNextMinor(from: "1.1.1")),+ .package(url: "https://github.com/kabiroberai/zsign", .upToNextMinor(from: "1.2.4")),.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),.package(url: "https://github.com/vapor/websocket-kit.git", from: "2.15.0"),.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),@@ -38,6 +38,7 @@ let package = Package(.package(url: "https://github.com/attaswift/BigInt", from: "5.5.0"),],targets: [+ .systemLibrary(name: "CSupersette"),.target(name: "CSupersign",dependencies: [@@ -49,7 +50,8 @@ let package = Package(name: "Supersign",dependencies: ["CSupersign",- "SwiftyMobileDevice",+ .byName(name: "CSupersette", condition: .when(platforms: [.linux])),+ .product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),.product(name: "Zupersign", package: "zsign"),.product(name: "SignerSupport", package: "SuperchargeCore"),.product(name: "ProtoCodable", package: "SuperchargeCore"),diff --git a/Sources/CSupersette/module.modulemap b/Sources/CSupersette/module.modulemapnew file mode 100644index 0000000..595e56a--- /dev/null+++ b/Sources/CSupersette/module.modulemap@@ -0,0 +1,4 @@+module CSupersette [extern_c] {+ header "supersette.h"+ link "supersette"+}diff --git a/Sources/CSupersette/supersette.h b/Sources/CSupersette/supersette.hnew file mode 100644index 0000000..6a8a38a--- /dev/null+++ b/Sources/CSupersette/supersette.h@@ -0,0 +1,13 @@+#include <stdint.h>++void supersette_Load(const char *path);+int32_t supersette_SetAndroidID(const char *identifier, uint32_t length);+int32_t supersette_SetProvisioningPath(const char *path);+int32_t supersette_ProvisioningErase(uint64_t dsId);+int32_t supersette_Synchronize(uint64_t dsId, const void *serverIntermediateMetadata, uint32_t serverIntermediateMetadataLength, void **machineIdentifier, uint32_t *machineIdentifierLength, void **synchronizationResumeMetadata, uint32_t *synchronizationResumeMetadataLength);+int32_t supersette_ProvisioningDestroy(uint32_t session);+int32_t supersette_ProvisioningEnd(uint32_t session, const void *persistentTokenMetadata, uint32_t persistentTokenMetadataLength, const void *trustKey, uint32_t trustKeyLength);+int32_t supersette_ProvisioningStart(uint64_t dsId, const void *serverProvisioningIntermediateMetadata, uint32_t serverProvisioningIntermediateMetadataLength, void **clientProvisioningIntermediateMetadata, uint32_t *clientProvisioningIntermediateMetadataLength, uint32_t *session);+int32_t supersette_GetLoginCode(uint64_t dsId);+int32_t supersette_Dispose(void *ptr);+int32_t supersette_OTPRequest(uint64_t dsId, void **machineIdentifier, uint32_t *machineIdentifierLength, void **oneTimePassword, uint32_t *oneTimePasswordLength);diff --git a/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swift b/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swiftindex cfcd9cf..5c3ffae 100644--- a/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swift+++ b/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swift@@ -184,14 +184,21 @@ extension UUID {}extension ADIDataProvider {- public static func omnisetteProvider(+ public static func adiProvider(deviceInfo: DeviceInfo,storage: KeyValueStorage,provisioningData: ProvisioningData? = nil,httpFactory: HTTPClientFactory = defaultHTTPClientFactory) throws -> ADIDataProvider {+ #if os(Linux)+ let provider = SupersetteADIProvider(+ configDirectory: URL.homeDirectory.appending(path: ".config/Supercharge/Anisette")+ )+ #else+ let provider = OmnisetteADIProvider()+ #endifreturn try ADIDataProvider(- rawProvider: OmnisetteADIProvider(),+ rawProvider: provider,deviceInfo: deviceInfo,storage: storage,provisioningData: provisioningData,diff --git a/Sources/Supersign/GrandSlam/Anisette/Supersette/SupersetteADIProvider.swift b/Sources/Supersign/GrandSlam/Anisette/Supersette/SupersetteADIProvider.swiftdeleted file mode 100644index 54d4b67..0000000--- a/Sources/Supersign/GrandSlam/Anisette/Supersette/SupersetteADIProvider.swift+++ /dev/null@@ -1,122 +0,0 @@-import Foundation--public class SupersetteADIProvider: RawADIProvider {- private struct ProvisioningSession: RawADIProvisioningSession {- let session: String- let provider: SupersetteADIProvider-- func endProvisioning(routingInfo: UInt64, ptm: Data, tk: Data) async throws -> Data {- try await provider.endProvisioning(session: session, routingInfo: routingInfo, ptm: ptm, tk: tk)- }- }-- private static let gateway = "http://kabir-winvm.local:3000/v1"-- private static let encoder = JSONEncoder()- private static let decoder = JSONDecoder()-- public enum Error: Swift.Error {- case networkError- case invalidResponse- }-- public let deviceInfo: DeviceInfo- private let httpClient: HTTPClientProtocol-- public init(deviceInfo: DeviceInfo, httpFactory: HTTPClientFactory = defaultHTTPClientFactory) {- self.deviceInfo = deviceInfo- self.httpClient = httpFactory.makeClient()- }-- private func makeRequest<Request: Encodable, Response: Decodable>(- endpoint: StaticString,- request: Request- ) async throws -> Response {- let url = URL(string: "\(Self.gateway)/\(endpoint)")!- var httpRequest = HTTPRequest(url: url, method: "POST")- httpRequest.headers = [- "Content-Type": "application/json",- "Accept": "application/json",- "Superkey": "BF95B548-3C87-4BBD-8B96-534421368416"- ]- httpRequest.body = try .buffer(Self.encoder.encode(request))-// print("Requesting \(endpoint):")-// dump(request)- let resp = try await httpClient.makeRequest(httpRequest)- let data = try resp.body.orThrow(Error.invalidResponse)- return try Self.decoder.decode(Response.self, from: data)- }-- public func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {- struct Request: Encodable {- let spim: Data- }- struct Response: Decodable {- let sessionID: String- let cpim: Data- }- let resp: Response = try await makeRequest(- endpoint: "start-provisioning",- request: Request(spim: spim)- )- let session = ProvisioningSession(session: resp.sessionID, provider: self)- return (session, resp.cpim)- }-- private func endProvisioning(- session: String,- routingInfo: UInt64,- ptm: Data,- tk: Data- ) async throws -> Data {- struct Request: Encodable {- let session: String- let rinfo: String- let ptm: Data- let tk: Data- }- struct Response: Decodable {- let provisioningInfo: Data- }- let resp: Response = try await makeRequest(- endpoint: "end-provisioning",- request: Request(session: session, rinfo: "\(routingInfo)", ptm: ptm, tk: tk)- )- return resp.provisioningInfo- }-- public func requestOTP(- userID: UUID,- routingInfo: inout UInt64,- provisioningInfo: Data- ) async throws -> (machineID: Data, otp: Data) {- struct Request: Encodable {- let provisioningInfo: Data- }- struct Response: Decodable {- let mid: Data- let otp: Data- }- let resp: Response = try await makeRequest(- endpoint: "otp",- request: Request(provisioningInfo: provisioningInfo)- )- return (resp.mid, resp.otp)- }--}--extension ADIDataProvider {- public static func supersetteProvider(- deviceInfo: DeviceInfo,- storage: KeyValueStorage,- httpFactory: HTTPClientFactory = defaultHTTPClientFactory- ) throws -> ADIDataProvider {- return try ADIDataProvider(- rawProvider: SupersetteADIProvider(deviceInfo: deviceInfo, httpFactory: httpFactory),- deviceInfo: deviceInfo,- storage: storage,- httpFactory: httpFactory- )- }-}diff --git a/Sources/Supersign/GrandSlam/Anisette/Supersette/SupersetteDataProvider.swift b/Sources/Supersign/GrandSlam/Anisette/Supersette/SupersetteDataProvider.swiftdeleted file mode 100644index 020360f..0000000--- a/Sources/Supersign/GrandSlam/Anisette/Supersette/SupersetteDataProvider.swift+++ /dev/null@@ -1,67 +0,0 @@-//-// SupersetteDataProvider.swift-// Supersign-//-// Created by Kabir Oberai on 14/06/20.-// Copyright © 2020 Kabir Oberai. All rights reserved.-//--import Foundation--public class SupersetteDataProvider: AnisetteDataProvider {-- private static let gateway = URL(string: "https://anisette.supercharge.app:8443/v1/generate")!-- private static let encoder = JSONEncoder()- private static let decoder = JSONDecoder()-- public enum Error: Swift.Error {- case networkError- case invalidAnisetteData- }-- public let deviceInfo: DeviceInfo- private let httpClient: HTTPClientProtocol-- public init(deviceInfo: DeviceInfo, httpFactory: HTTPClientFactory = defaultHTTPClientFactory) {- self.deviceInfo = deviceInfo- self.httpClient = httpFactory.makeClient()- }-- private struct AnisetteRequestBody: Encodable {- let deviceID: String- let clientInfo: String- }-- private struct AnisetteResponse: Decodable {- let routingInfo: UInt64- let machineID: String- let localUserID: String- let oneTimePassword: String- }-- public func fetchAnisetteData() async throws -> AnisetteData {- let clientTime = Date()- var request = HTTPRequest(url: Self.gateway, method: "POST")- request.headers = [- "Content-Type": "application/json",- "Accept": "application/json",- "Superpass": "BF95B548-3C87-4BBD-8B96-534421368416"- ]- request.body = try .buffer(Self.encoder.encode(AnisetteRequestBody(- deviceID: deviceInfo.deviceID,- clientInfo: deviceInfo.clientInfo.clientString- )))- let resp = try await httpClient.makeRequest(request)- let data = try resp.body.orThrow(Error.invalidAnisetteData)- let anisetteResponse = try Self.decoder.decode(AnisetteResponse.self, from: data)- return AnisetteData(- clientTime: clientTime,- routingInfo: anisetteResponse.routingInfo,- machineID: anisetteResponse.machineID,- localUserID: anisetteResponse.localUserID,- oneTimePassword: anisetteResponse.oneTimePassword- )- }--}diff --git a/Sources/Supersign/GrandSlam/Anisette/SupersetteADIProvider.swift b/Sources/Supersign/GrandSlam/Anisette/SupersetteADIProvider.swiftnew file mode 100644index 0000000..2630658--- /dev/null+++ b/Sources/Supersign/GrandSlam/Anisette/SupersetteADIProvider.swift@@ -0,0 +1,170 @@+#if os(Linux)++import Foundation+import CSupersette++public struct SupersetteADIProvider: RawADIProvider {+ @MainActor private static var loadTask: Task<Void, Error>?++ public let directory: URL+ public let httpClient: HTTPClientProtocol++ public init(+ configDirectory: URL,+ httpClientFactory: HTTPClientFactory = defaultHTTPClientFactory+ ) {+ self.directory = configDirectory+ self.httpClient = httpClientFactory.makeClient()+ }++ private func _loadADI(id: UUID) async throws {+ let dir = self.directory+ let libDir = dir.appending(path: "libs")+ if !libDir.dirExists {+ let tmp = dir.appending(path: "tmp")+ try? FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)++ let applemusic = tmp.appending(path: "applemusic.apk")+ if !applemusic.exists {+ print("Downloading libraries...")+ let url = URL(string: "https://apps.mzstatic.com/content/android-apple-music-apk/applemusic.apk")!+ let data = try await httpClient.makeRequest(HTTPRequest(url: url)).body!+ try data.write(to: applemusic)+ }++ #if arch(arm64)+ let arch = "arm64-v8a"+ #elseif arch(x86_64)+ let arch = "x86_64"+ #else+ #error("Unsupported architecture")+ #endif+ let archDir = "lib/\(arch)"++ let proc = Process()+ proc.executableURL = URL(filePath: "/usr/bin/unzip")+ proc.arguments = [+ "-q",+ applemusic.path(),+ "\(archDir)/libCoreADI.so",+ "\(archDir)/libstoreservicescore.so",+ "-d", tmp.path()+ ]+ try proc.run()+ proc.waitUntilExit()+ try FileManager.default.moveItem(+ at: tmp.appending(path: archDir),+ to: libDir+ )+ try? FileManager.default.removeItem(at: tmp)+ }++ supersette_Load(strdup(libDir.path()))++ let rawID = id.uuidString.replacingOccurrences(of: "-", with: "").prefix(16).lowercased()+ try check(supersette_SetAndroidID(rawID, UInt32(rawID.utf8.count)))++ let adi = dir.appending(path: "adi")+ try? FileManager.default.createDirectory(at: adi, withIntermediateDirectories: true)+ try check(supersette_SetProvisioningPath(adi.path()))+ }++ @MainActor private func loadADI(id: UUID) async throws {+ if let loadTask = Self.loadTask {+ try await loadTask.value+ return+ }+ let loadTask = Task { try await _loadADI(id: id) }+ Self.loadTask = loadTask+ try await loadTask.value+ }++ public func clientInfo() async throws -> String {+ """+ <MacBookPro13,2> <macOS;13.1;22C65> <com.apple.AuthKit/1 (com.apple.dt.Xcode/3594.4.19)>+ """+ }++ public func startProvisioning(spim: Data, userID: UUID) async throws -> (any RawADIProvisioningSession, Data) {+ try await loadADI(id: userID)++ var sessionID: UInt32 = 0+ var cpimBytes: UnsafeMutableRawPointer?+ var cpimLen: UInt32 = 0+ try check(spim.withUnsafeBytes { spimBytes in+ supersette_ProvisioningStart(+ UInt64(bitPattern: -2),+ spimBytes.baseAddress!, UInt32(spimBytes.count),+ &cpimBytes, &cpimLen,+ &sessionID+ )+ })+ let data = Data(UnsafeRawBufferPointer(start: cpimBytes, count: Int(cpimLen)))+ _ = cpimBytes.map { supersette_Dispose($0) }+ return (+ ADISession(+ sessionID: sessionID,+ adiDirectory: directory.appending(path: "adi")+ ),+ data+ )+ }++ private struct ADISession: RawADIProvisioningSession {+ let sessionID: UInt32+ let adiDirectory: URL++ func endProvisioning(routingInfo: UInt64, ptm: Data, tk: Data) async throws -> Data {+ try check(ptm.withUnsafeBytes { ptmBuf in+ tk.withUnsafeBytes { tkBuf in+ supersette_ProvisioningEnd(+ sessionID,+ ptmBuf.baseAddress!, UInt32(ptmBuf.count),+ tkBuf.baseAddress!, UInt32(tkBuf.count)+ )+ }+ })+ let file = adiDirectory.appending(path: "adi.pb")+ return try Data(contentsOf: file)+ }+ }++ public func requestOTP(+ userID: UUID,+ routingInfo: inout UInt64,+ provisioningInfo: Data+ ) async throws -> (machineID: Data, otp: Data) {+ try await loadADI(id: userID)++ var midBytes: UnsafeMutableRawPointer?+ var midLen: UInt32 = 0+ var otpBytes: UnsafeMutableRawPointer?+ var otpLen: UInt32 = 0++ let adiDirectory = directory.appending(path: "adi")+ try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)+ try provisioningInfo.write(to: adiDirectory.appending(path: "adi.pb"))++ try check(supersette_OTPRequest(+ UInt64(bitPattern: -2),+ &midBytes, &midLen,+ &otpBytes, &otpLen+ ))++ let mid = Data(UnsafeRawBufferPointer(start: midBytes, count: Int(midLen)))+ let otp = Data(UnsafeRawBufferPointer(start: otpBytes, count: Int(otpLen)))++ _ = midBytes.map { supersette_Dispose($0) }+ _ = otpBytes.map { supersette_Dispose($0) }++ return (machineID: mid, otp: otp)+ }+}++private func check(_ adiStatus: Int32) throws {+ guard adiStatus == 0 else {+ fatalError("ADI Status: \(adiStatus)")+ }+}++#endifdiff --git a/Sources/Supersign/Integration/SuperchargeInstaller.swift b/Sources/Supersign/Integration/SuperchargeInstaller.swiftindex c0d8aeb..010c85e 100644--- a/Sources/Supersign/Integration/SuperchargeInstaller.swift+++ b/Sources/Supersign/Integration/SuperchargeInstaller.swift@@ -460,8 +460,7 @@ public final class IntegratedInstaller {guard updateStage(to: "Logging in") else { return }do {-// let anisetteProvider = SupersetteDataProvider(deviceInfo: deviceInfo)- let anisetteProvider = try ADIDataProvider.omnisetteProvider(deviceInfo: deviceInfo, storage: storage)+ let anisetteProvider = try ADIDataProvider.adiProvider(deviceInfo: deviceInfo, storage: storage)switch credentials {case .password(let password):try DeveloperServicesLoginManager(diff --git a/Sources/SupersignCLISupport/DSCommand.swift b/Sources/SupersignCLISupport/DSCommand.swiftindex 45aae17..6b9426f 100644--- a/Sources/SupersignCLISupport/DSCommand.swift+++ b/Sources/SupersignCLISupport/DSCommand.swift@@ -25,8 +25,7 @@ private extension AuthToken {throw Console.Error("A non-empty password is required.")}-// let provider = SupersetteDataProvider(deviceInfo: deviceInfo)- let provider = try ADIDataProvider.omnisetteProvider(+ let provider = try ADIDataProvider.adiProvider(deviceInfo: deviceInfo,storage: SupersignCLI.config.storage)@@ -101,8 +100,7 @@ struct DSTeamsListCommand: AsyncParsableCommand {let token = try account.flatMap(AuthToken.init(string:)) ?? AuthToken.saved()let deviceInfo = try DeviceInfo.fetch()-// let anisetteProvider = SupersetteDataProvider(deviceInfo: deviceInfo)- let anisetteProvider = try ADIDataProvider.omnisetteProvider(+ let anisetteProvider = try ADIDataProvider.adiProvider(deviceInfo: deviceInfo, storage: SupersignCLI.config.storage)