Compare commits

..

1 Commits

34 changed files with 719 additions and 400 deletions
+1 -1
View File
@@ -6,4 +6,4 @@ runs:
- name: Set up Xcode
shell: bash
run: |
sudo xcode-select -s /Applications/Xcode_27.1.0.app
sudo xcode-select -s /Applications/Xcode_27.0.0.app
+1 -1
View File
@@ -1,7 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
ARG SWIFT_VERSION=6.4.1
ARG SWIFT_VERSION=6.4.0
FROM swift:${SWIFT_VERSION}-jammy AS build-base
@@ -68,7 +68,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
Download **Xcode 27.1** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
Download **Xcode 27** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
> Note:
>
@@ -131,7 +131,7 @@ Choice (0-1): 0
Path to Xcode.xip:
```
Enter the path (for example `~/Downloads/Xcode_27.1.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Enter the path (for example `~/Downloads/Xcode_27.0.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Confirm that it worked:
@@ -1,26 +1,4 @@
import ExampleSupport
import SwiftUI
@main struct DemoApp: App {
public var body: some Scene {
WindowGroup {
ContentView()
}
}
}
private struct ContentView: View {
@State var counter = 0
var body: some View {
VStack {
Button("Counter = \(counter)") {
counter += 1
}
}
.padding()
.task {
Example.pass()
}
}
}
@main struct DemoApp: ExampleApp {}
+50 -41
View File
@@ -1,13 +1,13 @@
{
"originHash" : "df62267a8ffd060087e903a9d112d24562a959d43a0819a6511367da533c5594",
"originHash" : "7ae7f57a6038e121dec04557563bc2a3412c9e46e473d9c84f3e3ac82be608f9",
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
"revision" : "dd9206de0717d658daec6a064992894fdab8ae17",
"version" : "4.7.3"
"revision" : "db806756c989760b35108146381535aec231092b",
"version" : "4.7.0"
}
},
{
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
"version" : "1.36.2"
"revision" : "f95c908967e98c68c5ce3fd61a7974e7e869e303",
"version" : "1.36.1"
}
},
{
@@ -105,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
"version" : "1.1.7"
"revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c",
"version" : "1.1.5"
}
},
{
@@ -141,8 +141,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
"version" : "1.7.3"
"revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
"version" : "1.6.0"
}
},
{
@@ -150,8 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
"version" : "1.4.3"
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
"version" : "1.4.1"
}
},
{
@@ -159,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-configuration.git",
"state" : {
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
"version" : "1.2.2"
"revision" : "3533f65d3e36dcdffc91ce34ef4d3c9c1887fd4b",
"version" : "1.2.1"
}
},
{
@@ -168,8 +168,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
"revision" : "c2cbadd7263439d8015189668f96ff5b5be565ce",
"version" : "5.0.3"
"revision" : "a9d1d5ab8951ada40cafff8c8e2b551dfde4f390",
"version" : "5.0.0"
}
},
{
@@ -186,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
"version" : "1.7.2"
"revision" : "cc504a45f6ce73ce6067837d7ac19fa67b229a56",
"version" : "1.5.0"
}
},
{
@@ -231,8 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
"state" : {
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
"version" : "2.1.2"
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
"version" : "2.1.1"
}
},
{
@@ -240,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
"version" : "1.16.1"
"revision" : "9c6fb14227f55d8f711ce3847dc2f419fb0ecacb",
"version" : "1.15.1"
}
},
{
@@ -249,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
"version" : "2.104.0"
"revision" : "21de5f08c1a166a6dd293d0e587ad977bf8dac5d",
"version" : "2.103.0"
}
},
{
@@ -312,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
"version" : "1.14.2"
"revision" : "39d49cf22abab58a07f02bb76808b5d2839b294a",
"version" : "1.13.1"
}
},
{
@@ -321,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
"version" : "1.13.1"
"revision" : "9e53df53e043b53046a371b31aaf0a1e26eef946",
"version" : "1.12.1"
}
},
{
@@ -330,8 +330,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
"revision" : "c97e0f0187d95542b4a254f5bb4dc67f43bf73c9",
"version" : "1.4.0"
"revision" : "08796d36c99ad2318929bfa1d1e40f82194b65cc",
"version" : "1.3.1"
}
},
{
@@ -339,8 +339,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-service-context.git",
"state" : {
"revision" : "853ba3d9ce78851b9cc20108e8bd4f13f7fa546c",
"version" : "1.5.1"
"revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
"version" : "1.3.0"
}
},
{
@@ -348,8 +348,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-service-lifecycle",
"state" : {
"revision" : "a18ee16b8039866fd919bdb4e8e906882d4ecc75",
"version" : "2.13.0"
"revision" : "7f9326b0326ff86e3646295ea6e891f68c471c5e",
"version" : "2.12.0"
}
},
{
@@ -357,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-subprocess",
"state" : {
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
"version" : "1.0.2"
"revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
"version" : "1.0.0"
}
},
{
@@ -406,6 +406,15 @@
"version" : "2.16.2"
}
},
{
"identity" : "xadi",
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xadi",
"state" : {
"revision" : "3db108d3cafe719a4b2e9d13a9c8c52770e20aa7",
"version" : "0.4.2"
}
},
{
"identity" : "xcode-project-format",
"kind" : "remoteSourceControl",
@@ -420,8 +429,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
"version" : "9.17.6"
"revision" : "aeea2e97376cd69fbdd1c7e68664b79a1a641dde",
"version" : "9.17.5"
}
},
{
@@ -429,8 +438,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xtool-core",
"state" : {
"revision" : "154d7213c12e3f21d50793f50ec7bfb89cfd3918",
"version" : "1.5.1"
"revision" : "f867f9c2aea16ac78ca14d0d2f948b47db0732b4",
"version" : "1.5.0"
}
},
{
@@ -438,8 +447,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams",
"state" : {
"revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279",
"version" : "6.2.2"
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
"version" : "5.4.0"
}
},
{
+7 -5
View File
@@ -48,9 +48,10 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.1")),
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.0")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.9.0")),
.package(url: "https://github.com/xtool-org/xadi", .upToNextMinor(from: "0.4.2")),
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
@@ -61,7 +62,9 @@ let package = Package(
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
.package(url: "https://github.com/apple/swift-collections", from: "1.7.1"),
// v1.7.0 has a crash on old OSes: https://github.com/apple/swift-collections/issues/733.
// pin 1.6.0 until 1.7.1 is released.
.package(url: "https://github.com/apple/swift-collections", exact: "1.6.0"),
.package(url: "https://github.com/apple/xcode-project-format.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
@@ -78,7 +81,7 @@ let package = Package(
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
.package(url: "https://github.com/attaswift/BigInt", from: "6.0.0"),
.package(url: "https://github.com/jpsim/Yams", from: "6.0.0"),
.package(url: "https://github.com/jpsim/Yams", from: "5.1.3"),
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
// NB: this should only be imported from XcodeProjects
@@ -123,6 +126,7 @@ let package = Package(
"DeveloperAPI",
"CXKit",
"XUtils",
.product(name: "XADI", package: "xadi", condition: .when(platforms: [.linux, .macOS])),
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "Dependencies", package: "swift-dependencies"),
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
@@ -162,8 +166,6 @@ let package = Package(
"XKit",
"XToolSupport",
"PackLib",
.product(name: "Crypto", package: "swift-crypto"),
.product(name: "X509", package: "swift-certificates"),
],
swiftSettings: swiftSettings,
),
@@ -100,9 +100,8 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
return try await self.replaceCertificates(certificates, requireConfirmation: true)
}
guard let certificate = certificates.first(where: {
$0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true
}) else {
let knownSerialNumber = signingInfo.certificate.serialNumber()
guard let certificate = certificates.first(where: { $0.attributes?.serialNumber == knownSerialNumber }) else {
// we need to revoke existing certs, otherwise it doesn't always let us make a new one
return try await self.replaceCertificates(certificates, requireConfirmation: true)
}
@@ -54,6 +54,7 @@ public struct DeveloperServicesClient: Sendable {
}
}
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.httpClient) var httpClient
@@ -75,6 +76,8 @@ public struct DeveloperServicesClient: Sendable {
throw Error.malformedRequest
}
let deviceInfo = try deviceInfoProvider.fetch()
var httpRequest = HTTPRequest(method: .post, url: url)
let acceptedLanguages = Locale.preferredLanguages.joined(separator: ", ")
@@ -85,6 +88,8 @@ public struct DeveloperServicesClient: Sendable {
request.methodOverride.map { httpRequest.headerFields[.init("X-HTTP-Method-Override")!] = $0 }
httpRequest.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
httpRequest.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
httpRequest.headerFields[.init("X-Apple-I-Identity-Id")!] = loginToken.adsid
httpRequest.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
@@ -98,6 +103,8 @@ public struct DeveloperServicesClient: Sendable {
let (_, data) = try await httpClient.makeRequest(httpRequest, body: body)
// String(data: data, encoding: .utf8).map { print("\(url): \($0)") }
let decoded: R.Response = try request.apiVersion.decode(response: data)
return try await request.parse(decoded)
@@ -105,6 +105,7 @@ public struct XcodeAuthData: Sendable {
}
public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
@Dependency(\.deviceInfoProvider) private var deviceInfoProvider
@Dependency(\.anisetteDataProvider) private var anisetteDataProvider
public var authData: XcodeAuthData
@@ -129,7 +130,7 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
) async throws -> (HTTPResponse, HTTPBody?) {
var request = request
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
let deviceInfo = try deviceInfoProvider.fetch()
// General
request.headerFields[.acceptLanguage] = Locale.preferredLanguages.joined(separator: ", ")
@@ -141,12 +142,17 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
request.headerFields[.userAgent] = "Xcode"
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
// MobileMe identity
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
// GrandSlam authentication
request.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
request.headerFields[.init("X-Apple-I-Identity-Id")!] = authData.loginToken.adsid
request.headerFields[.init("X-Apple-GS-Token")!] = authData.loginToken.token
// Anisette
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
for (key, value) in anisetteData.dictionary {
request.headerFields[.init(key)!] = value
}
@@ -61,16 +61,13 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
break
}
// Match locally rather than with filter[serialNumber]: the API lists serials with a
// leading zero nibble ("0E41…") but its filter only matches them without it ("E41…").
let certs = try await DeveloperAPIPages {
try await context.developerAPIClient.certificatesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
.filter { $0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true }
let serialNumber = signingInfo.certificate.serialNumber()
let certs = try await context.developerAPIClient.certificatesGetCollection(
query: .init(
filter_lbrack_serialNumber_rbrack_: [serialNumber]
)
)
.ok.body.json.data
let allDevices = try await context.developerAPIClient.devicesGetCollection()
.ok.body.json.data
@@ -18,6 +18,15 @@ public protocol RawADIProvider: Sendable {
) async throws -> (machineID: Data, otp: Data)
}
extension RawADIProvider {
public func clientInfo() async throws -> String {
// Looks like Apple detects attempts to use a macOS client string on Windows :/
"""
<PC> <Windows;6.2(0,0);9200> <com.apple.AuthKitWin/1 (com.apple.iCloud/7.21)>
"""
}
}
private struct UnimplementedRawADIProvider: RawADIProvider {
func startProvisioning(
spim: Data,
@@ -35,16 +44,17 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
let closure: (UUID, inout UInt64, Data) async throws -> (Data, Data) = unimplemented()
return try await closure(userID, &routingInfo, provisioningInfo)
}
func clientInfo() async throws -> String {
let closure: () async throws -> String = unimplemented()
return try await closure()
}
}
private enum RawADIProviderDependencyKey: DependencyKey {
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
static let liveValue: RawADIProvider = OmnisetteADIProvider()
static let liveValue: RawADIProvider = {
#if canImport(XADI)
return XADIProvider()
#else
return OmnisetteADIProvider()
#endif
}()
}
extension DependencyValues {
@@ -169,12 +179,15 @@ public struct ADIDataProvider: AnisetteDataProvider {
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
for (key, value) in try await deviceInfo().dictionary {
request.headerFields[.init(key)!] = value
}
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = try await clientInfo()
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = self.localUserUID.uuidString
// request.headers[DeviceInfo.clientInfoKey] = self.deviceInfo.clientInfo.clientString
// self.deviceInfo.dictionary.forEach { request.headers[$0] = $1 }
let (_, response) = try await self.httpClient.makeRequest(request, body: body)
// print(String(data: response, encoding: .utf8) ?? "<no utf8 data>")
return try GrandSlamOperationDecoder<Response>.decode(data: response)
}
@@ -226,7 +239,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
machineID: mid.base64EncodedString(),
localUserID: self.localUserID,
oneTimePassword: otp.base64EncodedString(),
deviceInfo: try await deviceInfo(),
deviceID: self.localUserUID.uuidString
)
}
@@ -236,7 +249,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
}
private static var providerID: String? {
"mac-omnisette"
"2"
}
public var providerID: String? { Self.providerID }
@@ -274,13 +287,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
)
}
public func deviceInfo() async throws -> DeviceInfo {
DeviceInfo(
deviceID: localUserUID.uuidString,
clientInfo: try await clientInfo(),
)
}
}
public struct ADIError: Error, CustomStringConvertible {
@@ -49,9 +49,10 @@ public struct AnisetteData {
static let oneTimePasswordKey = "X-Apple-I-MD"
public let oneTimePassword: String
public let deviceInfo: DeviceInfo
static let deviceIDKey = "X-Mme-Device-Id"
public var deviceID: String?
public var dictionary: [String: String] {
var dictionary: [String: String] {
// GSA doesn't like "en_US@rg=..."; it has to be just "en_US".
let localeIdentifier = if let language = locale.language.languageCode?.identifier,
let region = locale.region?.identifier {
@@ -59,7 +60,7 @@ public struct AnisetteData {
} else {
"en_US"
}
return [
var dictionary = [
Self.localeKey: localeIdentifier,
Self.timeZoneKey: timeZone.abbreviation() ?? "UTC",
Self.clientTimeKey: Self.dateFormatter.string(from: clientTime),
@@ -68,7 +69,10 @@ public struct AnisetteData {
Self.localUserIDKey: localUserID,
Self.oneTimePasswordKey: oneTimePassword,
]
.merging(deviceInfo.dictionary) { _, b in b }
if let deviceID {
dictionary[Self.deviceIDKey] = deviceID
}
return dictionary
}
}
@@ -22,8 +22,6 @@ public protocol AnisetteDataProvider: Sendable {
func resetProvisioning() async
func provisioningData() -> ProvisioningData?
func deviceInfo() async throws -> DeviceInfo
func fetchAnisetteData() async throws -> AnisetteData
}
@@ -56,9 +54,4 @@ private struct UnimplementedAnisetteDataProvider: AnisetteDataProvider {
let closure: () async throws -> AnisetteData = unimplemented()
return try await closure()
}
func deviceInfo() async throws -> DeviceInfo {
let closure: () async throws -> DeviceInfo = unimplemented()
return try await closure()
}
}
@@ -0,0 +1,102 @@
//
// DeviceInfo+Fetching.swift
// XKit
//
// Created by Kabir Oberai on 18/06/20.
// Copyright © 2020 Kabir Oberai. All rights reserved.
//
import Foundation
#if os(macOS)
extension DeviceInfo {
private static func fetchDeviceID() -> String? {
var waitTime = timespec(tv_sec: 0, tv_nsec: 0) // wait indefinitely
let bytes = [UInt8](unsafeUninitializedCapacity: MemoryLayout<uuid_t>.size) { buf, count in
// force unwrapping is safe because uuid_t has a non-zero size
count = (gethostuuid(buf.baseAddress!, &waitTime) == 0) ? buf.count : 0
}
guard !bytes.isEmpty else { return nil }
return bytes.withUnsafeBufferPointer {
UUID(uuid: UnsafeRawBufferPointer($0).load(as: uuid_t.self)).uuidString
}
}
private static func hardwareProperty(forKey key: String) -> Data? {
let entry = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options")
guard entry != 0 else { return nil }
defer { IOObjectRelease(entry) }
return IORegistryEntryCreateCFProperty(
entry, key as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? Data
}
private static func fetchROMAddress() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:ROM")?
.map { String(format: "%02hhx", $0) }
.joined()
}
private static func fetchMLBSerialNumber() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:MLB")?
.map { String(format: isprint(Int32($0)) != 0 ? "%c" : "%02hhx", $0) }
.joined()
}
private static func fetchSerialNumber() -> String? {
let service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
guard service != 0 else { return nil }
defer { IOObjectRelease(service) }
return IORegistryEntryCreateCFProperty(
service, "IOPlatformSerialNumber" as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? String
}
private static func fetchHardwareModel() -> String? {
var modelSize = 0
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0,
modelSize > 0 else { return nil }
return String(unsafeUninitializedCapacity: modelSize) { buf in
var len = modelSize
guard sysctlbyname("hw.model", buf.baseAddress, &len, nil, 0) == 0,
len == modelSize else { return 0 }
return len - 1 // exclude NUL
}
}
public static func current() -> DeviceInfo? {
let romAddress = fetchROMAddress() ?? ""
let mlbSerialNumber = fetchMLBSerialNumber() ?? ""
guard let deviceID = fetchDeviceID(),
let serialNumber = fetchSerialNumber(),
let modelID = fetchHardwareModel()
else { return nil }
return DeviceInfo(
deviceID: deviceID,
romAddress: romAddress,
mlbSerialNumber: mlbSerialNumber,
serialNumber: serialNumber,
modelID: modelID
)
}
}
#else
extension DeviceInfo {
public static func current() -> DeviceInfo? {
return DeviceInfo(
deviceID: "99B5D9D4-B068-5CEE-A799-5EBB5B0894A6",
romAddress: "94f6a300e9a0",
mlbSerialNumber: "C02520301W0GF2D1U",
serialNumber: "C02PQKRJG8WP",
modelID: "Mac16,1"
)
}
}
#endif
// FIXME: Figure out DeviceInfo.current() outside macOS
// (see above)
@@ -1,20 +1,116 @@
//
// DeviceInfo.swift
// XKit
//
// Created by Kabir Oberai on 19/11/19.
// Copyright © 2019 Kabir Oberai. All rights reserved.
//
import Foundation
import Dependencies
public struct DeviceInfo: Codable, Sendable {
public static let xcodeVersionKey = "X-Xcode-Version"
public static let xcodeVersion = "26.5 (17F42)"
public static let akdUserAgent = "akd/1.0 CFNetwork/808.1.4"
public static let deviceIDKey = "X-Mme-Device-Id"
/// `X-Xcode-Version`
static let xcodeVersionKey = "X-Xcode-Version"
/// Not included in `dictionary`
public static let xcodeVersion = "26.5 (17F42)"
public struct ClientInfo: Codable {
public let modelID: String // e.g. MacBookPro11,5
var clientString: String {
"""
<Pixel 7> <Android;14;UQ1A.240205.002> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
"""
}
var userAgent: String {
"AuthKit/1 (Macintosh; OS X 27.0) (com.apple.dt.Xcode/26.5)"
}
public init(modelID: String) {
self.modelID = modelID
}
}
/// `X-Mme-Device-Id`
static let deviceIDKey = "X-Mme-Device-Id"
public let deviceID: String
public static let clientInfoKey = "X-MMe-Client-Info"
public let clientInfo: String
/// `X-Apple-I-ROM`
static let romAddressKey = "X-Apple-I-ROM"
public let romAddress: String
public var dictionary: [String: String] {
/// `X-Apple-I-MLB`
static let mlbSerialNumberKey = "X-Apple-I-MLB"
/// main logic board serial number
public let mlbSerialNumber: String
/// `X-Apple-I-SRL-NO`
static let serialNumberKey = "X-Apple-I-SRL-NO"
public let serialNumber: String
public let modelID: String
/// `X-MMe-Client-Info`
static let clientInfoKey = "X-MMe-Client-Info"
public var clientInfo: ClientInfo { .init(modelID: modelID) }
public init(
deviceID: String,
romAddress: String,
mlbSerialNumber: String,
serialNumber: String,
modelID: String
) {
self.deviceID = deviceID
self.romAddress = romAddress
self.mlbSerialNumber = mlbSerialNumber
self.serialNumber = serialNumber
self.modelID = modelID
}
var dictionary: [String: String] {
[
Self.clientInfoKey: clientInfo,
Self.deviceIDKey: deviceID,
Self.romAddressKey: romAddress,
Self.mlbSerialNumberKey: mlbSerialNumber,
Self.serialNumberKey: serialNumber
]
}
}
extension DeviceInfo {
public enum FetchError: Error {
case couldNotFetch
}
fileprivate static func fetch() throws -> Self {
guard let deviceInfo = DeviceInfo.current() else {
throw FetchError.couldNotFetch
}
return deviceInfo
}
}
public struct DeviceInfoProvider: DependencyKey, Sendable {
public var fetch: @Sendable () throws -> DeviceInfo
public init(fetch: @escaping @Sendable () throws -> DeviceInfo) {
self.fetch = fetch
}
private static let current = Result { try DeviceInfo.fetch() }
public static let testValue = DeviceInfoProvider(fetch: unimplemented())
public static let liveValue = DeviceInfoProvider { try current.get() }
}
extension DependencyValues {
public var deviceInfoProvider: DeviceInfoProvider {
get { self[DeviceInfoProvider.self] }
set { self[DeviceInfoProvider.self] = newValue }
}
}
@@ -6,9 +6,10 @@ struct OmnisetteADIProvider: RawADIProvider {
// should implement v3 of https://github.com/SideStore/omnisette-server
// list: https://servers.sidestore.io/servers.json
// e.g. https://ani.sidestore.io
private let url: URL
init(
url: URL = URL(string: "https://mac-ani.jkcoxson.com")!
url: URL = URL(string: "https://ani.sidestore.io")! // URL(string: "http://localhost:6969")!
) {
self.url = url
}
@@ -0,0 +1,196 @@
#if canImport(XADI)
import Foundation
import XADI
import Dependencies
import Subprocess
public actor XADIProvider: RawADIProvider {
@MainActor private static var loadTask: Task<Void, Error>?
@Dependency(\.httpClient) private var httpClient
@Dependency(\.persistentDirectory) private var persistentDirectory
private var directory: URL { persistentDirectory.appendingPathComponent("Anisette") }
public init() {}
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] ...", terminator: "")
fflush(stdoutSafe)
let url = URL(string: "https://apps.mzstatic.com/content/android-apple-music-apk/applemusic.apk")!
defer { print("") }
let data = try await httpClient.makeRequest(HTTPRequest(url: url)) { progress in
guard let progress else { return }
let progString = "\(Int(progress * 100))%".padding(toLength: 4, leading: true)
print("\r[Downloading libraries] \(progString)", terminator: "")
fflush(stdoutSafe)
}.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)"
// TODO: Use ZIPFoundation
try await Subprocess.run(
.name("unzip"),
arguments: [
"-q",
applemusic.path,
"\(archDir)/libCoreADI.so",
"\(archDir)/libstoreservicescore.so",
"-d", tmp.path
],
output: .discarded
).checkSuccess()
try FileManager.default.moveItem(
at: tmp.appending(path: archDir),
to: libDir
)
try? FileManager.default.removeItem(at: tmp)
}
xadi_Load(strdup(libDir.path()))
let rawID = id.uuidString.replacingOccurrences(of: "-", with: "").prefix(16).lowercased()
try check(xadi_SetAndroidID(rawID, UInt32(rawID.utf8.count)))
let adi = dir.appending(path: "adi")
try? FileManager.default.createDirectory(at: adi, withIntermediateDirectories: true)
try check(xadi_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
xadi_ProvisioningStart(
UInt64(bitPattern: -2),
spimBytes.baseAddress!, UInt32(spimBytes.count),
&cpimBytes, &cpimLen,
&sessionID
)
})
let data = Data(UnsafeRawBufferPointer(start: cpimBytes, count: Int(cpimLen)))
_ = cpimBytes.map { xadi_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
xadi_ProvisioningEnd(
sessionID,
ptmBuf.baseAddress!, UInt32(ptmBuf.count),
tkBuf.baseAddress!, UInt32(tkBuf.count)
)
}
})
let file = adiDirectory.appending(path: "adi.pb")
// adi saves the file as 0o034 (group wx, public r) by default
// which is a... strange choice that prevents us from reading
// or writing by default. Since we're the owner, we can easily
// change this though.
try FileManager.default.setAttributes(
// rw for owner
[.posixPermissions: 0o600],
ofItemAtPath: file.path
)
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)
let adiFile = adiDirectory.appending(path: "adi.pb")
try provisioningInfo.write(to: adiFile)
try check(xadi_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 { xadi_Dispose($0) }
_ = otpBytes.map { xadi_Dispose($0) }
return (machineID: mid, otp: otp)
}
}
private func check(_ adiStatus: Int32) throws {
guard adiStatus == 0 else {
throw ADIError(code: Int(adiStatus))
}
}
extension StringProtocol {
fileprivate func padding(
toLength minLength: Int,
withPad pad: Character = " ",
leading: Bool = false
) -> String {
let justPadding = String(repeating: pad, count: Swift.max(minLength - count, 0))
return leading ? justPadding + self : self + justPadding
}
}
#endif
+6 -3
View File
@@ -15,19 +15,22 @@ struct GrandSlamClient: Sendable {
private let lookupManager = GrandSlamLookupManager()
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.httpClient) var httpClient
init() {}
func send<R: GrandSlamRequest>(_ request: R) async throws -> R.Decoder.Value {
let deviceInfo = try deviceInfoProvider.fetch()
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
let url = try await lookupManager.fetchURL(forEndpoint: R.endpoint)
let method = request.method(anisetteData: anisetteData)
let method = request.method(deviceInfo: deviceInfo, anisetteData: anisetteData)
var httpRequest = HTTPRequest(method: method.httpMethod, url: url)
httpRequest.headerFields[.contentType] = "text/x-xml-plist"
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = anisetteData.deviceInfo.clientInfo
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
let body: Data? = switch method {
case .get:
nil
@@ -36,7 +39,7 @@ struct GrandSlamClient: Sendable {
fromPropertyList: body, format: .xml, options: 0
)
}
request.configure(request: &httpRequest, anisetteData: anisetteData)
request.configure(request: &httpRequest, deviceInfo: deviceInfo, anisetteData: anisetteData)
// GrandSlam doesn't seem to like reused (keep-alive) connections so create a
// new one for each request. cf https://github.com/rileytestut/AltSign/pull/52
@@ -21,27 +21,33 @@ actor GrandSlamLookupManager {
private let decoder = PropertyListDecoder()
private var endpoints: GrandSlamEndpoints?
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.httpClient) var httpClient
init() {}
private func performLookup() async throws -> GrandSlamEndpoints {
let deviceInfo = try await anisetteDataProvider.deviceInfo()
let deviceInfo = try deviceInfoProvider.fetch()
/* {
"X-Apple-I-Locale" = "en_IN";
"X-Apple-I-TimeZone" = "Asia/Kolkata";
"X-Apple-I-TimeZone-Offset" = 19800;
"X-MMe-Client-Info" = "<MacBookPro11,5> <Mac OS X;10.14.6;18G103> <com.apple.AuthKit/1 (com.apple.akd/1.0)>";
"X-MMe-Country" = IN;
"X-Mme-Device-Id" = "[REDACTED]";
} */
var request = HTTPRequest(url: Self.lookupURL)
request.headerFields = [
.userAgent: DeviceInfo.akdUserAgent,
.userAgent: deviceInfo.clientInfo.userAgent,
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
.init(AnisetteData.iLocaleKey)!: Locale.current.identifier,
.init(AnisetteData.timeZoneKey)!: TimeZone.current.identifier,
.init("X-Apple-I-TimeZone-Offset")!: "\(TimeZone.current.secondsFromGMT())"
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
for (key, value) in deviceInfo.dictionary {
request.headerFields[.init(key)!] = value
}
let (_, body) = try await httpClient.makeRequest(request)
return try self.decoder.decode(Response.self, from: body).urls
@@ -27,15 +27,7 @@ struct GrandSlamTwoFactorAuthenticateOperation {
private func performSMSAuth() async throws {
// TODO: parse phone number list from o=complete req?
let phoneNumberID = "1"
do {
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
} catch let error as HTTPResponseError where error.status.code == 403 {
print("""
warning: Could not send verification code via SMS. Falling back to trusted device authentication...
""")
try await performTrustedDeviceAuth()
return
}
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
try await validateCode(phoneNumberID: phoneNumberID)
}
@@ -59,14 +51,7 @@ struct GrandSlamTwoFactorAuthenticateOperation {
private func performTrustedDeviceAuth() async throws {
let request = GrandSlamTrustedDeviceRequest(loginData: loginData)
do {
try await client.send(request)
} catch let error as HTTPResponseError where error.status.code == 403 {
print("""
warning: Could not send verification code. Generate one manually.
See https://github.com/xtool-org/xtool/discussions/368
""")
}
try await client.send(request)
try await validateCode()
}
@@ -40,7 +40,7 @@ struct GrandSlamSMSAuthRequest: GrandSlamTwoFactorRequest {
let loginData: GrandSlamLoginData
let phoneNumberID: String
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.post([
"serverInfo": [
"phoneNumber.id": phoneNumberID
@@ -36,7 +36,7 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
let phoneNumberID: String
let verificationCode: String
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.post([
"securityCode.code": verificationCode,
"serverInfo": [
@@ -69,12 +69,12 @@ extension GrandSlamOperationRequest {
static var endpoint: GrandSlamEndpoint { .lookup(\.gsService) }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
request.headerFields[.accept] = "*/*"
request.headerFields[.userAgent] = DeviceInfo.akdUserAgent
request.headerFields[.userAgent] = deviceInfo.clientInfo.userAgent
}
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
var clientData: [String: Any] = [
"bootstrap": true,
"icscrec": true,
@@ -83,6 +83,7 @@ extension GrandSlamOperationRequest {
"svct": "iCloud",
"loc": Locale.current.identifier
]
clientData.merge(deviceInfo.dictionary) { _, b in b }
clientData.merge(anisetteData.dictionary) { _, b in b }
var request: [String: Any] = [
@@ -30,6 +30,6 @@ protocol GrandSlamRequest: Sendable {
static var endpoint: GrandSlamEndpoint { get }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData)
func method(anisetteData: AnisetteData) -> GrandSlamMethod
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData)
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod
}
@@ -17,10 +17,9 @@ extension GrandSlamTwoFactorRequest {
var extraHeaders: [String: String] { [:] }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
request.headerFields[.accept] = "application/x-buddyml"
request.headerFields[.contentType] = "application/x-plist"
request.headerFields[.userAgent] = DeviceInfo.akdUserAgent
request.headerFields[.init("X-Apple-App-Info")!] = "com.apple.gs.xcode.auth"
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
request.headerFields[.init("X-Apple-Identity-Token")!] = loginData.identityToken
@@ -28,7 +27,7 @@ extension GrandSlamTwoFactorRequest {
extraHeaders.forEach { request.headerFields[.init($0)!] = $1 }
}
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.get
}
@@ -35,13 +35,11 @@ private struct Client: HTTPClientProtocol {
}
private static let tlsConfiguration: TLSConfiguration = {
let appleRoots = appleRootCertificates.map { pem in
// if ssl cert parsing fails we're screwed so we might as well force try
// swiftlint:disable:next force_try
try! NIOSSLCertificate(bytes: Array(pem.utf8), format: .pem)
}
// if ssl cert parsing fails we're screwed so we might as well force try
// swiftlint:disable:next force_try
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
tlsConfiguration.additionalTrustRoots = [.certificates(appleRoots)]
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
tlsConfiguration.certificateVerification = .none
}
@@ -138,17 +136,6 @@ private final class WebSocketSessionWrapper: WebSocketSession {
}
}
// MARK: - Apple Root Certificates
// https://www.apple.com/certificateauthority/
private let appleRootCertificates: [String] = [
appleRootPEM,
appleRootG2PEM,
appleRootG3PEM,
]
// https://www.apple.com/appleca/AppleIncRootCertificate.cer
private let appleRootPEM = """
-----BEGIN CERTIFICATE-----
MIIEuzCCA6OgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJVUzET
@@ -179,59 +166,4 @@ IQ7aunMZT7XZNn/Bh1XZp5m5MkL72NVxnn6hUrcbvZNCJBIqxw8dtk2cXmPIS4AX
UKqK1drk/NAJBzewdXUh
-----END CERTIFICATE-----
"""
// https://www.apple.com/certificateauthority/AppleRootCA-G2.cer
private let appleRootG2PEM = """
-----BEGIN CERTIFICATE-----
MIIFkjCCA3qgAwIBAgIIAeDltYNno+AwDQYJKoZIhvcNAQEMBQAwZzEbMBkGA1UE
AwwSQXBwbGUgUm9vdCBDQSAtIEcyMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0
aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMw
HhcNMTQwNDMwMTgxMDA5WhcNMzkwNDMwMTgxMDA5WjBnMRswGQYDVQQDDBJBcHBs
ZSBSb290IENBIC0gRzIxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0
aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzCCAiIwDQYJ
KoZIhvcNAQEBBQADggIPADCCAgoCggIBANgREkhI2imKScUcx+xuM23+TfvgHN6s
XuI2pyT5f1BrTM65MFQn5bPW7SXmMLYFN14UIhHF6Kob0vuy0gmVOKTvKkmMXT5x
ZgM4+xb1hYjkWpIMBDLyyED7Ul+f9sDx47pFoFDVEovy3d6RhiPw9bZyLgHaC/Yu
OQhfGaFjQQscp5TBhsRTL3b2CtcM0YM/GlMZ81fVJ3/8E7j4ko380yhDPLVoACVd
J2LT3VXdRCCQgzWTxb+4Gftr49wIQuavbfqeQMpOhYV4SbHXw8EwOTKrfl+q04tv
ny0aIWhwZ7Oj8ZhBbZF8+NfbqOdfIRqMM78xdLe40fTgIvS/cjTf94FNcX1RoeKz
8NMoFnNvzcytN31O661A4T+B/fc9Cj6i8b0xlilZ3MIZgIxbdMYs0xBTJh0UT8TU
gWY8h2czJxQI6bR3hDRSj4n4aJgXv8O7qhOTH11UL6jHfPsNFL4VPSQ08prcdUFm
IrQB1guvkJ4M6mL4m1k8COKWNORj3rw31OsMiANDC1CvoDTdUE0V+1ok2Az6DGOe
HwOx4e7hqkP0ZmUoNwIx7wHHHtHMn23KVDpA287PT0aLSmWaasZobNfMmRtHsHLD
d4/E92GcdB/O/WuhwpyUgquUoue9G7q5cDmVF8Up8zlYNPXEpMZ7YLlmQ1A/bmH8
DvmGqmAMQ0uVAgMBAAGjQjBAMB0GA1UdDgQWBBTEmRNsGAPCe8CjoA1/coB6HHcm
jTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwF
AAOCAgEAUabz4vS4PZO/Lc4Pu1vhVRROTtHlznldgX/+tvCHM/jvlOV+3Gp5pxy+
8JS3ptEwnMgNCnWefZKVfhidfsJxaXwU6s+DDuQUQp50DhDNqxq6EWGBeNjxtUVA
eKuowM77fWM3aPbn+6/Gw0vsHzYmE1SGlHKy6gLti23kDKaQwFd1z4xCfVzmMX3z
ybKSaUYOiPjjLUKyOKimGY3xn83uamW8GrAlvacp/fQ+onVJv57byfenHmOZ4VxG
/5IFjPoeIPmGlFYl5bRXOJ3riGQUIUkhOb9iZqmxospvPyFgxYnURTbImHy99v6Z
SYA7LNKmp4gDBDEZt7Y6YUX6yfIjyGNzv1aJMbDZfGKnexWoiIqrOEDCzBL/FePw
N983csvMmOa/orz6JopxVtfnJBtIRD6e/J/JzBrsQzwBvDR4yGn1xuZW7AYJNpDr
FEobXsmII9oDMJELuDY++ee1KG++P+w8j2Ud5cAeh6Squpj9kuNsJnfdBrRkBof0
Tta6SqoWqPQFZ2aWuuJVecMsXUmPgEkrihLHdoBR37q9ZV0+N0djMenl9MU/S60E
inpxLK8JQzcPqOMyT/RFtm2XNuyE9QoB6he7hY1Ck3DDUOUUi78/w0EP3SIEIwiK
um1xRKtzCTrJ+VKACd+66eYWyi4uTLLT3OUEVLLUNIAytbwPF+E=
-----END CERTIFICATE-----
"""
// https://www.apple.com/certificateauthority/AppleRootCA-G3.cer
private let appleRootG3PEM = """
-----BEGIN CERTIFICATE-----
MIICQzCCAcmgAwIBAgIILcX8iNLFS5UwCgYIKoZIzj0EAwMwZzEbMBkGA1UEAwwS
QXBwbGUgUm9vdCBDQSAtIEczMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0aW9u
IEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcN
MTQwNDMwMTgxOTA2WhcNMzkwNDMwMTgxOTA2WjBnMRswGQYDVQQDDBJBcHBsZSBS
b290IENBIC0gRzMxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9y
aXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzB2MBAGByqGSM49
AgEGBSuBBAAiA2IABJjpLz1AcqTtkyJygRMc3RCV8cWjTnHcFBbZDuWmBSp3ZHtf
TjjTuxxEtX/1H7YyYl3J6YRbTzBPEVoA/VhYDKX1DyxNB0cTddqXl5dvMVztK517
IDvYuVTZXpmkOlEKMaNCMEAwHQYDVR0OBBYEFLuw3qFYM4iapIqZ3r6966/ayySr
MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gA
MGUCMQCD6cHEFl4aXTQY2e3v9GwOAEZLuN+yRhHFD/3meoyhpmvOwgPUnPWTxnS4
at+qIxUCMG1mihDK1A3UT82NQz60imOlM27jbdoXt2QfyFMm+YhidDkLF1vLUagM
6BgD56KyKA==
-----END CERTIFICATE-----
"""
#endif
@@ -0,0 +1,48 @@
//
// Superconfig.swift
//
//
// Created by Kabir Oberai on 02/05/21.
//
import Foundation
public struct Superconfig: Codable, Sendable {
// Stuff that needs to come from the installer
public let udid: String
public let pairingKeys: Data
public let deviceInfo: DeviceInfo
// Stuff that can also be fetched in-app
public let preferredTeamID: String
public let preferredSigningInfo: SigningInfo?
public let appleID: String
public let provisioningData: ProvisioningData?
public let token: DeveloperServicesLoginToken
public init(
udid: String,
pairingKeys: Data,
deviceInfo: DeviceInfo,
preferredTeamID: String,
preferredSigningInfo: SigningInfo?,
appleID: String,
provisioningData: ProvisioningData?,
token: DeveloperServicesLoginToken
) {
self.udid = udid
self.pairingKeys = pairingKeys
self.deviceInfo = deviceInfo
self.preferredTeamID = preferredTeamID
self.preferredSigningInfo = preferredSigningInfo
self.appleID = appleID
self.provisioningData = provisioningData
self.token = token
}
public static let filename = "Superconfig.plist"
public static let encoder = PropertyListEncoder()
public func save(inAppDir appDir: URL) throws {
try Self.encoder.encode(self).write(to: appDir.appendingPathComponent(Self.filename))
}
}
+4 -15
View File
@@ -57,23 +57,12 @@ public struct Certificate: Codable, Sendable {
}
public func serialNumber() -> String {
// big endian, hex-encoded. Leading zero bytes are dropped, but not leading zero
// nibbles: Apple formats serials like "03AB…", not "3AB…" (#305).
raw.serialNumber.bytes
.drop { $0 == 0 }
// big endian, hex-encoded
let content = raw.serialNumber.bytes.lazy
.map { String(format: "%02hhX", $0) }
.joined()
}
/// Whether `serialNumber` (hex-encoded, e.g. by the App Store Connect API)
/// is this certificate's serial number.
///
/// Compares numerically, so case and leading zeros don't matter.
public func hasSerialNumber(_ serialNumber: String) -> Bool {
func normalized(_ hex: String) -> Substring {
hex.uppercased().drop { $0 == "0" }
}
return normalized(serialNumber) == normalized(self.serialNumber())
.drop { $0 == "0" }
return String(content)
}
public func wasIssuedBefore(_ other: Certificate) -> Bool {
+2 -4
View File
@@ -78,10 +78,8 @@ struct AuthOperation {
private func logInWithPassword() async throws -> AuthToken {
print("""
Heads up:
This works by emulating a virtual Mac to interact with Apple services.
We use a third-party service to create a randomized device ID token
(Anisette Data) but your credentials are only ever sent to Apple.
Still, consider using a secondary Apple ID since this is a private API.
This works by emulating a Pixel phone/Windows PC to interact with Apple services;
consider using a secondary Apple ID. Credentials are only ever sent to Apple.
""")
let username = try await Console.promptRequired("Apple ID: ", existing: username)
+1 -2
View File
@@ -37,8 +37,7 @@ enum Console {
data += view
}
}
let str = String(decoding: data, as: UTF8.self)
return str.hasSuffix("\r") ? String(str.dropLast()) : str
return String(decoding: data, as: UTF8.self)
}
}
@@ -4,17 +4,48 @@ import ArgumentParser
import Dependencies
struct DSAnisetteCommand: AsyncParsableCommand {
private final class Provider: RawADIProvider, RawADIProvisioningSession {
func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
print("spim: \(spim.base64EncodedString())")
return (self, Data(base64Encoded: try await Console.prompt("cpim: "))!)
}
func endProvisioning(
routingInfo: UInt64,
ptm: Data,
tk: Data
) async throws -> Data {
print("""
rinfo: \(routingInfo)
ptm: \(ptm.base64EncodedString())
tk: \(tk.base64EncodedString())
""")
return Data(base64Encoded: try await Console.prompt("pinfo: "))!
}
func requestOTP(
userID: UUID,
routingInfo: inout UInt64,
provisioningInfo: Data
) -> (machineID: Data, otp: Data) {
print("otp; pinfo: \(provisioningInfo)")
return (Data(), Data())
}
}
static let configuration = CommandConfiguration(
commandName: "anisette",
abstract: "Test out Anisette data"
)
func run() async throws {
@Dependency(\.anisetteDataProvider) var provider
let res = try await provider.fetchAnisetteData()
for (key, value) in res.dictionary.sorted(by: { $0.key < $1.key }) {
print("\(key): \(value)")
let provider = withDependencies {
$0.rawADIProvider = Provider()
} operation: {
ADIDataProvider()
}
let res = try await provider.fetchAnisetteData()
print(res)
}
}
+72 -83
View File
@@ -76,12 +76,18 @@ struct SDKBuilder {
let mode: Mode
// bump this when the sdk builder logic changes
static let sdkEpoch = 4
static let sdkEpoch = 3
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
static let darwinToolsVersion = "1.1.0"
// tag from https://github.com/xtool-org/OpenAppleMacros
static let oamVersion = "1.4.1"
static let oamVersion = "1.3.0"
static let oamLibraries: [String] = [
"FoundationModelsMacros",
"PreviewsMacros",
"SwiftUIMacros",
]
static var currentSDKVersion: String {
"""
@@ -199,11 +205,6 @@ struct SDKBuilder {
},
"librarian": {
"path": "llvm-lib"
},
"swiftCompiler": {
"extraCLIOptions": [
"-Xfrontend", "-enable-cross-import-overlays"
]
}
}
""".write(
@@ -232,36 +233,22 @@ struct SDKBuilder {
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
}
private func fetchTarball(
url: URL,
destination directory: URL,
displayName: String,
envOverride: String? = nil,
) async throws {
// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")
try FileManager.default.createDirectory(
at: directory,
at: toolsetDir,
withIntermediateDirectories: false
)
if let envOverride, let path = ProcessInfo.processInfo.environment[envOverride] {
let archive = URL(fileURLWithPath: path)
print("[Extracting \(displayName)] \(archive.path)")
try await Subprocess.run(
.name("tar"),
arguments: ["xzf", archive.path],
workingDirectory: FilePath(directory),
output: .discarded,
error: .discarded,
)
.checkSuccess()
return
}
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
""")!
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else {
throw Console.Error("Could not fetch tarball at \(url)")
}
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
let length: Int64? = switch body.length {
case .known(let known): known
case .unknown: nil
@@ -271,7 +258,7 @@ struct SDKBuilder {
try await Subprocess.run(
.name("tar"),
arguments: ["xzf", "-"],
workingDirectory: FilePath(directory),
workingDirectory: FilePath(toolsetDir),
input: .inputWriter,
output: .discarded,
error: .discarded,
@@ -286,28 +273,13 @@ struct SDKBuilder {
guard let length else { continue }
let progress = Int(Double(totalWritten) / Double(length) * 100)
print("\r[Downloading \(displayName)] \(progress)%", terminator: "")
print("\r[Downloading toolset] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
}
try await execution.standardInputWriter.finish()
}
.checkSuccess()
}
// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
""")!
try await fetchTarball(
url: url,
destination: toolsetDir,
displayName: "toolset",
envOverride: "XTL_TOOLSET_TARBALL",
)
// swift-build assumes we have an Apple-flavored librarian for Apple platforms
// (https://github.com/swiftlang/swift-build/blob/b2433e74e/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift#L1735)
@@ -414,41 +386,43 @@ struct SDKBuilder {
}
private func installMacros(in output: URL) async throws {
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue).tar.gz
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue)
""")!
let macrosDir = output.appendingPathComponent("OpenAppleMacros")
try await fetchTarball(
url: url,
destination: macrosDir,
displayName: "OpenAppleMacros",
envOverride: "XTL_OAM_TARBALL",
)
struct MacrosInfo: Decodable {
var plugins: [String]
}
let macrosInfo = try JSONDecoder().decode(
MacrosInfo.self,
from: Data(contentsOf: macrosDir.appendingPathComponent("info.json"))
)
try FileManager.default.moveItem(
at: macrosDir.appendingPathComponent("OpenAppleMacrosServer"),
to: output.appendingPathComponent("OpenAppleMacrosServer")
)
try FileManager.default.removeItem(at: macrosDir)
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
let pluginsDir = output.appendingPathComponent("OpenAppleMacrosPlugins")
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: false)
// create a lib*.so file for each macro 'library' that we support.
// the files are stubs (empty) because we just need them to convince swiftc that
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
// server.
for library in macrosInfo.plugins {
let target = pluginsDir.appendingPathComponent("lib\(library).so")
try Data().write(to: target)
let length: Int64? = switch body.length {
case .known(let known): known
case .unknown: nil
}
let outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
do {
let handle = try FileDescriptor.open(
FilePath(outputPath),
.writeOnly,
options: .create,
permissions: [.ownerReadWriteExecute, .groupReadExecute, .otherReadExecute]
)
defer { try? handle.close() }
var written: Int64 = 0
for try await chunk in body {
try handle.writeAll(chunk)
written += Int64(chunk.count)
if let length {
let progress = Int(Double(written) / Double(length) * 100)
print("\r[Downloading OpenAppleMacros] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
}
}
print()
}
private static let expectedXcodeChildren = ["Info.plist", "version.plist", "Developer"]
@@ -632,12 +606,27 @@ struct SDKBuilder {
let hostDir = platformDir.appendingPathComponent("Developer/usr/lib/swift/host")
let pluginsDir = hostDir.appendingPathComponent("plugins")
try FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createSymbolicLink(
atPath: pluginsDir.path,
withDestinationPath: "../../../../../../../../OpenAppleMacrosPlugins"
)
if platform == "iPhoneSimulator" {
// The iPhoneSimulator platform doesn't contain plugins; Xcode seems to be hardcoded
// to look at the ones from iPhoneOS.platform. We can symlink the iPhoneOS ones too.
try? FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createSymbolicLink(
atPath: pluginsDir.path,
withDestinationPath: "../../../../../../iPhoneOS.platform/Developer/usr/lib/swift/host/plugins"
)
} else {
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: true)
// create a lib*.so file for each macro 'library' that we support.
// the files are stubs (empty) because we just need them to convince swiftc that
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
// server.
for library in Self.oamLibraries {
let target = pluginsDir.appendingPathComponent("lib\(library).so")
try Data().write(to: target)
}
}
}
// we copy over the host's clang resorurce dir during install, because intrinsics can differ
-57
View File
@@ -1,57 +0,0 @@
import Foundation
import Testing
import Crypto
import X509
import XKit
// serial number from https://github.com/xtool-org/xtool/issues/305
private let leadingZeroSerial: [UInt8] = [
0x03, 0x37, 0x42, 0x57, 0x0D, 0x6F, 0x96, 0x84,
0xA2, 0x33, 0x11, 0x71, 0x19, 0x56, 0xA0, 0x84,
]
@Test func serialNumberKeepsLeadingZeroNibble() throws {
let certificate = try makeCertificate(serialNumber: leadingZeroSerial)
#expect(certificate.serialNumber() == "033742570D6F9684A23311711956A084")
}
@Test func serialNumberOmitsDERSignPadding() throws {
// the high bit is set, so DER encodes this serial with a leading 0x00 byte
var serial = leadingZeroSerial
serial[0] = 0x83
let certificate = try makeCertificate(serialNumber: serial)
#expect(certificate.serialNumber() == "833742570D6F9684A23311711956A084")
}
@Test func hasSerialNumberIgnoresCaseAndLeadingZeros() throws {
let certificate = try makeCertificate(serialNumber: leadingZeroSerial)
#expect(certificate.hasSerialNumber("033742570D6F9684A23311711956A084"))
#expect(certificate.hasSerialNumber("033742570d6f9684a23311711956a084"))
#expect(certificate.hasSerialNumber("33742570D6F9684A23311711956A084"))
#expect(certificate.hasSerialNumber("0033742570D6F9684A23311711956A084"))
#expect(!certificate.hasSerialNumber("133742570D6F9684A23311711956A084"))
#expect(!certificate.hasSerialNumber(""))
}
/// Creates a self-signed certificate and round-trips it through DER,
/// like the certificates we get from the developer API.
private func makeCertificate(serialNumber: [UInt8]) throws -> XKit.Certificate {
let key = P256.Signing.PrivateKey()
let name = try DistinguishedName {
CommonName("xtool tests")
}
let now = Date()
let certificate = try X509.Certificate(
version: .v3,
serialNumber: .init(bytes: serialNumber),
publicKey: .init(key.publicKey),
notValidBefore: now,
notValidAfter: now + 3600,
issuer: name,
subject: name,
signatureAlgorithm: .ecdsaWithSHA256,
extensions: .init(),
issuerPrivateKey: .init(key)
)
return try XKit.Certificate(data: XKit.Certificate(raw: certificate).data())
}
+1 -1
View File
@@ -5,7 +5,7 @@
base = "Documentation/"
publish = "xtool.docc/.docc-build"
command = "./build.sh"
environment = { SWIFT_VERSION = "6.4.1" }
environment = { SWIFT_VERSION = "6.4.0" }
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
[[redirects]]