mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 18:55:56 +03:00
Compare commits
44 Commits
@@ -8,10 +8,10 @@
|
||||
|
||||
## AI tool usage
|
||||
|
||||
How much of this PR was AI-assisted? (check one)
|
||||
How much of the code in this PR was AI-assisted? (check one)
|
||||
|
||||
- [ ] **0** - No AI was used to write code
|
||||
- [ ] **1** - I was assisted by AI. I reviewed the finished result.
|
||||
- [ ] **1** - I was assisted by AI in writing code. I reviewed the finished result.
|
||||
- [ ] **2** - I set the AI going and left it to it; nobody has read the result - no review, or AI review only
|
||||
|
||||
<!-- If an AI agent is filling this in: declare the level honestly, and open as a draft if it is #2. Do not lower the declared level to get the PR reviewed. -->
|
||||
|
||||
@@ -6,4 +6,4 @@ runs:
|
||||
- name: Set up Xcode
|
||||
shell: bash
|
||||
run: |
|
||||
sudo xcode-select -s /Applications/Xcode_26.4.app
|
||||
sudo xcode-select -s /Applications/Xcode_27.1.0.app
|
||||
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
docker compose run --build -e XTL_CI=1 xtool bash -c \
|
||||
"swift build --product xtool && .build/debug/xtool --help && swift test"
|
||||
build-macos:
|
||||
runs-on: macos-26
|
||||
runs-on: xcode-27
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
@@ -39,7 +39,7 @@ jobs:
|
||||
run: |
|
||||
swift test
|
||||
build-ios:
|
||||
runs-on: macos-26
|
||||
runs-on: xcode-27
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
|
||||
@@ -36,7 +36,7 @@ jobs:
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
|
||||
build-mac:
|
||||
runs-on: macos-26
|
||||
runs-on: xcode-27
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
@@ -57,6 +57,7 @@ jobs:
|
||||
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
|
||||
XTOOL_VERSION: ${{ github.ref_name }}
|
||||
run: |
|
||||
brew install -y xcodegen
|
||||
cd macOS
|
||||
bundle exec fastlane package
|
||||
- name: Upload artifacts
|
||||
|
||||
@@ -13,3 +13,4 @@ DerivedData/
|
||||
|
||||
/openapi
|
||||
/.tmp
|
||||
/xtool
|
||||
|
||||
+10
-8
@@ -1,4 +1,4 @@
|
||||
swiftlint_version: 0.59.1
|
||||
swiftlint_version: 0.65.1
|
||||
disabled_rules:
|
||||
- trailing_comma
|
||||
- nesting
|
||||
@@ -42,17 +42,19 @@ opt_in_rules:
|
||||
analyzer_rules:
|
||||
- unused_import
|
||||
custom_rules:
|
||||
prefer_dependency_print:
|
||||
name: "Dependency Output"
|
||||
included: '/Sources/'
|
||||
excluded: '/(Tests|Examples)/'
|
||||
regex: '(?<![\w.])(?:Swift\s*\.\s*)?print\s*\('
|
||||
match_kinds:
|
||||
- identifier
|
||||
message: "Use d.out.print instead of print or Swift.print."
|
||||
severity: error
|
||||
spaces_not_tabs:
|
||||
name: "Spaces not Tabs"
|
||||
regex: ^\t
|
||||
message: "Use four spaces, not tabs"
|
||||
point_zero:
|
||||
name: "Point Zero"
|
||||
regex: '(?<!iOS\s)(?<!macOS\s)(?<!\.)\b[\d_]+\.0\b'
|
||||
match_kinds:
|
||||
- number
|
||||
- attribute.builtin
|
||||
message: "Don't add a .0 to the end of floating point literals"
|
||||
force_try: warning
|
||||
force_cast: warning
|
||||
function_body_length: 100
|
||||
|
||||
@@ -13,4 +13,7 @@ The `xtool` CLI supports macOS, Linux, WSL. The lower-level XKit (provisioning a
|
||||
## Conventions
|
||||
|
||||
- Use modern Swift 6. Strict concurrency is enabled.
|
||||
- Use swift-dependencies for Dependency Injection. Passing dependencies around as arguments is an anti-pattern.
|
||||
- Use swift-dependencies (`@Dependency(\.foo)` / `d.foo`) for Dependency Injection. Passing dependencies around as arguments is an anti-pattern.
|
||||
- Commits should be in the format `subsystem: imperative description` e.g. `auth: support reading password from stdin`.
|
||||
- Don't use `Task.detached { ... }`. If you need to escape isolation, you want `Task { @concurrent in ... }` instead.
|
||||
- Uphold API stability guarantees for consumers who use xtool via the command line interface (e.g. don't remove subcommands or config fields). However, the Swift interface (including `public` types) when consuming xtool itself as a Swift Package is _NOT_ API stable; it's okay to break Swift API.
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
# Note: We use 22.04 since AppImage recommends building on the
|
||||
# oldest configuration that you support
|
||||
|
||||
ARG SWIFT_VERSION=6.3.3
|
||||
ARG SWIFT_VERSION=6.4.2
|
||||
|
||||
FROM swift:${SWIFT_VERSION}-jammy AS build-base
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ Some environment variables that help with debugging. Use these as e.g. `XTL_FOO=
|
||||
### Disk
|
||||
|
||||
- `XTL_DEBUG_TMP`: Set to `1` to log details when xtool creates/destroys temporary directories.
|
||||
- `XTL_TMPDIR`: Control the location where xtool stores temporary directories. We also respect `TMPDIR` and (on Linux) `XDG_CACHE_HOME`.
|
||||
- `XTL_TMPDIR`: Control the location where xtool stores temporary directories. We also respect `XDG_CACHE_HOME` on Linux.
|
||||
|
||||
### Networking
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ sudo apt-get install usbmuxd
|
||||
|
||||
### Xcode.xip
|
||||
|
||||
Download **Xcode 27** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
|
||||
Download **Xcode 27.1** 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.0.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.1.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
|
||||
|
||||
Confirm that it worked:
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
.DS_Store
|
||||
.build
|
||||
.swiftpm
|
||||
*/xtool
|
||||
*/.bsp
|
||||
/out
|
||||
@@ -0,0 +1,29 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoDynamic",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoDynamic",
|
||||
targets: ["DemoDynamic"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoDynamic",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
.product(name: "ExampleDynamicLibrary", package: "ExampleSupport"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,12 @@
|
||||
import ExampleDynamicLibrary
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: ExampleApp {
|
||||
init() {
|
||||
let message = exampleDynamicLibraryFunction()
|
||||
guard message == "Hello from the dynamic library\n" else {
|
||||
fatalError("Unexpected message from dynamic library: \(message)")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoDynamic
|
||||
@@ -0,0 +1,33 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoExtensions",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoExtensions",
|
||||
targets: ["DemoExtensions"]
|
||||
),
|
||||
.library(
|
||||
name: "DemoExtensionsWidget",
|
||||
targets: ["DemoExtensionsWidget"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoExtensions",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
]
|
||||
),
|
||||
.target(name: "DemoExtensionsWidget"),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,4 @@
|
||||
import SwiftUI
|
||||
import ExampleSupport
|
||||
|
||||
@main struct DemoApp: ExampleApp {}
|
||||
@@ -0,0 +1,51 @@
|
||||
import WidgetKit
|
||||
import SwiftUI
|
||||
|
||||
@main struct Bundle: WidgetBundle {
|
||||
var body: some Widget {
|
||||
DemoWidget()
|
||||
}
|
||||
}
|
||||
|
||||
struct DemoWidget: Widget {
|
||||
var body: some WidgetConfiguration {
|
||||
StaticConfiguration(
|
||||
kind: "DemoWidget",
|
||||
provider: Provider()
|
||||
) { entry in
|
||||
VStack {
|
||||
Text(entry.date, style: .date)
|
||||
}
|
||||
.containerBackground(.fill.tertiary, for: .widget)
|
||||
}
|
||||
.configurationDisplayName("DemoWidget")
|
||||
.description("This is an example widget.")
|
||||
}
|
||||
|
||||
struct Entry: TimelineEntry {
|
||||
var date = Date()
|
||||
}
|
||||
|
||||
struct Provider: TimelineProvider {
|
||||
func placeholder(in context: Context) -> Entry {
|
||||
Entry()
|
||||
}
|
||||
|
||||
func getSnapshot(
|
||||
in context: Context,
|
||||
completion: @escaping (Entry) -> Void
|
||||
) {
|
||||
completion(Entry())
|
||||
}
|
||||
|
||||
func getTimeline(
|
||||
in context: Context,
|
||||
completion: @escaping (Timeline<Entry>) -> Void
|
||||
) {
|
||||
completion(Timeline(
|
||||
entries: [Entry()],
|
||||
policy: .after(.now + 3600)
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>NSExtension</key>
|
||||
<dict>
|
||||
<key>NSExtensionPointIdentifier</key>
|
||||
<string>com.apple.widgetkit-extension</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,6 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoExtensions
|
||||
product: DemoExtensions
|
||||
extensions:
|
||||
- product: DemoExtensionsWidget
|
||||
infoPath: Support/DemoExtensionsWidget-Info.plist
|
||||
@@ -0,0 +1,31 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoResources",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoResources",
|
||||
targets: ["DemoResources"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoResources",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
],
|
||||
resources: [
|
||||
.process("bundled.txt"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1 @@
|
||||
Top level resource
|
||||
@@ -0,0 +1,34 @@
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: App {
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
Text("Hello, world!")
|
||||
.task {
|
||||
guard let bundled = #bundle.url(forResource: "bundled", withExtension: "txt")
|
||||
else { fatalError("Missing bundled.txt resource") }
|
||||
assertContents(of: bundled, equal: "Bundled resource\n")
|
||||
|
||||
guard let top = Bundle.main.url(forResource: "top", withExtension: "txt")
|
||||
else { fatalError("Missing top.txt resource") }
|
||||
assertContents(of: top, equal: "Top level resource\n")
|
||||
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func assertContents(of url: URL, equal value: String) {
|
||||
let name = url.lastPathComponent
|
||||
let contents: String
|
||||
do {
|
||||
contents = try String(contentsOf: url, encoding: .utf8)
|
||||
} catch {
|
||||
fatalError("Failed to read \(name): \(error)")
|
||||
}
|
||||
guard contents == value else {
|
||||
fatalError("\(name) had unexpected contents: \(contents)")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
Bundled resource
|
||||
@@ -0,0 +1,4 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoResources
|
||||
resources:
|
||||
- Resources/top.txt
|
||||
@@ -0,0 +1,28 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoSimple",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoSimple",
|
||||
targets: ["DemoSimple"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoSimple",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,26 @@
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoSimple
|
||||
@@ -0,0 +1,141 @@
|
||||
{
|
||||
"originHash" : "87792a9d5953dfe62ed2edf7c4f142774813bd3ea31882cbf6659b62fb2827ab",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "combine-schedulers",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/combine-schedulers",
|
||||
"state" : {
|
||||
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "opencombine",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/OpenCombine/OpenCombine.git",
|
||||
"state" : {
|
||||
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
|
||||
"version" : "0.14.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-case-paths",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-case-paths",
|
||||
"state" : {
|
||||
"revision" : "cb4cba6a8a46a86db0d37dbe09935ead6b24c91a",
|
||||
"version" : "1.10.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-clocks",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-clocks",
|
||||
"state" : {
|
||||
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
|
||||
"version" : "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-collections",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"state" : {
|
||||
"revision" : "98ef3c98609a1e31b7e157b5b619579001a789d6",
|
||||
"version" : "1.7.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-composable-architecture",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
|
||||
"state" : {
|
||||
"revision" : "377da4061db10d26337a71bb279c506bb951f50f",
|
||||
"version" : "1.26.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-concurrency-extras",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
|
||||
"state" : {
|
||||
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
|
||||
"version" : "1.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-custom-dump",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-custom-dump",
|
||||
"state" : {
|
||||
"revision" : "4fb9e7cbb4b8f5a7354005db39447f570d6b3e19",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-dependencies",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-dependencies",
|
||||
"state" : {
|
||||
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
|
||||
"version" : "1.17.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-identified-collections",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-identified-collections",
|
||||
"state" : {
|
||||
"revision" : "322d9ffeeba85c9f7c4984b39422ec7cc3c56597",
|
||||
"version" : "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-issue-reporting",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
|
||||
"state" : {
|
||||
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
|
||||
"version" : "2.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-navigation",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-navigation",
|
||||
"state" : {
|
||||
"revision" : "7e95e5e9ff0a64f6ad8bca59083f8d6ba381b6ff",
|
||||
"version" : "2.11.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-perception",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-perception",
|
||||
"state" : {
|
||||
"revision" : "597afd46249f4a71885b95d26b26cc5b893daf32",
|
||||
"version" : "2.0.12"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-sharing",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-sharing",
|
||||
"state" : {
|
||||
"revision" : "3552faf8a6c18ce896ec5a72bd8c34755f0f03e0",
|
||||
"version" : "2.10.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-syntax",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-syntax",
|
||||
"state" : {
|
||||
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
|
||||
"version" : "604.0.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
"version" : 3
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoTCA",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoTCA",
|
||||
targets: ["DemoTCA"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "1.0.0"),
|
||||
// we don't use this but need the explicit dependency to keep the lockfile stable.
|
||||
// TODO: remove once https://github.com/pointfreeco/combine-schedulers/issues/120 is fixed
|
||||
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoTCA",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
|
||||
],
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,24 @@
|
||||
import SwiftUI
|
||||
import ComposableArchitecture
|
||||
import ExampleSupport
|
||||
|
||||
struct ContentView: View {
|
||||
let store: StoreOf<CounterFeature>
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
Image(systemName: "globe")
|
||||
.imageScale(.large)
|
||||
.foregroundStyle(.tint)
|
||||
Text("Count: \(store.count)")
|
||||
}
|
||||
.padding()
|
||||
.onAppear {
|
||||
store.send(.appear)
|
||||
}
|
||||
.onChange(of: store.count) { _, count in
|
||||
guard count == 1 else { return }
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
import ComposableArchitecture
|
||||
|
||||
@Reducer
|
||||
struct CounterFeature {
|
||||
@ObservableState
|
||||
struct State {
|
||||
var count = 0
|
||||
}
|
||||
|
||||
enum Action {
|
||||
case appear
|
||||
case timerElapsed
|
||||
}
|
||||
|
||||
@Dependency(\.continuousClock) var continuousClock
|
||||
|
||||
var body: some Reducer<State, Action> {
|
||||
Reduce { state, action in
|
||||
switch action {
|
||||
case .appear:
|
||||
return .run { [continuousClock] send in
|
||||
try await continuousClock.sleep(for: .seconds(1))
|
||||
await send(.timerElapsed)
|
||||
}
|
||||
case .timerElapsed:
|
||||
state.count += 1
|
||||
return .none
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
import SwiftUI
|
||||
import ComposableArchitecture
|
||||
|
||||
@main
|
||||
struct DemoTCAApp: App {
|
||||
private let store = Store(initialState: CounterFeature.State()) {
|
||||
CounterFeature()
|
||||
}
|
||||
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView(store: store)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoTCA
|
||||
@@ -0,0 +1,31 @@
|
||||
// swift-tools-version: 6.4
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "ExampleSupport",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "ExampleSupport",
|
||||
targets: ["ExampleSupport"]
|
||||
),
|
||||
.library(
|
||||
name: "ExampleDynamicLibrary",
|
||||
type: .dynamic,
|
||||
targets: ["ExampleDynamicLibrary"]
|
||||
),
|
||||
],
|
||||
targets: [
|
||||
.target(name: "ExampleSupport"),
|
||||
.target(
|
||||
name: "ExampleDynamicLibrary",
|
||||
resources: [
|
||||
.process("response.txt"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,9 @@
|
||||
import Foundation
|
||||
|
||||
public func exampleDynamicLibraryFunction() -> String {
|
||||
guard let bundled = #bundle.url(forResource: "response", withExtension: "txt")
|
||||
else { fatalError("Missing bundled.txt resource") }
|
||||
// swiftlint:disable:next force_try
|
||||
let contents = try! String(contentsOf: bundled, encoding: .utf8)
|
||||
return "Hello \(contents)"
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
from the dynamic library
|
||||
@@ -0,0 +1,25 @@
|
||||
import SwiftUI
|
||||
|
||||
public protocol ExampleApp: App {}
|
||||
extension ExampleApp {
|
||||
public var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct ContentView: View {
|
||||
var body: some View {
|
||||
VStack {
|
||||
Image(systemName: "globe")
|
||||
.imageScale(.large)
|
||||
.foregroundStyle(.tint)
|
||||
Text("Hello, world!")
|
||||
}
|
||||
.padding()
|
||||
.task {
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import Foundation
|
||||
|
||||
public enum Example {}
|
||||
extension Example {
|
||||
public static func pass() {
|
||||
Task {
|
||||
try? await Task.sleep(for: .seconds(1))
|
||||
print("xtool test succeeded")
|
||||
exit(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
# Examples
|
||||
|
||||
These primarily exist as fixtures for integration tests, but also double as snippets of sample code.
|
||||
|
||||
Each demo is designed to make some assertions shortly after launching, and then exit. On success, stdout will include the message "xtool test succeeded".
|
||||
|
||||
## Testing
|
||||
|
||||
```
|
||||
./Examples/test.sh [--build | --run] [DemoName]
|
||||
```
|
||||
|
||||
- Omit `--build`/`--run` to build _and_ run
|
||||
- Omit the demo name to loop through all demos
|
||||
Executable
+118
@@ -0,0 +1,118 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
shopt -s nullglob
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 [--build | --run] [DemoName]"
|
||||
}
|
||||
|
||||
mode=both
|
||||
case "${1:-}" in
|
||||
--build) mode=build; shift ;;
|
||||
--run) mode=run; shift ;;
|
||||
-h|--help) usage; exit 0 ;;
|
||||
esac
|
||||
|
||||
if [[ $# -gt 1 || (${1:-} != "" && (${1:-} != Demo* || ${1:-} == */*)) ]]; then
|
||||
usage >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
examples_dir="$PWD"
|
||||
out_dir="$examples_dir/out"
|
||||
|
||||
if [[ -n "${1:-}" ]]; then
|
||||
demos=("$1")
|
||||
elif [[ "$mode" == run ]]; then
|
||||
demos=()
|
||||
for app in "$out_dir"/*.app; do
|
||||
name="${app##*/}"
|
||||
demos+=("${name%.app}")
|
||||
done
|
||||
else
|
||||
demos=()
|
||||
for demo in "$examples_dir"/Demo*/; do
|
||||
[[ -f "$demo/Package.swift" ]] || continue
|
||||
demo="${demo%/}"
|
||||
demos+=("${demo##*/}")
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ ${#demos[@]} -eq 0 ]]; then
|
||||
echo "No demos found. Run $0 --build first if using --run." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
logs_dir="$(mktemp -d)"
|
||||
trap 'rm -rf "$logs_dir"' EXIT
|
||||
trap 'exit 130' INT
|
||||
trap 'exit 143' TERM
|
||||
|
||||
build_demo() {
|
||||
local demo="$1"
|
||||
echo "Building $demo..."
|
||||
mkdir -p "$out_dir" || return 1
|
||||
# Do not leave an older successful build available after a failed rebuild.
|
||||
rm -rf "$out_dir/$demo.app" || return 1
|
||||
(cd "$examples_dir/$demo" && xtool dev build --triple arm64-apple-ios-simulator) || return 1
|
||||
cp -R "$examples_dir/$demo/xtool/$demo.app" "$out_dir/$demo.app"
|
||||
}
|
||||
|
||||
run_demo() (
|
||||
demo="$1"
|
||||
app="$out_dir/$demo.app"
|
||||
log="$logs_dir/$demo-run.log"
|
||||
if [[ ! -d "$app" ]]; then
|
||||
echo "Missing $app. Run $0 --build $demo first." >&2
|
||||
exit 1
|
||||
fi
|
||||
bundle_id=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$app/Info.plist") || exit 1
|
||||
echo "Running $demo..."
|
||||
xcrun simctl install booted "$app" || exit 1
|
||||
xcrun simctl launch --terminate-running-process --console booted "$bundle_id" >"$log" 2>&1 &
|
||||
launch_pid=$!
|
||||
# A demo should exit shortly after launch. Bound failures that hang instead.
|
||||
(
|
||||
sleep_pid=""
|
||||
trap '[[ -z "$sleep_pid" ]] || kill "$sleep_pid" 2>/dev/null || true' EXIT
|
||||
sleep 60 &
|
||||
sleep_pid=$!
|
||||
wait "$sleep_pid"
|
||||
sleep_pid=""
|
||||
touch "$log.timeout"
|
||||
kill -TERM "$launch_pid" 2>/dev/null || exit 0
|
||||
sleep 5 &
|
||||
sleep_pid=$!
|
||||
wait "$sleep_pid"
|
||||
sleep_pid=""
|
||||
kill -KILL "$launch_pid" 2>/dev/null || true
|
||||
) >/dev/null 2>&1 &
|
||||
timeout_pid=$!
|
||||
trap 'kill "$timeout_pid" "$launch_pid" 2>/dev/null || true' EXIT
|
||||
status=0
|
||||
wait "$launch_pid" || status=$?
|
||||
kill "$timeout_pid" 2>/dev/null || true
|
||||
wait "$timeout_pid" 2>/dev/null || true
|
||||
cat "$log"
|
||||
if [[ -f "$log.timeout" ]]; then
|
||||
echo "$demo did not terminate within 60 seconds." >&2
|
||||
exit 1
|
||||
fi
|
||||
[[ "$status" -eq 0 ]] && grep -Fxq 'xtool test succeeded' "$log"
|
||||
)
|
||||
|
||||
status=0
|
||||
for demo in "${demos[@]}"; do
|
||||
if [[ "$mode" != run ]] && ! build_demo "$demo"; then
|
||||
echo "Build failed: $demo" >&2
|
||||
status=1
|
||||
continue
|
||||
fi
|
||||
if [[ "$mode" != build ]] && ! run_demo "$demo"; then
|
||||
echo "Test failed: $demo" >&2
|
||||
status=1
|
||||
fi
|
||||
done
|
||||
exit "$status"
|
||||
+2
-2
@@ -13,7 +13,7 @@ fi
|
||||
rm -rf staging/tmp
|
||||
mkdir -p staging/tmp staging/linuxdeploy
|
||||
|
||||
swift build --package-path .. -c release --product xtool --static-swift-stdlib
|
||||
swift build --package-path .. -c release --product xtool
|
||||
bin="$(swift build --package-path .. -c release --show-bin-path)"
|
||||
strip "${bin}/xtool"
|
||||
|
||||
@@ -38,7 +38,7 @@ if [[ ! -f staging/linuxdeploy/linuxdeploy.AppImage ]]; then
|
||||
fi
|
||||
|
||||
mkdir -p staging/tmp/AppDir/usr/bin
|
||||
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
find "${bin}"/ -name '*.resources' -or -name '*.bundle' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="${XTOOL_VERSION:-unversioned}"
|
||||
export LDAI_OUTPUT="staging/tmp/xtool-${curr_arch}.AppImage"
|
||||
|
||||
@@ -132,7 +132,8 @@ docs-preview:
|
||||
|
||||
SWIFTLINT_VERSION = $(shell head -1 .swiftlint.yml | cut -d' ' -f2)
|
||||
SWIFTLINT_BIN = .tmp/swiftlint/swiftlint-$(SWIFTLINT_VERSION)
|
||||
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux).zip
|
||||
SWIFTLINT_ARCH = $(subst aarch64,arm64,$(subst x86_64,amd64,$(shell uname -m)))
|
||||
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux_$(SWIFTLINT_ARCH)).zip
|
||||
|
||||
.PHONY: lint
|
||||
lint: $(SWIFTLINT_BIN)
|
||||
|
||||
+63
-99
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"originHash" : "ed653e99caa794ac3e41b02904e97fde699863ea1d851d0153bc1c0f77770c3d",
|
||||
"originHash" : "2ccd077fc130f0f1b1279d87aa61d1fc243964d7ad49489a12021577c54df9de",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tadija/AEXML.git",
|
||||
"state" : {
|
||||
"revision" : "db806756c989760b35108146381535aec231092b",
|
||||
"version" : "4.7.0"
|
||||
"revision" : "dd9206de0717d658daec6a064992894fdab8ae17",
|
||||
"version" : "4.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -15,8 +15,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/async-http-client.git",
|
||||
"state" : {
|
||||
"revision" : "f95c908967e98c68c5ce3fd61a7974e7e869e303",
|
||||
"version" : "1.36.1"
|
||||
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
|
||||
"version" : "1.36.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -37,15 +37,6 @@
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "jsonutilities",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
|
||||
"state" : {
|
||||
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
|
||||
"version" : "4.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "openapikit",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -73,15 +64,6 @@
|
||||
"version" : "1.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "rainbow",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/onevcat/Rainbow.git",
|
||||
"state" : {
|
||||
"revision" : "711ca908ca19d16e577d575c8d0a48151a16bb1b",
|
||||
"version" : "4.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "spectre",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -123,8 +105,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-async-algorithms.git",
|
||||
"state" : {
|
||||
"revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c",
|
||||
"version" : "1.1.5"
|
||||
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
|
||||
"version" : "1.1.7"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -159,8 +141,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"state" : {
|
||||
"revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
|
||||
"version" : "1.6.0"
|
||||
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -168,8 +150,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
|
||||
"state" : {
|
||||
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
|
||||
"version" : "1.4.1"
|
||||
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
|
||||
"version" : "1.4.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -177,8 +159,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-configuration.git",
|
||||
"state" : {
|
||||
"revision" : "3533f65d3e36dcdffc91ce34ef4d3c9c1887fd4b",
|
||||
"version" : "1.2.1"
|
||||
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -186,8 +168,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-crypto",
|
||||
"state" : {
|
||||
"revision" : "a9d1d5ab8951ada40cafff8c8e2b551dfde4f390",
|
||||
"version" : "5.0.0"
|
||||
"revision" : "c2cbadd7263439d8015189668f96ff5b5be565ce",
|
||||
"version" : "5.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-custom-dump",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-custom-dump",
|
||||
"state" : {
|
||||
"revision" : "4fb9e7cbb4b8f5a7354005db39447f570d6b3e19",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -204,8 +195,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-distributed-tracing.git",
|
||||
"state" : {
|
||||
"revision" : "cc504a45f6ce73ce6067837d7ac19fa67b229a56",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
|
||||
"version" : "1.7.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -249,8 +240,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
|
||||
"state" : {
|
||||
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
|
||||
"version" : "2.1.1"
|
||||
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
|
||||
"version" : "2.1.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -258,8 +249,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-log.git",
|
||||
"state" : {
|
||||
"revision" : "9c6fb14227f55d8f711ce3847dc2f419fb0ecacb",
|
||||
"version" : "1.15.1"
|
||||
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
|
||||
"version" : "1.16.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -267,8 +258,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio",
|
||||
"state" : {
|
||||
"revision" : "21de5f08c1a166a6dd293d0e587ad977bf8dac5d",
|
||||
"version" : "2.103.0"
|
||||
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
|
||||
"version" : "2.104.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -330,8 +321,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-generator",
|
||||
"state" : {
|
||||
"revision" : "39d49cf22abab58a07f02bb76808b5d2839b294a",
|
||||
"version" : "1.13.1"
|
||||
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
|
||||
"version" : "1.14.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -339,8 +330,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-runtime",
|
||||
"state" : {
|
||||
"revision" : "9e53df53e043b53046a371b31aaf0a1e26eef946",
|
||||
"version" : "1.12.1"
|
||||
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
|
||||
"version" : "1.13.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -348,8 +339,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-urlsession",
|
||||
"state" : {
|
||||
"revision" : "08796d36c99ad2318929bfa1d1e40f82194b65cc",
|
||||
"version" : "1.3.1"
|
||||
"revision" : "c97e0f0187d95542b4a254f5bb4dc67f43bf73c9",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-rcodesign",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/swift-rcodesign",
|
||||
"state" : {
|
||||
"revision" : "08650ab9d3bf95a0c585581b8bd63eb7b8315264",
|
||||
"version" : "0.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -357,8 +357,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-service-context.git",
|
||||
"state" : {
|
||||
"revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
|
||||
"version" : "1.3.0"
|
||||
"revision" : "853ba3d9ce78851b9cc20108e8bd4f13f7fa546c",
|
||||
"version" : "1.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -366,8 +366,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/swift-service-lifecycle",
|
||||
"state" : {
|
||||
"revision" : "7f9326b0326ff86e3646295ea6e891f68c471c5e",
|
||||
"version" : "2.12.0"
|
||||
"revision" : "a18ee16b8039866fd919bdb4e8e906882d4ecc75",
|
||||
"version" : "2.13.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -375,8 +375,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
|
||||
"version" : "1.0.0"
|
||||
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
|
||||
"version" : "1.0.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -397,15 +397,6 @@
|
||||
"version" : "1.8.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swiftcli",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jakeheis/SwiftCLI.git",
|
||||
"state" : {
|
||||
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
|
||||
"version" : "6.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swiftymobiledevice",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -424,15 +415,6 @@
|
||||
"version" : "3.3.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "version",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mxcl/Version",
|
||||
"state" : {
|
||||
"revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
|
||||
"version" : "2.2.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "websocket-kit",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -443,21 +425,12 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xadi",
|
||||
"identity" : "xcode-project-format",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xadi",
|
||||
"location" : "https://github.com/apple/xcode-project-format.git",
|
||||
"state" : {
|
||||
"revision" : "2aad968e4806b8571f6f2bed22ecec00b0322f95",
|
||||
"version" : "0.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xcodegen",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/XcodeGen",
|
||||
"state" : {
|
||||
"revision" : "8445e778451c7e44237b90281bde622d764b0084",
|
||||
"version" : "2.46.0"
|
||||
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
|
||||
"version" : "0.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -465,8 +438,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tuist/XcodeProj.git",
|
||||
"state" : {
|
||||
"revision" : "eb001108f64467b0cc7e8cbf90b3b4aaa1822cbb",
|
||||
"version" : "9.14.0"
|
||||
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
|
||||
"version" : "9.17.6"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -474,8 +447,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xtool-core",
|
||||
"state" : {
|
||||
"revision" : "f867f9c2aea16ac78ca14d0d2f948b47db0732b4",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "154d7213c12e3f21d50793f50ec7bfb89cfd3918",
|
||||
"version" : "1.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -483,17 +456,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jpsim/Yams",
|
||||
"state" : {
|
||||
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
|
||||
"version" : "5.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "zsign",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/zsign",
|
||||
"state" : {
|
||||
"revision" : "f6158be9e62a5ce2a53d72b1a6d880880da956c8",
|
||||
"version" : "1.9.0"
|
||||
"revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279",
|
||||
"version" : "6.2.2"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
+73
-19
@@ -9,12 +9,14 @@ let xtoolVersion: String? = {
|
||||
let gitCommit = info.currentCommit
|
||||
let gitTag = info.currentTag
|
||||
let gitRef = gitTag ?? "commit \(gitCommit)"
|
||||
return "\(gitRef)\(info.hasUncommittedChanges ? " (dirty)" : "")"
|
||||
return gitRef
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}()
|
||||
|
||||
let hasUncommittedChanges = Context.gitInformation?.hasUncommittedChanges ?? false
|
||||
|
||||
let cSettings: [CSetting] = [
|
||||
.define("_GNU_SOURCE", .when(platforms: [.linux])),
|
||||
]
|
||||
@@ -48,10 +50,9 @@ let package = Package(
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.0")),
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.1")),
|
||||
.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.1")),
|
||||
.package(url: "https://github.com/xtool-org/swift-rcodesign", .upToNextMinor(from: "0.2.0")),
|
||||
|
||||
.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,10 +62,8 @@ let package = Package(
|
||||
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
|
||||
.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"),
|
||||
// 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/swift-collections", from: "1.7.1"),
|
||||
.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"),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", from: "1.0.0"),
|
||||
@@ -75,17 +74,17 @@ let package = Package(
|
||||
|
||||
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.3.0"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.6.2"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
|
||||
// we don't use this but need the explicit dependency to keep the lockfile stable.
|
||||
// TODO: remove once https://github.com/pointfreeco/combine-schedulers/issues/120 is fixed
|
||||
.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/mxcl/Version", from: "2.1.0"),
|
||||
.package(url: "https://github.com/jpsim/Yams", from: "5.1.3"),
|
||||
.package(url: "https://github.com/jpsim/Yams", from: "6.0.0"),
|
||||
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
|
||||
|
||||
// TODO: just depend on tuist/XcodeProj instead
|
||||
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
|
||||
// NB: this should only be imported from XcodeProjects
|
||||
.package(url: "https://github.com/tuist/XcodeProj.git", from: "9.17.5"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
@@ -93,7 +92,9 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenSSL", package: "xtool-core")
|
||||
],
|
||||
cSettings: cSettings + (
|
||||
cSettings: cSettings + [
|
||||
.define("XTOOL_HAS_UNCOMMITTED_CHANGES", to: hasUncommittedChanges ? "1" : "0"),
|
||||
] + (
|
||||
xtoolVersion
|
||||
.map { [.define("XTOOL_VERSION", to: "\"\($0)\"")] }
|
||||
?? []
|
||||
@@ -111,6 +112,9 @@ let package = Package(
|
||||
.target(
|
||||
name: "XUtils",
|
||||
dependencies: [
|
||||
"CXKit",
|
||||
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(
|
||||
name: "Subprocess",
|
||||
@@ -120,18 +124,35 @@ let package = Package(
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
.systemLibrary(
|
||||
name: "CLZMA",
|
||||
pkgConfig: "liblzma",
|
||||
providers: [
|
||||
.apt(["liblzma-dev"]),
|
||||
]
|
||||
),
|
||||
// Apple Archive (.aar) and Apple Encrypted Archive (.aea) support
|
||||
.target(
|
||||
name: "XAppleArchive",
|
||||
dependencies: [
|
||||
"XUtils",
|
||||
.target(name: "CLZMA", condition: .when(platforms: [.linux])),
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "X509", package: "swift-certificates"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
.target(
|
||||
name: "XKit",
|
||||
dependencies: [
|
||||
"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"),
|
||||
.product(name: "Zupersign", package: "zsign"),
|
||||
.product(name: "SignerSupport", package: "xtool-core"),
|
||||
.product(name: "RCodesign", package: "swift-rcodesign"),
|
||||
.product(name: "ProtoCodable", package: "xtool-core"),
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
@@ -165,6 +186,31 @@ let package = Package(
|
||||
dependencies: [
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
"XCLIUtils",
|
||||
"PackLib",
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
.product(name: "X509", package: "swift-certificates"),
|
||||
.product(name: "CustomDump", package: "swift-custom-dump"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
.testTarget(
|
||||
name: "XAppleArchiveTests",
|
||||
dependencies: [
|
||||
"XAppleArchive",
|
||||
"XUtils",
|
||||
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
],
|
||||
exclude: ["Fixtures"],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
.target(
|
||||
name: "XCLIUtils",
|
||||
dependencies: [
|
||||
"XUtils",
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
@@ -173,23 +219,31 @@ let package = Package(
|
||||
dependencies: [
|
||||
"SwiftyMobileDevice",
|
||||
"XKit",
|
||||
"XCLIUtils",
|
||||
"PackLib",
|
||||
.product(name: "ArgumentParser", package: "swift-argument-parser"),
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(name: "NIOPosix", package: "swift-nio"),
|
||||
.product(name: "Version", package: "Version"),
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "libunxip", package: "unxip"),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
.target(
|
||||
name: "XcodeProjects",
|
||||
dependencies: [
|
||||
.product(name: "XcodeProj", package: "XcodeProj"),
|
||||
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
|
||||
],
|
||||
),
|
||||
.target(
|
||||
name: "PackLib",
|
||||
dependencies: [
|
||||
"XUtils",
|
||||
"XcodeProjects",
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Yams", package: "Yams"),
|
||||
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
|
||||
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
|
||||
@@ -57,7 +57,9 @@ DEVICE SUBCOMMANDS:
|
||||
|
||||
### Library
|
||||
|
||||
xtool includes a library that you can use to interact with Apple Developer Services, iOS devices, and more from your own app. You can use this by adding `XKit` as a SwiftPM dependency.
|
||||
You can consume xtool itself as a Swift Package, to enable your own app to interact with Apple Developer Services, iOS devices, and more. You can use this by adding `XKit` or `XToolSupport` as a SwiftPM dependency.
|
||||
|
||||
Note: while we aim to uphold semver semantics on the CLI interface (breaking change = major version bump), the Swift interface does not offer the same guarantees.
|
||||
|
||||
```swift
|
||||
// package dependency:
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
module CLZMA [system] {
|
||||
header "shim.h"
|
||||
link "lzma"
|
||||
export *
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
#pragma once
|
||||
|
||||
#include <lzma.h>
|
||||
@@ -1 +1,4 @@
|
||||
#include <stdbool.h>
|
||||
|
||||
const char * _Nonnull xtl_version(void);
|
||||
bool xtl_has_uncommitted_changes(void);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "version.h"
|
||||
#include <stddef.h>
|
||||
|
||||
const char *xtl_version(void) {
|
||||
#ifdef XTOOL_VERSION
|
||||
@@ -7,3 +8,15 @@ const char *xtl_version(void) {
|
||||
return "unversioned";
|
||||
#endif
|
||||
}
|
||||
|
||||
bool xtl_has_uncommitted_changes(void) {
|
||||
#ifndef XTOOL_VERSION
|
||||
return true;
|
||||
#else
|
||||
#ifdef XTOOL_HAS_UNCOMMITTED_CHANGES
|
||||
return XTOOL_HAS_UNCOMMITTED_CHANGES != 0;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -17,6 +17,13 @@ public struct Packer: Sendable {
|
||||
try? FileManager.default.removeItem(at: packageDir)
|
||||
try FileManager.default.createDirectory(at: packageDir, withIntermediateDirectories: true)
|
||||
|
||||
if URL(fileURLWithPath: "Packages").dirExists {
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: packageDir.appendingPathComponent("Packages").path,
|
||||
withDestinationPath: "../../Packages"
|
||||
)
|
||||
}
|
||||
|
||||
let packageSwift = packageDir.appendingPathComponent("Package.swift")
|
||||
let contents = """
|
||||
// swift-tools-version: 6.0
|
||||
@@ -193,7 +200,7 @@ public struct Packer: Sendable {
|
||||
if product.type == .application {
|
||||
info["UIRequiredDeviceCapabilities"] = ["arm64"]
|
||||
info["LSRequiresIPhoneOS"] = true
|
||||
info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
|
||||
info["CFBundleSupportedPlatforms"] = Packer.cfBundleSupportedPlatforms(for: buildSettings.triple)
|
||||
}
|
||||
|
||||
if let iconPath = product.iconPath {
|
||||
@@ -210,6 +217,26 @@ public struct Packer: Sendable {
|
||||
try encodedPlist.write(to: infoPath)
|
||||
}
|
||||
}
|
||||
|
||||
static func cfBundleSupportedPlatforms(for triple: String) -> [String] {
|
||||
let components = triple.split(separator: "-").map(String.init)
|
||||
guard let appleIndex = components.firstIndex(of: "apple"),
|
||||
components.indices.contains(appleIndex + 1) else {
|
||||
return ["iPhoneOS"]
|
||||
}
|
||||
|
||||
let os = components[appleIndex + 1].prefix { !$0.isNumber }
|
||||
switch os {
|
||||
case "ios" where components.contains("simulator"):
|
||||
return ["iPhoneSimulator"]
|
||||
case "ios":
|
||||
return ["iPhoneOS"]
|
||||
case "macos", "macosx":
|
||||
return ["MacOSX"]
|
||||
default:
|
||||
return ["iPhoneOS"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension Plan.Product {
|
||||
|
||||
@@ -137,6 +137,10 @@ public struct Planner: Sendable {
|
||||
throw StringError("Could not find target '\(targetName)' in package '\(targetPackage.name)'")
|
||||
}
|
||||
guard visited.insert(targetName).inserted else { continue }
|
||||
// Macro targets are compiler plugins that run on the host, not code
|
||||
// linked into the iOS app. Skip them to avoid resolving their
|
||||
// host-only dependencies (e.g. SwiftSyntaxMacros).
|
||||
if target.type == "macro" { continue }
|
||||
if target.moduleType == "BinaryTarget" {
|
||||
resources.append(.binaryTarget(name: targetName))
|
||||
}
|
||||
@@ -408,6 +412,7 @@ private struct PackageDump: Decodable {
|
||||
struct Target: Decodable {
|
||||
let name: String
|
||||
let moduleType: String
|
||||
let type: String?
|
||||
let productDependencies: [String]?
|
||||
let targetDependencies: [String]?
|
||||
let resources: [Resource]?
|
||||
|
||||
@@ -1,12 +1,64 @@
|
||||
import Subprocess
|
||||
import Version
|
||||
import XUtils
|
||||
|
||||
public struct SwiftVersion: Sendable {
|
||||
public var version: Version
|
||||
public struct SwiftVersion: Sendable, Comparable, Hashable {
|
||||
public var major: Int
|
||||
public var minor: Int
|
||||
public var patch: Int
|
||||
|
||||
public init(_ major: Int, _ minor: Int, _ patch: Int = 0) {
|
||||
self.major = major
|
||||
self.minor = minor
|
||||
self.patch = patch
|
||||
}
|
||||
|
||||
public static func < (lhs: Self, rhs: Self) -> Bool {
|
||||
lhs.tuple < rhs.tuple
|
||||
}
|
||||
|
||||
fileprivate var tuple: (Int, Int, Int) {
|
||||
(major, minor, patch)
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion {
|
||||
public var supportsSwiftBuild: Bool {
|
||||
version >= Version(6, 4, 0)
|
||||
self >= SwiftVersion(6, 4)
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion: LosslessStringConvertible, CustomStringConvertible {
|
||||
public var description: String {
|
||||
"\(major).\(minor).\(patch)"
|
||||
}
|
||||
|
||||
public init?(_ description: String) {
|
||||
// inverse of https://github.com/swiftlang/swift/blob/896191b38/lib/Basic/Version.cpp#L266
|
||||
|
||||
var output = description[...]
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
if output.hasPrefix("Swift version ") {
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
output = output.prefix { !$0.isWhitespace }
|
||||
}
|
||||
let isDev = output.hasSuffix("-dev")
|
||||
if isDev { output = output.dropLast("-dev".count) }
|
||||
|
||||
let parts = output.split(separator: ".")
|
||||
var numericParts = parts.compactMap { Int($0) }
|
||||
guard parts.count == numericParts.count else {
|
||||
return nil
|
||||
}
|
||||
|
||||
switch numericParts.count {
|
||||
case 2: numericParts.append(0)
|
||||
case 3: break
|
||||
default: return nil
|
||||
}
|
||||
|
||||
self.init(numericParts[0], numericParts[1], numericParts[2])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,22 +76,12 @@ extension SwiftVersion {
|
||||
} catch {
|
||||
throw StringError("Failed to obtain Swift version")
|
||||
}
|
||||
var output = outputString?[...] ?? ""
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
guard output.hasPrefix("Swift version ") else {
|
||||
|
||||
let output = outputString ?? ""
|
||||
guard let version = Self(output) else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
guard let space = output.firstIndex(of: " ") else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output[..<space]
|
||||
guard let version = Version(tolerant: output) else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
return SwiftVersion(version: version)
|
||||
return version
|
||||
}
|
||||
|
||||
public static var current: Self {
|
||||
|
||||
+246
-118
@@ -1,10 +1,5 @@
|
||||
#if os(macOS)
|
||||
import Foundation
|
||||
import PathKit
|
||||
import Version
|
||||
import ProjectSpec
|
||||
import XcodeGenKit
|
||||
import XcodeProj
|
||||
import XcodeProjects
|
||||
|
||||
public struct XcodePacker {
|
||||
public var plan: Plan
|
||||
@@ -14,151 +9,284 @@ public struct XcodePacker {
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
public func createProject() async throws -> URL {
|
||||
let xtoolDir: Path = "xtool"
|
||||
public func createProject(
|
||||
at root: URL = URL(fileURLWithPath: FileManager.default.currentDirectoryPath, isDirectory: true)
|
||||
) async throws -> URL {
|
||||
let xtoolDir = root.appendingPathComponent("xtool", isDirectory: true)
|
||||
let projectDir = xtoolDir.appendingPathComponent(".xtool-tmp", isDirectory: true)
|
||||
try? FileManager.default.removeItem(at: projectDir)
|
||||
try FileManager.default.createDirectory(at: projectDir, withIntermediateDirectories: true)
|
||||
|
||||
let projectDir: Path = xtoolDir + ".xtool-tmp"
|
||||
try? xtoolDir.delete()
|
||||
try projectDir.mkpath()
|
||||
let fromProjectToRoot = "../.."
|
||||
|
||||
let fromProjectToRoot = try Path(".").relativePath(from: projectDir)
|
||||
|
||||
guard let deploymentTarget = Version(tolerant: plan.app.deploymentTarget) else {
|
||||
throw StringError("Could not parse deployment target '\(plan.app.deploymentTarget)'")
|
||||
let emptyText = Data("// leave this file empty".utf8)
|
||||
let products = plan.allProducts
|
||||
let targetIDs = products.map {
|
||||
XCSchema.ObjectID("xtool:\($0.product)")
|
||||
}
|
||||
let sourcePhase = XCSchema.BuildPhase.sources(.init(objectID: nil, name: nil))
|
||||
let frameworksPhase = XCSchema.BuildPhase.frameworks(.init(objectID: nil, name: nil))
|
||||
|
||||
let emptyText = Data("""
|
||||
// leave this file empty
|
||||
""".utf8)
|
||||
var groups: [XCSchema.Reference] = []
|
||||
var productFiles: [XCSchema.Reference] = []
|
||||
var targets: [XCSchema.Target] = []
|
||||
|
||||
let targets = try plan.allProducts.map { product in
|
||||
let productDir = projectDir + product.product
|
||||
try productDir.mkpath()
|
||||
|
||||
let emptyFile = productDir + "empty.c"
|
||||
try emptyFile.write(emptyText)
|
||||
|
||||
let infoPath = productDir + "Info.plist"
|
||||
for (index, product) in products.enumerated() {
|
||||
let productDir = projectDir.appendingPathComponent(product.product, isDirectory: true)
|
||||
try FileManager.default.createDirectory(at: productDir, withIntermediateDirectories: true)
|
||||
try emptyText.write(to: productDir.appendingPathComponent("empty.c"))
|
||||
|
||||
var plist = product.infoPlist
|
||||
let families = (plist.removeValue(forKey: "UIDeviceFamily") as? [Int]) ?? [1, 2]
|
||||
plist["CFBundleExecutable"] = product.targetName
|
||||
plist["CFBundleName"] = product.targetName
|
||||
plist["CFBundleDisplayName"] = product.product
|
||||
|
||||
if let iconPath = product.iconPath {
|
||||
plist["CFBundleIconFile"] = URL(fileURLWithPath: iconPath).deletingPathExtension().lastPathComponent
|
||||
}
|
||||
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
try infoPath.write(encodedPlist)
|
||||
try encodedPlist.write(to: productDir.appendingPathComponent("Info.plist"))
|
||||
|
||||
var buildSettings: [String: BuildSetting] = [
|
||||
var buildSettings: [String: XCSchema.BuildSetting] = [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
|
||||
"TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
|
||||
"PRODUCT_NAME": .string(product.targetName),
|
||||
"TARGETED_DEVICE_FAMILY": .string(families.map(String.init).joined(separator: ",")),
|
||||
"IPHONEOS_DEPLOYMENT_TARGET": .string(product.deploymentTarget),
|
||||
"INFOPLIST_FILE": .string("\(product.product)/Info.plist"),
|
||||
"LD_RUNPATH_SEARCH_PATHS": .array(["$(inherited)", "@executable_path/Frameworks"]),
|
||||
]
|
||||
|
||||
if product.type == .appExtension {
|
||||
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
|
||||
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = .string("YES")
|
||||
buildSettings["LD_RUNPATH_SEARCH_PATHS"] = .array([
|
||||
"$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks",
|
||||
])
|
||||
}
|
||||
|
||||
if let entitlementsPath = product.entitlementsPath {
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
|
||||
let path = (entitlementsPath as NSString).isAbsolutePath
|
||||
? entitlementsPath
|
||||
: (fromProjectToRoot as NSString).appendingPathComponent(entitlementsPath)
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string(path)
|
||||
}
|
||||
|
||||
let additionalDependencies: [Dependency] = if product.type == .application {
|
||||
plan.extensions.map {
|
||||
Dependency(
|
||||
type: .target,
|
||||
reference: $0.targetName
|
||||
)
|
||||
}
|
||||
} else {
|
||||
[]
|
||||
}
|
||||
return Target(
|
||||
name: product.targetName,
|
||||
type: product.type == .application ? .application : .appExtension,
|
||||
platform: .iOS,
|
||||
deploymentTarget: deploymentTarget,
|
||||
settings: Settings(buildSettings: buildSettings),
|
||||
sources: [
|
||||
TargetSource(
|
||||
path: try emptyFile.relativePath(from: projectDir).string,
|
||||
buildPhase: .sources
|
||||
let source = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: "empty.c",
|
||||
explicitFileType: nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: product.targetName),
|
||||
kind: .sources,
|
||||
name: nil
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
Dependency(
|
||||
type: .package(products: [product.product]),
|
||||
reference: "RootPackage"
|
||||
),
|
||||
] + additionalDependencies,
|
||||
info: Plist(
|
||||
path: try infoPath.relativePath(from: projectDir).string,
|
||||
attributes: [:]
|
||||
)
|
||||
properties: buildFileProperties(),
|
||||
)],
|
||||
)
|
||||
let info = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: "Info.plist",
|
||||
explicitFileType: nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [],
|
||||
)
|
||||
let resources = try resourceReferences(for: product, at: root)
|
||||
groups.append(.group(.init(
|
||||
objectID: nil,
|
||||
name: product.product,
|
||||
path: try .init(base: .group, path: product.product),
|
||||
includeInIndex: nil,
|
||||
children: [.fileReference(source), .fileReference(info)] + resources,
|
||||
)))
|
||||
|
||||
let productFilename = "\(product.targetName).\(product.type == .application ? "app" : "appex")"
|
||||
let productFile = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: try .init(base: .buildProducts, path: productFilename),
|
||||
explicitFileType: .init(fileTypeID: product.type == .application ? "wrapper.application" : "wrapper.app-extension"),
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: false,
|
||||
buildFiles: index == 0 ? [] : [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: plan.app.targetName),
|
||||
kind: .copy,
|
||||
name: "Embed App Extensions",
|
||||
),
|
||||
properties: buildFileProperties(removeHeadersOnCopy: true),
|
||||
)],
|
||||
)
|
||||
productFiles.append(.fileReference(productFile))
|
||||
|
||||
let packageProduct = XCSchema.SwiftPackageProductReference(
|
||||
objectID: nil,
|
||||
package: nil,
|
||||
productName: product.product,
|
||||
productType: .other,
|
||||
)
|
||||
let packageMember = XCSchema.SwiftPackageProductTargetMember(
|
||||
packageProduct: packageProduct,
|
||||
buildFile: .init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(kind: .frameworks, name: nil),
|
||||
properties: buildFileProperties(),
|
||||
),
|
||||
)
|
||||
var phases = [sourcePhase, frameworksPhase]
|
||||
if !resources.isEmpty {
|
||||
phases.append(.copy(.init(
|
||||
objectID: nil,
|
||||
name: "Copy Root Resources",
|
||||
bundleBasePath: .resourcesDir,
|
||||
relativePath: "",
|
||||
scope: .always,
|
||||
)))
|
||||
}
|
||||
if index == 0 && !plan.extensions.isEmpty {
|
||||
phases.append(.copy(.init(
|
||||
objectID: nil,
|
||||
name: "Embed App Extensions",
|
||||
bundleBasePath: .plugInsDir,
|
||||
relativePath: "",
|
||||
scope: .always,
|
||||
)))
|
||||
}
|
||||
let dependencies: [XCSchema.TargetDependency] = index == 0
|
||||
? plan.extensions.map {
|
||||
.localTarget(XCSchema.LocalTargetReference(targetName: $0.targetName), [])
|
||||
}
|
||||
: []
|
||||
targets.append(.native(XCSchema.CommonTargetProperties(
|
||||
name: product.targetName,
|
||||
objectID: targetIDs[index],
|
||||
configurationListDebugID: nil,
|
||||
dependencies: dependencies,
|
||||
buildPhases: phases,
|
||||
buildRules: [],
|
||||
specializedConfigurations: [],
|
||||
buildSettings: buildSettings,
|
||||
product: .namePath(.init(components: [.child("Products"), .child(productFilename)])),
|
||||
productTypeID: XCSchema.ProductTypeID(
|
||||
abbreviatedRepresentation: product.type == .application
|
||||
? "application"
|
||||
: "app-extension"
|
||||
),
|
||||
testHostTarget: nil,
|
||||
legacyProvisioningStyle: nil,
|
||||
legacyTeamID: nil,
|
||||
lastSwiftUpdateCheck: nil,
|
||||
lastSwiftMigration: nil,
|
||||
packageProductTargetMembers: [packageMember],
|
||||
)))
|
||||
}
|
||||
|
||||
let project = Project(
|
||||
name: plan.app.targetName,
|
||||
targets: targets,
|
||||
packages: [
|
||||
"RootPackage": .local(
|
||||
path: fromProjectToRoot.string,
|
||||
group: nil,
|
||||
excludeFromProject: false
|
||||
),
|
||||
let schema = XCSchema.Project(
|
||||
objectID: nil,
|
||||
rootGroupDebugID: nil,
|
||||
configurationListDebugID: nil,
|
||||
topLevelReferences: groups + [
|
||||
.group(XCSchema.Group(
|
||||
objectID: nil,
|
||||
name: "Products",
|
||||
path: "",
|
||||
includeInIndex: nil,
|
||||
children: productFiles,
|
||||
))
|
||||
],
|
||||
options: SpecOptions(
|
||||
localPackagesGroup: ""
|
||||
)
|
||||
packages: [.init(location: .local(.init(path: fromProjectToRoot)), traits: [])],
|
||||
configurations: ["Debug", "Release"].map {
|
||||
.init(name: .init(name: $0), file: nil, objectID: nil)
|
||||
},
|
||||
buildSettings: ["SDKROOT": .string("iphoneos")],
|
||||
defaultConfigurationName: .init(name: "Debug"),
|
||||
targets: targets,
|
||||
localizationInfo: .init(development: .init(languageID: "en"), supported: []),
|
||||
requiredCapabilities: [],
|
||||
buildIndependentTargetsInParallel: true,
|
||||
lastUpgradeCheck: nil,
|
||||
lastSwiftUpdateCheck: nil,
|
||||
lastSwiftMigration: nil,
|
||||
organizationName: nil,
|
||||
classPrefix: nil,
|
||||
productsGroup: .namePath(.init(components: [.child("Products")])),
|
||||
importedProducts: [],
|
||||
)
|
||||
|
||||
// TODO: Handle plan.resources of type .root
|
||||
// TODO: Handle plan.iconPath
|
||||
let projectURL = projectDir.appending(path: "\(plan.app.product).xcodeproj")
|
||||
let project = XcodeProject(project: schema, url: projectURL)
|
||||
try project.write()
|
||||
|
||||
let generator = ProjectGenerator(project: project)
|
||||
let xcodeproj = projectDir + "\(plan.app.product).xcodeproj"
|
||||
let xcworkspace = xtoolDir + "\(plan.app.product).xcworkspace"
|
||||
do {
|
||||
let current = Path.current
|
||||
Path.current = xcodeproj.parent()
|
||||
defer { Path.current = current }
|
||||
let xcodeProject = try generator.generateXcodeProject(userName: NSUserName())
|
||||
if let packageRef = xcodeProject.pbxproj.fileReferences.first(where: { $0.name == ".." }) {
|
||||
for group in xcodeProject.pbxproj.groups {
|
||||
group.children.removeAll(where: { $0.uuid == packageRef.uuid })
|
||||
}
|
||||
xcodeProject.pbxproj.delete(object: packageRef)
|
||||
}
|
||||
let workspaceURL = xtoolDir.appending(path: "\(plan.app.product).xcworkspace")
|
||||
let workspace = XcodeWorkspace(children: [
|
||||
.file(XcodeWorkspace.Location(base: .container, path: "..")),
|
||||
.file(XcodeWorkspace.Location(base: .group, path: ".xtool-tmp/\(projectURL.lastPathComponent)"))
|
||||
], url: workspaceURL)
|
||||
try workspace.write()
|
||||
return workspaceURL
|
||||
}
|
||||
|
||||
try xcodeProject.write(path: Path(xcodeproj.lastComponent))
|
||||
private func resourceReferences(for product: Plan.Product, at root: URL) throws -> [XCSchema.Reference] {
|
||||
var paths = product.resources.compactMap { resource -> String? in
|
||||
guard case .root(let source) = resource else { return nil }
|
||||
return source
|
||||
}
|
||||
if let iconPath = product.iconPath {
|
||||
paths.append(iconPath)
|
||||
}
|
||||
|
||||
do {
|
||||
let current = Path.current
|
||||
Path.current = xcworkspace.parent()
|
||||
defer { Path.current = current }
|
||||
var visited: Set<String> = []
|
||||
return try paths.compactMap { path in
|
||||
let url = URL(fileURLWithPath: path, relativeTo: root).standardizedFileURL
|
||||
guard visited.insert(url.path).inserted else { return nil }
|
||||
let isAbsolute = (path as NSString).isAbsolutePath
|
||||
let referencePath = isAbsolute ? path : ("../.." as NSString).appendingPathComponent(path)
|
||||
var isDirectory: ObjCBool = false
|
||||
_ = FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory)
|
||||
|
||||
let xcworkspaceDirectory = xcworkspace.parent()
|
||||
let fromWorkspaceToSelf = try Path(".").relativePath(from: xcworkspaceDirectory).withName()
|
||||
let fromWorkspaceToProject = try xcodeproj.relativePath(from: xcworkspaceDirectory).withName()
|
||||
let workspace = XCWorkspace(data: .init(children: [
|
||||
.file(.init(location: .container(fromWorkspaceToSelf.string))),
|
||||
.file(.init(location: .group(fromWorkspaceToProject.string))),
|
||||
]))
|
||||
try workspace.write(path: Path(xcworkspace.lastComponent))
|
||||
return .fileReference(.init(
|
||||
objectID: nil,
|
||||
path: try .init(base: isAbsolute ? .absolute : .project, path: referencePath),
|
||||
explicitFileType: isDirectory.boolValue ? .init(fileTypeID: "folder") : nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: product.targetName),
|
||||
kind: .copy,
|
||||
name: "Copy Root Resources",
|
||||
),
|
||||
properties: buildFileProperties(),
|
||||
)],
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
return xcworkspace.url
|
||||
private func buildFileProperties(removeHeadersOnCopy: Bool = false) -> XCSchema.BuildFileProperties {
|
||||
XCSchema.BuildFileProperties(
|
||||
platformFilters: [],
|
||||
additionalBuildFlags: nil,
|
||||
assetTags: [],
|
||||
attributes: XCSchema.BuildFileAttributes(
|
||||
headerRole: nil,
|
||||
machInterfaceGeneration: nil,
|
||||
isWeak: false,
|
||||
codeSignOnCopy: false,
|
||||
codeGeneration: .default,
|
||||
headerPreservation: removeHeadersOnCopy ? .removeOnCopy : .keep,
|
||||
decompress: false,
|
||||
codeGenerationVisibility: nil,
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
extension Path {
|
||||
fileprivate func withName() -> Path {
|
||||
// eg if curr dir is Foo, this converts "." to "../Foo"
|
||||
// which includes the name in the path, and therefore
|
||||
// in the Xcode navigator
|
||||
self.parent() + self.absolute().lastComponent
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,512 @@
|
||||
import Foundation
|
||||
import Crypto
|
||||
import X509
|
||||
import XUtils
|
||||
|
||||
/// A reader for Apple Encrypted Archives (`.aea`).
|
||||
///
|
||||
/// Only the signed, unencrypted profile (`hkdf_sha256_hmac__none__ecdsa_p256`)
|
||||
/// is currently supported. This is the profile used to distribute Xcode.
|
||||
///
|
||||
/// Opening an archive validates its prologue (the ECDSA signature and the root
|
||||
/// header MAC), and segment data is authenticated as it is decoded. Note that
|
||||
/// the signing certificate itself is not validated, so this only guarantees
|
||||
/// integrity, not authenticity.
|
||||
final class AEAArchive: Sendable {
|
||||
struct Options: Sendable {
|
||||
/// How to determine the key that the archive was signed with.
|
||||
var signingKey: SigningKey = .embeddedCertificate
|
||||
|
||||
/// The maximum number of segments to decode concurrently. Each one
|
||||
/// needs up to twice the archive's segment size in memory.
|
||||
var maxConcurrentSegments = min(ProcessInfo.processInfo.activeProcessorCount, 8)
|
||||
}
|
||||
|
||||
enum SigningKey: Sendable {
|
||||
/// Use the leaf of the archive's embedded certificate chain.
|
||||
case embeddedCertificate
|
||||
|
||||
/// Use the provided key.
|
||||
case publicKey(P256.Signing.PublicKey)
|
||||
}
|
||||
|
||||
struct RootHeader: Hashable, Sendable {
|
||||
/// The size of the decoded (plaintext) stream.
|
||||
var rawSize: UInt64
|
||||
/// The size of the encoded archive.
|
||||
var containerSize: UInt64
|
||||
var segmentSize: UInt32
|
||||
var segmentsPerCluster: UInt32
|
||||
var compression: AEACompressionAlgorithm
|
||||
var checksum: AEAChecksumAlgorithm
|
||||
}
|
||||
|
||||
static let certificateChainKey = "com.apple.ias.signature.certificate-chain"
|
||||
|
||||
let rootHeader: RootHeader
|
||||
|
||||
private let authData: Data
|
||||
private let signingPublicKey: P256.Signing.PublicKey
|
||||
|
||||
private let fd: FileDescriptor
|
||||
private let mainKey: SymmetricKey
|
||||
private let firstClusterOffset: Int64
|
||||
private let firstClusterMAC: Data
|
||||
private let options: Options
|
||||
|
||||
private static let prologueSize = 304
|
||||
private static let signatureSize = 128
|
||||
private static let macSize = 32
|
||||
|
||||
convenience init(path: FilePath, options: Options = .init()) throws {
|
||||
let fd = try FileDescriptor.open(path, .readOnly)
|
||||
do {
|
||||
try self.init(fileDescriptor: fd, options: options)
|
||||
} catch {
|
||||
try? fd.close()
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
/// On success, the archive takes ownership of `fileDescriptor`.
|
||||
private init(fileDescriptor fd: FileDescriptor, options: Options = .init()) throws {
|
||||
self.fd = fd
|
||||
self.options = options
|
||||
|
||||
let fileSize = try fd.seek(offset: 0, from: .end)
|
||||
|
||||
let header = try fd.readExactly(count: 12, at: 0)
|
||||
guard header.prefix(4) == Data("AEA1".utf8) else {
|
||||
throw AEAError("Not an Apple Encrypted Archive (bad magic)")
|
||||
}
|
||||
// low 24 bits: profile, high 8 bits: scrypt strength. We only support
|
||||
// profile 0 (signed, unencrypted), where the scrypt strength is unused.
|
||||
let rawProfile = header.loadLE(UInt32.self, at: 4)
|
||||
guard rawProfile == 0 else {
|
||||
throw AEAError("Unsupported AEA profile: \(rawProfile & 0xFF_FFFF) (scrypt strength \(rawProfile >> 24))")
|
||||
}
|
||||
|
||||
let authDataSize = Int(header.loadLE(UInt32.self, at: 8))
|
||||
let authEnd = 12 + authDataSize
|
||||
guard Int64(authEnd + Self.prologueSize) <= fileSize else {
|
||||
throw AEAError("Archive is truncated")
|
||||
}
|
||||
let prologue = try fd.readExactly(count: authEnd + Self.prologueSize, at: 0)
|
||||
authData = prologue.bytes(at: 12, count: authDataSize)
|
||||
|
||||
var cursor = authEnd
|
||||
func take(_ count: Int) -> Data {
|
||||
defer { cursor += count }
|
||||
return prologue.bytes(at: cursor, count: count)
|
||||
}
|
||||
let signature = take(Self.signatureSize)
|
||||
let keyMaterial = take(32)
|
||||
let salt = take(32)
|
||||
let rootHeaderMAC = take(Self.macSize)
|
||||
let rootHeaderBytes = take(48)
|
||||
firstClusterMAC = take(Self.macSize)
|
||||
firstClusterOffset = Int64(cursor)
|
||||
|
||||
signingPublicKey = try Self.signingKey(authData: authData, source: options.signingKey)
|
||||
|
||||
// The signature covers the SHA-256 digest of the prologue, with the
|
||||
// signature itself zeroed.
|
||||
var signedPrologue = prologue
|
||||
signedPrologue.replaceSubrange(
|
||||
(prologue.startIndex + authEnd)..<(prologue.startIndex + authEnd + Self.signatureSize),
|
||||
with: Data(count: Self.signatureSize)
|
||||
)
|
||||
guard let derSignature = Self.trimDERSignature(signature),
|
||||
let ecdsaSignature = try? P256.Signing.ECDSASignature(derRepresentation: derSignature),
|
||||
signingPublicKey.isValidSignature(ecdsaSignature, for: SHA256.hash(data: signedPrologue))
|
||||
else { throw AEAError("Invalid archive signature") }
|
||||
|
||||
var info = Data("AEA_AMK".utf8)
|
||||
info.appendLE(rawProfile)
|
||||
info.append(signingPublicKey.x963Representation)
|
||||
mainKey = HKDF<SHA256>.deriveKey(
|
||||
inputKeyMaterial: SymmetricKey(data: keyMaterial),
|
||||
salt: salt,
|
||||
info: info,
|
||||
outputByteCount: 32
|
||||
)
|
||||
|
||||
let rootHeaderKey = Self.macKey(from: mainKey, info: Data("AEA_RHEK".utf8))
|
||||
guard Self.mac(key: rootHeaderKey, salt: [firstClusterMAC, authData], data: rootHeaderBytes)
|
||||
== rootHeaderMAC else {
|
||||
throw AEAError("Root header MAC mismatch (corrupt archive or wrong signing key)")
|
||||
}
|
||||
|
||||
rootHeader = RootHeader(
|
||||
rawSize: rootHeaderBytes.loadLE(at: 0),
|
||||
containerSize: rootHeaderBytes.loadLE(at: 8),
|
||||
segmentSize: rootHeaderBytes.loadLE(at: 16),
|
||||
segmentsPerCluster: rootHeaderBytes.loadLE(at: 20),
|
||||
compression: AEACompressionAlgorithm(rawValue: rootHeaderBytes[rootHeaderBytes.startIndex + 24]),
|
||||
checksum: AEAChecksumAlgorithm(rawValue: rootHeaderBytes[rootHeaderBytes.startIndex + 25])
|
||||
)
|
||||
guard rootHeader.containerSize == UInt64(fileSize) else {
|
||||
throw AEAError("Archive size mismatch: expected \(rootHeader.containerSize), got \(fileSize)")
|
||||
}
|
||||
guard rootHeader.segmentSize > 0, rootHeader.segmentSize <= 256 << 20,
|
||||
rootHeader.segmentsPerCluster > 0, rootHeader.segmentsPerCluster <= 256 << 10
|
||||
else { throw AEAError("Invalid segment layout") }
|
||||
guard rootHeader.checksum.size != nil else {
|
||||
throw AEAError("Unsupported checksum algorithm: \(rootHeader.checksum.rawValue)")
|
||||
}
|
||||
guard rootHeader.compression.isSupported else {
|
||||
throw AEAError("Unsupported compression algorithm: \(rootHeader.compression)")
|
||||
}
|
||||
}
|
||||
|
||||
deinit {
|
||||
try? fd.close()
|
||||
}
|
||||
|
||||
// MARK: - Decoding
|
||||
|
||||
/// Decodes the archive, calling `body` with each consecutive chunk of the
|
||||
/// plaintext stream.
|
||||
///
|
||||
/// Segments are decoded concurrently but `body` is invoked serially,
|
||||
/// in order. Supports cooperative cancellation.
|
||||
func decode(
|
||||
progress: ((AEAProgress) -> Void)? = nil,
|
||||
into body: (Data) async throws -> Void
|
||||
) async throws {
|
||||
let maxConcurrent = max(1, options.maxConcurrentSegments)
|
||||
let total = rootHeader.rawSize
|
||||
var completed: UInt64 = 0
|
||||
progress?(AEAProgress(completedBytes: 0, totalBytes: total))
|
||||
|
||||
var segments = SegmentIterator(archive: self)
|
||||
try await withThrowingTaskGroup(of: (Int, Data).self) { group in
|
||||
var running = 0
|
||||
var finished: [Int: Data] = [:]
|
||||
var nextToEmit = 0
|
||||
|
||||
func receive() async throws {
|
||||
guard let (index, data) = try await group.next() else { return }
|
||||
running -= 1
|
||||
finished[index] = data
|
||||
while let data = finished.removeValue(forKey: nextToEmit) {
|
||||
try Task.checkCancellation()
|
||||
try await body(data)
|
||||
nextToEmit += 1
|
||||
completed += UInt64(data.count)
|
||||
progress?(AEAProgress(completedBytes: completed, totalBytes: total))
|
||||
}
|
||||
}
|
||||
|
||||
while let segment = try segments.next() {
|
||||
try Task.checkCancellation()
|
||||
// bound memory usage: segments that are finished but blocked
|
||||
// on an earlier one still count towards the limit.
|
||||
while running + finished.count >= maxConcurrent {
|
||||
try await receive()
|
||||
}
|
||||
group.addTask {
|
||||
(segment.index, try self.decodeSegment(segment))
|
||||
}
|
||||
running += 1
|
||||
}
|
||||
while running > 0 {
|
||||
try await receive()
|
||||
}
|
||||
}
|
||||
|
||||
guard completed == total else {
|
||||
throw AEAError("Decoded \(completed) bytes, expected \(total)")
|
||||
}
|
||||
}
|
||||
|
||||
/// Writes the decoded plaintext stream to `path`.
|
||||
func decode(
|
||||
to path: FilePath,
|
||||
progress: ((AEAProgress) -> Void)? = nil
|
||||
) async throws {
|
||||
let out = try FileDescriptor.open(
|
||||
path, .writeOnly,
|
||||
options: [.create, .truncate],
|
||||
permissions: [.ownerReadWrite, .groupRead, .otherRead]
|
||||
)
|
||||
defer { try? out.close() }
|
||||
try await decode(progress: progress) { data in
|
||||
try data.withUnsafeBytes { _ = try out.writeAll($0) }
|
||||
}
|
||||
}
|
||||
|
||||
/// Extracts the Apple Archive contained in this AEA into `directory`.
|
||||
func extract(
|
||||
to directory: FilePath,
|
||||
filter: ((String) -> Bool)? = nil,
|
||||
progress: ((AEAProgress) -> Void)? = nil
|
||||
) async throws {
|
||||
let extractor = try AppleArchiveExtractor(destination: directory, filter: filter)
|
||||
var decoder = AppleArchiveDecoder()
|
||||
try await decode(progress: progress) { data in
|
||||
try decoder.decode(data) { try extractor.handle($0) }
|
||||
}
|
||||
try decoder.finish()
|
||||
try extractor.finish()
|
||||
}
|
||||
|
||||
// MARK: - Segments
|
||||
|
||||
fileprivate struct Segment: Sendable {
|
||||
var index: Int
|
||||
var offset: Int64
|
||||
var compressedSize: Int
|
||||
var rawSize: Int
|
||||
var checksum: Data
|
||||
var mac: Data
|
||||
var macKey: SymmetricKey
|
||||
}
|
||||
|
||||
private struct SegmentIterator {
|
||||
let archive: AEAArchive
|
||||
var cluster: UInt32 = 0
|
||||
var offset: Int64
|
||||
var expectedClusterMAC: Data
|
||||
var pending: [Segment] = []
|
||||
var emitted = 0
|
||||
var remaining: UInt64
|
||||
|
||||
init(archive: AEAArchive) {
|
||||
self.archive = archive
|
||||
offset = archive.firstClusterOffset
|
||||
expectedClusterMAC = archive.firstClusterMAC
|
||||
remaining = archive.rootHeader.rawSize
|
||||
}
|
||||
|
||||
mutating func next() throws -> Segment? {
|
||||
while pending.isEmpty {
|
||||
guard remaining > 0 else {
|
||||
try archive.verifyPadding(at: offset, expectedMAC: expectedClusterMAC)
|
||||
return nil
|
||||
}
|
||||
try readCluster()
|
||||
}
|
||||
return pending.removeFirst()
|
||||
}
|
||||
|
||||
private mutating func readCluster() throws {
|
||||
let root = archive.rootHeader
|
||||
let count = Int(root.segmentsPerCluster)
|
||||
let entrySize = 8 + root.checksum.size!
|
||||
let entriesSize = count * entrySize
|
||||
let headerSize = entriesSize + AEAArchive.macSize * (count + 1)
|
||||
|
||||
let header = try archive.fd.readExactly(count: headerSize, at: offset)
|
||||
offset += Int64(headerSize)
|
||||
let entries = header.bytes(at: 0, count: entriesSize)
|
||||
let macs = header.bytes(at: entriesSize, count: headerSize - entriesSize)
|
||||
|
||||
var clusterInfo = Data("AEA_CK".utf8)
|
||||
clusterInfo.appendLE(cluster)
|
||||
let clusterKey = HKDF<SHA256>.deriveKey(
|
||||
inputKeyMaterial: archive.mainKey,
|
||||
salt: Data(),
|
||||
info: clusterInfo,
|
||||
outputByteCount: 32
|
||||
)
|
||||
let headerKey = AEAArchive.macKey(from: clusterKey, info: Data("AEA_CHEK".utf8))
|
||||
guard AEAArchive.mac(key: headerKey, salt: [macs], data: entries) == expectedClusterMAC else {
|
||||
throw AEAError("Cluster \(cluster) header MAC mismatch")
|
||||
}
|
||||
expectedClusterMAC = macs.bytes(at: 0, count: AEAArchive.macSize)
|
||||
|
||||
let segmentPRK = HKDF<SHA256>.extract(inputKeyMaterial: clusterKey, salt: Data())
|
||||
for i in 0..<count {
|
||||
let entry = entries.bytes(at: i * entrySize, count: entrySize)
|
||||
let rawSize = Int(entry.loadLE(UInt32.self, at: 0))
|
||||
let compressedSize = Int(entry.loadLE(UInt32.self, at: 4))
|
||||
let expectedSize = Int(min(UInt64(root.segmentSize), remaining))
|
||||
guard rawSize == expectedSize else {
|
||||
throw AEAError("Segment \(i) of cluster \(cluster) has size \(rawSize), expected \(expectedSize)")
|
||||
}
|
||||
if expectedSize == 0 {
|
||||
guard compressedSize == 0 else {
|
||||
throw AEAError("Unused segment \(i) of cluster \(cluster) is not empty")
|
||||
}
|
||||
continue
|
||||
}
|
||||
guard compressedSize > 0, compressedSize <= rawSize,
|
||||
offset + Int64(compressedSize) <= Int64(root.containerSize)
|
||||
else {
|
||||
throw AEAError("Segment \(i) of cluster \(cluster) has invalid size \(compressedSize)")
|
||||
}
|
||||
|
||||
var segmentInfo = Data("AEA_SK".utf8)
|
||||
segmentInfo.appendLE(UInt32(i))
|
||||
let segmentKey = HKDF<SHA256>.expand(
|
||||
pseudoRandomKey: segmentPRK,
|
||||
info: segmentInfo,
|
||||
outputByteCount: 32
|
||||
)
|
||||
|
||||
pending.append(Segment(
|
||||
index: emitted,
|
||||
offset: offset,
|
||||
compressedSize: compressedSize,
|
||||
rawSize: rawSize,
|
||||
checksum: entry.bytes(at: 8, count: entrySize - 8),
|
||||
mac: macs.bytes(at: AEAArchive.macSize * (i + 1), count: AEAArchive.macSize),
|
||||
macKey: segmentKey
|
||||
))
|
||||
emitted += 1
|
||||
offset += Int64(compressedSize)
|
||||
remaining -= UInt64(rawSize)
|
||||
}
|
||||
cluster += 1
|
||||
}
|
||||
}
|
||||
|
||||
private func decodeSegment(_ segment: Segment) throws -> Data {
|
||||
let stored = try fd.readExactly(count: segment.compressedSize, at: segment.offset)
|
||||
guard Self.mac(key: segment.macKey, salt: [], data: stored) == segment.mac else {
|
||||
throw AEAError("Segment \(segment.index) MAC mismatch")
|
||||
}
|
||||
let compression: AEACompressionAlgorithm = segment.compressedSize == segment.rawSize
|
||||
? .none
|
||||
: rootHeader.compression
|
||||
let raw = try compression.decompress(stored, size: segment.rawSize)
|
||||
|
||||
switch rootHeader.checksum {
|
||||
case .sha256:
|
||||
guard Data(SHA256.hash(data: raw)) == segment.checksum else {
|
||||
throw AEAError("Segment \(segment.index) checksum mismatch")
|
||||
}
|
||||
case .murmur64:
|
||||
guard murmur64(raw) == segment.checksum.loadLE(UInt64.self, at: 0) else {
|
||||
throw AEAError("Segment \(segment.index) checksum mismatch")
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
return raw
|
||||
}
|
||||
|
||||
private func verifyPadding(at offset: Int64, expectedMAC: Data) throws {
|
||||
let size = Int64(rootHeader.containerSize) - offset
|
||||
guard size > 0 else { return }
|
||||
let key = Self.macKey(from: mainKey, info: Data("AEA_PAK".utf8))
|
||||
var hmac = HMAC<SHA256>(key: key)
|
||||
var position = offset
|
||||
while position < offset + size {
|
||||
try Task.checkCancellation()
|
||||
let chunk = try fd.readExactly(count: Int(min(1 << 20, offset + size - position)), at: position)
|
||||
hmac.update(data: chunk)
|
||||
position += Int64(chunk.count)
|
||||
}
|
||||
guard Data(hmac.finalize()) == expectedMAC else {
|
||||
throw AEAError("Padding MAC mismatch")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Crypto helpers
|
||||
|
||||
/// Derives the MAC key of an HKDF data key.
|
||||
private static func macKey(from key: SymmetricKey, info: Data) -> SymmetricKey {
|
||||
HKDF<SHA256>.deriveKey(inputKeyMaterial: key, salt: Data(), info: info, outputByteCount: 32)
|
||||
}
|
||||
|
||||
/// HMAC-SHA256 over `salt || data || LE64(salt.count)`.
|
||||
private static func mac(key: SymmetricKey, salt: [Data], data: Data) -> Data {
|
||||
var hmac = HMAC<SHA256>(key: key)
|
||||
var saltSize: UInt64 = 0
|
||||
for part in salt {
|
||||
hmac.update(data: part)
|
||||
saltSize += UInt64(part.count)
|
||||
}
|
||||
hmac.update(data: data)
|
||||
var suffix = Data()
|
||||
suffix.appendLE(saltSize)
|
||||
hmac.update(data: suffix)
|
||||
return Data(hmac.finalize())
|
||||
}
|
||||
|
||||
/// Strips the zero padding from a DER-encoded ECDSA signature.
|
||||
private static func trimDERSignature(_ signature: Data) -> Data? {
|
||||
guard signature.count >= 2, signature[signature.startIndex] == 0x30 else { return nil }
|
||||
let length = Int(signature[signature.startIndex + 1])
|
||||
// P-256 signatures are always short enough for the short-form length.
|
||||
guard length < 0x80, 2 + length <= signature.count else { return nil }
|
||||
return signature.prefix(2 + length)
|
||||
}
|
||||
|
||||
// MARK: - Signing key
|
||||
|
||||
private static func signingKey(authData: Data, source: SigningKey) throws -> P256.Signing.PublicKey {
|
||||
switch source {
|
||||
case .publicKey(let key):
|
||||
return key
|
||||
case .embeddedCertificate:
|
||||
return try embeddedSigningKey(authData: authData)
|
||||
}
|
||||
}
|
||||
|
||||
/// The public key of the leaf certificate in the auth data's certificate chain.
|
||||
static func embeddedSigningKey(authData: Data) throws -> P256.Signing.PublicKey {
|
||||
guard let entries = parseAuthData(authData),
|
||||
let pem = entries.first(where: { $0.key == certificateChainKey })?.value
|
||||
else { throw AEAError("Archive does not contain a signing certificate chain") }
|
||||
// the leaf comes first
|
||||
guard let leaf = String(decoding: pem, as: UTF8.self).components(separatedBy: endMarker).first,
|
||||
let certificate = try? Certificate(pemEncoded: leaf + endMarker),
|
||||
let key = P256.Signing.PublicKey(certificate.publicKey)
|
||||
else { throw AEAError("Archive does not contain a valid P-256 signing certificate") }
|
||||
return key
|
||||
}
|
||||
|
||||
private static let endMarker = "-----END CERTIFICATE-----"
|
||||
|
||||
private static func parseAuthData(_ data: Data) -> [(key: String, value: Data)]? {
|
||||
var entries: [(key: String, value: Data)] = []
|
||||
var offset = 0
|
||||
while offset < data.count {
|
||||
guard data.count - offset >= 4 else { return nil }
|
||||
let size = Int(data.loadLE(UInt32.self, at: offset))
|
||||
guard size > 4, size <= data.count - offset else { return nil }
|
||||
let payload = data.bytes(at: offset + 4, count: size - 4)
|
||||
guard let nul = payload.firstIndex(of: 0) else { return nil }
|
||||
entries.append((
|
||||
key: String(decoding: payload[..<nul], as: UTF8.self),
|
||||
value: Data(payload[(nul + 1)...])
|
||||
))
|
||||
offset += size
|
||||
}
|
||||
return entries
|
||||
}
|
||||
}
|
||||
|
||||
struct AEAProgress: Sendable, Hashable {
|
||||
/// The number of plaintext bytes decoded so far.
|
||||
var completedBytes: UInt64
|
||||
/// The total number of plaintext bytes in the archive.
|
||||
var totalBytes: UInt64
|
||||
|
||||
var fractionCompleted: Double {
|
||||
totalBytes == 0 ? 1 : Double(completedBytes) / Double(totalBytes)
|
||||
}
|
||||
}
|
||||
|
||||
extension FileDescriptor {
|
||||
fileprivate func readExactly(count: Int, at offset: Int64) throws -> Data {
|
||||
var data = Data(count: count)
|
||||
let read = try data.withUnsafeMutableBytes { buf in
|
||||
var total = 0
|
||||
while total < count {
|
||||
let n = try self.read(
|
||||
fromAbsoluteOffset: offset + Int64(total),
|
||||
into: UnsafeMutableRawBufferPointer(rebasing: buf[total...])
|
||||
)
|
||||
if n == 0 { break }
|
||||
total += n
|
||||
}
|
||||
return total
|
||||
}
|
||||
guard read == count else { throw AEAError("Archive is truncated") }
|
||||
return data
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,167 @@
|
||||
import Foundation
|
||||
|
||||
#if canImport(Compression)
|
||||
import Compression
|
||||
#elseif canImport(CLZMA)
|
||||
import CLZMA
|
||||
#endif
|
||||
|
||||
/// The algorithm used to compress the segments of an encrypted archive.
|
||||
struct AEACompressionAlgorithm: RawRepresentable, Hashable, Sendable, CustomStringConvertible {
|
||||
var rawValue: UInt8
|
||||
|
||||
static let none = Self(rawValue: UInt8(ascii: "-"))
|
||||
static let lz4 = Self(rawValue: UInt8(ascii: "4"))
|
||||
static let lzbitmap = Self(rawValue: UInt8(ascii: "b"))
|
||||
static let lzfse = Self(rawValue: UInt8(ascii: "e"))
|
||||
static let lzvn = Self(rawValue: UInt8(ascii: "f"))
|
||||
static let lzma = Self(rawValue: UInt8(ascii: "x"))
|
||||
static let zlib = Self(rawValue: UInt8(ascii: "z"))
|
||||
|
||||
var description: String {
|
||||
switch self {
|
||||
case .none: "none"
|
||||
case .lz4: "lz4"
|
||||
case .lzbitmap: "lzbitmap"
|
||||
case .lzfse: "lzfse"
|
||||
case .lzvn: "lzvn"
|
||||
case .lzma: "lzma"
|
||||
case .zlib: "zlib"
|
||||
default: "unknown (0x\(String(rawValue, radix: 16)))"
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether segments compressed with this algorithm can be decoded on the current platform.
|
||||
var isSupported: Bool {
|
||||
switch self {
|
||||
case .none, .lzma:
|
||||
true
|
||||
#if canImport(Compression)
|
||||
case .lz4, .lzbitmap, .lzfse, .zlib:
|
||||
true
|
||||
#endif
|
||||
default:
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
/// Decompresses `input` into exactly `size` bytes.
|
||||
func decompress(_ input: Data, size: Int) throws -> Data {
|
||||
if self == .none {
|
||||
guard input.count == size else {
|
||||
throw AEAError("Stored segment has size \(input.count), expected \(size)")
|
||||
}
|
||||
return input
|
||||
}
|
||||
#if canImport(Compression)
|
||||
let algorithm: compression_algorithm
|
||||
switch self {
|
||||
case .lzma: algorithm = COMPRESSION_LZMA
|
||||
// segments are raw LZ4 blocks without the "bv41" framing
|
||||
case .lz4: algorithm = COMPRESSION_LZ4_RAW
|
||||
case .lzbitmap: algorithm = COMPRESSION_LZBITMAP
|
||||
case .lzfse: algorithm = COMPRESSION_LZFSE
|
||||
case .zlib: algorithm = COMPRESSION_ZLIB
|
||||
default: throw AEAError("Unsupported compression algorithm: \(self)")
|
||||
}
|
||||
let input = self == .zlib ? try Self.stripZlibWrapper(input) : input
|
||||
// The buffer API silently truncates overlong output, so leave
|
||||
// room for one extra byte to be able to detect it.
|
||||
var output = Data(count: size + 1)
|
||||
let written = output.withUnsafeMutableBytes { dst in
|
||||
input.withUnsafeBytes { src in
|
||||
compression_decode_buffer(
|
||||
dst.bindMemory(to: UInt8.self).baseAddress!, dst.count,
|
||||
src.bindMemory(to: UInt8.self).baseAddress!, src.count,
|
||||
nil, algorithm
|
||||
)
|
||||
}
|
||||
}
|
||||
guard written == size else {
|
||||
throw AEAError("Segment decompressed to \(written) bytes, expected \(size)")
|
||||
}
|
||||
output.removeLast()
|
||||
return output
|
||||
#elseif canImport(CLZMA)
|
||||
guard self == .lzma else {
|
||||
throw AEAError("Unsupported compression algorithm on this platform: \(self)")
|
||||
}
|
||||
var output = Data(count: size)
|
||||
var memlimit = UInt64.max
|
||||
var inPos = 0
|
||||
var outPos = 0
|
||||
let result = output.withUnsafeMutableBytes { dst in
|
||||
input.withUnsafeBytes { src in
|
||||
lzma_stream_buffer_decode(
|
||||
&memlimit, 0, nil,
|
||||
src.bindMemory(to: UInt8.self).baseAddress!, &inPos, src.count,
|
||||
dst.bindMemory(to: UInt8.self).baseAddress!, &outPos, dst.count
|
||||
)
|
||||
}
|
||||
}
|
||||
guard result == LZMA_OK, inPos == input.count, outPos == size else {
|
||||
throw AEAError("Failed to decompress LZMA segment (status \(result.rawValue))")
|
||||
}
|
||||
return output
|
||||
#else
|
||||
throw AEAError("Unsupported compression algorithm on this platform: \(self)")
|
||||
#endif
|
||||
}
|
||||
|
||||
#if canImport(Compression)
|
||||
/// COMPRESSION_ZLIB operates on raw DEFLATE streams, but AEA stores
|
||||
/// zlib-wrapped (RFC 1950) data.
|
||||
private static func stripZlibWrapper(_ input: Data) throws -> Data {
|
||||
guard input.count >= 6,
|
||||
input[input.startIndex] & 0x0F == 8,
|
||||
(UInt16(input[input.startIndex]) << 8 | UInt16(input[input.startIndex + 1])) % 31 == 0,
|
||||
input[input.startIndex + 1] & 0x20 == 0
|
||||
else { throw AEAError("Invalid zlib segment header") }
|
||||
return input.dropFirst(2).dropLast(4)
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/// The checksum stored alongside each segment of an encrypted archive.
|
||||
struct AEAChecksumAlgorithm: RawRepresentable, Hashable, Sendable {
|
||||
var rawValue: UInt8
|
||||
|
||||
static let none = Self(rawValue: 0)
|
||||
static let murmur64 = Self(rawValue: 1)
|
||||
static let sha256 = Self(rawValue: 2)
|
||||
|
||||
var size: Int? {
|
||||
switch self {
|
||||
case .none: 0
|
||||
case .murmur64: 8
|
||||
case .sha256: 32
|
||||
default: nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// MurmurHash64A with AEA's seed.
|
||||
func murmur64(_ data: Data) -> UInt64 {
|
||||
let m: UInt64 = 0xc6a4_a793_5bd1_e995
|
||||
var h: UInt64 = 0xE223_6FDC_26A5_F6D2 ^ (UInt64(data.count) &* m)
|
||||
let blocks = data.count / 8
|
||||
for i in 0..<blocks {
|
||||
var k = data.loadLE(UInt64.self, at: i * 8)
|
||||
k = k &* m
|
||||
k ^= k >> 47
|
||||
k = k &* m
|
||||
h ^= k
|
||||
h = h &* m
|
||||
}
|
||||
let tail = data.count % 8
|
||||
if tail != 0 {
|
||||
for i in 0..<tail {
|
||||
h ^= UInt64(data[data.startIndex + blocks * 8 + i]) << (8 * i)
|
||||
}
|
||||
h = h &* m
|
||||
}
|
||||
h ^= h >> 47
|
||||
h = h &* m
|
||||
h ^= h >> 47
|
||||
return h
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
/// An error encountered while reading an Apple Encrypted Archive.
|
||||
public struct AEAError: Error, CustomStringConvertible, Sendable {
|
||||
public var description: String
|
||||
|
||||
init(_ description: String) {
|
||||
self.description = description
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
import Dependencies
|
||||
import Foundation
|
||||
import XUtils
|
||||
|
||||
/// Extracts Apple Encrypted Archives (`.aea`), such as the ones Xcode is distributed as.
|
||||
///
|
||||
/// The archive's contents are integrity-checked as they are extracted. Note that
|
||||
/// its signing certificate is not validated.
|
||||
public struct AEAExtractor: DependencyKey, Sendable {
|
||||
public struct Options: Sendable {
|
||||
/// Called with the path of each entry, relative to the root of the archive.
|
||||
/// Return `false` to skip the entry.
|
||||
public var filter: (@Sendable (_ path: String) -> Bool)?
|
||||
|
||||
public init(filter: (@Sendable (_ path: String) -> Bool)? = nil) {
|
||||
self.filter = filter
|
||||
}
|
||||
}
|
||||
|
||||
public var extractArchive: @Sendable (
|
||||
_ archive: FilePath,
|
||||
_ destination: FilePath,
|
||||
_ options: Options,
|
||||
_ progress: @escaping @Sendable (_ fractionCompleted: Double) -> Void
|
||||
) async throws -> Void
|
||||
|
||||
public init(
|
||||
extractArchive: @escaping @Sendable (
|
||||
FilePath, FilePath, Options, @escaping @Sendable (Double) -> Void
|
||||
) async throws -> Void
|
||||
) {
|
||||
self.extractArchive = extractArchive
|
||||
}
|
||||
|
||||
/// Extracts the archive at `archive` into the directory `destination`, creating it if needed.
|
||||
///
|
||||
/// Supports cooperative cancellation. `progress` is called with the fraction
|
||||
/// of the archive that has been extracted so far.
|
||||
public func extract(
|
||||
_ archive: FilePath,
|
||||
to destination: FilePath,
|
||||
options: Options = .init(),
|
||||
progress: @escaping @Sendable (_ fractionCompleted: Double) -> Void = { _ in }
|
||||
) async throws {
|
||||
try await extractArchive(archive, destination, options, progress)
|
||||
}
|
||||
|
||||
public static var liveValue: Self {
|
||||
Self { archive, destination, options, progress in
|
||||
let archive = try AEAArchive(path: archive)
|
||||
try await archive.extract(
|
||||
to: destination,
|
||||
filter: options.filter,
|
||||
progress: { progress($0.fractionCompleted) }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
public static var testValue: Self {
|
||||
Self(extractArchive: unimplemented("AEAExtractor.extractArchive"))
|
||||
}
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
public var aeaExtractor: AEAExtractor {
|
||||
get { self[AEAExtractor.self] }
|
||||
set { self[AEAExtractor.self] = newValue }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,223 @@
|
||||
import Foundation
|
||||
|
||||
/// The header of an entry in an Apple Archive (`.aar`) stream.
|
||||
struct AppleArchiveHeader: Sendable {
|
||||
/// A field key such as `PAT` or `DAT`.
|
||||
struct Key: RawRepresentable, Hashable, Sendable, CustomStringConvertible {
|
||||
var rawValue: String
|
||||
|
||||
var description: String { rawValue }
|
||||
|
||||
static let type = Self(rawValue: "TYP")
|
||||
static let path = Self(rawValue: "PAT")
|
||||
static let linkPath = Self(rawValue: "LNK")
|
||||
static let mode = Self(rawValue: "MOD")
|
||||
static let modificationTime = Self(rawValue: "MTM")
|
||||
static let data = Self(rawValue: "DAT")
|
||||
static let hardLinkCluster = Self(rawValue: "HLC")
|
||||
}
|
||||
|
||||
enum Value: Sendable, Hashable {
|
||||
case flag
|
||||
case uint(UInt64)
|
||||
case string(Data)
|
||||
case hash(Data)
|
||||
case timespec(seconds: Int64, nanoseconds: UInt32)
|
||||
/// A blob whose contents follow the header.
|
||||
case blob(size: UInt64)
|
||||
}
|
||||
|
||||
struct EntryType: RawRepresentable, Hashable, Sendable {
|
||||
var rawValue: UInt8
|
||||
|
||||
static let regularFile = Self(rawValue: UInt8(ascii: "F"))
|
||||
static let directory = Self(rawValue: UInt8(ascii: "D"))
|
||||
static let symbolicLink = Self(rawValue: UInt8(ascii: "L"))
|
||||
static let metadata = Self(rawValue: UInt8(ascii: "M"))
|
||||
}
|
||||
|
||||
/// The header's fields, in order.
|
||||
var fields: [(key: Key, value: Value)]
|
||||
|
||||
subscript(key: Key) -> Value? {
|
||||
fields.first { $0.key == key }?.value
|
||||
}
|
||||
|
||||
var entryType: EntryType? {
|
||||
guard case .uint(let value)? = self[.type], let byte = UInt8(exactly: value) else { return nil }
|
||||
return EntryType(rawValue: byte)
|
||||
}
|
||||
|
||||
/// The entry's path, relative to the root of the archive.
|
||||
var path: String? { string(.path) }
|
||||
|
||||
var linkPath: String? { string(.linkPath) }
|
||||
|
||||
var mode: UInt16? { uint(.mode).flatMap { UInt16(exactly: $0 & 0o7777) } }
|
||||
|
||||
var hardLinkCluster: UInt64? { uint(.hardLinkCluster) }
|
||||
|
||||
var modificationDate: Date? {
|
||||
guard case .timespec(let seconds, let nanoseconds)? = self[.modificationTime] else { return nil }
|
||||
return Date(timeIntervalSince1970: Double(seconds) + Double(nanoseconds) / 1e9)
|
||||
}
|
||||
|
||||
func uint(_ key: Key) -> UInt64? {
|
||||
guard case .uint(let value)? = self[key] else { return nil }
|
||||
return value
|
||||
}
|
||||
|
||||
func string(_ key: Key) -> String? {
|
||||
guard case .string(let value)? = self[key] else { return nil }
|
||||
return String(decoding: value, as: UTF8.self)
|
||||
}
|
||||
|
||||
var blobs: [(key: Key, size: UInt64)] {
|
||||
fields.compactMap {
|
||||
guard case .blob(let size) = $0.value else { return nil }
|
||||
return ($0.key, size)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// An incremental (push) decoder for Apple Archive (`.aar`) streams.
|
||||
///
|
||||
/// Feed it consecutive chunks of the stream with ``decode(_:handler:)``.
|
||||
struct AppleArchiveDecoder {
|
||||
enum Event {
|
||||
/// The start of a new entry.
|
||||
case header(AppleArchiveHeader)
|
||||
/// A chunk of the blob `key` of the current entry. Blobs are delivered
|
||||
/// in the order they appear in the header.
|
||||
case blob(key: AppleArchiveHeader.Key, data: Data)
|
||||
/// The end of the current entry.
|
||||
case endOfEntry
|
||||
}
|
||||
|
||||
private enum State {
|
||||
case header
|
||||
case blobs([(key: AppleArchiveHeader.Key, size: UInt64)], index: Int, remaining: UInt64)
|
||||
}
|
||||
|
||||
private static let prefixSize = 6
|
||||
|
||||
private var state = State.header
|
||||
private var buffer = Data()
|
||||
|
||||
init() {}
|
||||
|
||||
mutating func decode(_ chunk: Data, handler: (Event) throws -> Void) throws {
|
||||
var input = chunk[...]
|
||||
while !input.isEmpty {
|
||||
switch state {
|
||||
case .header:
|
||||
if buffer.count < Self.prefixSize {
|
||||
let needed = Self.prefixSize - buffer.count
|
||||
buffer.append(input.prefix(needed))
|
||||
input = input.dropFirst(needed)
|
||||
guard buffer.count == Self.prefixSize else { continue }
|
||||
guard buffer.prefix(4) == Data("AA01".utf8) || buffer.prefix(4) == Data("YAA1".utf8) else {
|
||||
throw AEAError("Invalid Apple Archive header magic")
|
||||
}
|
||||
}
|
||||
let size = Int(buffer.loadLE(UInt16.self, at: 4))
|
||||
guard size >= Self.prefixSize else {
|
||||
throw AEAError("Invalid Apple Archive header size: \(size)")
|
||||
}
|
||||
let needed = size - buffer.count
|
||||
buffer.append(input.prefix(needed))
|
||||
input = input.dropFirst(needed)
|
||||
guard buffer.count == size else { continue }
|
||||
|
||||
let header = try Self.parseHeader(buffer.dropFirst(Self.prefixSize))
|
||||
buffer.removeAll(keepingCapacity: true)
|
||||
try handler(.header(header))
|
||||
state = .blobs(header.blobs, index: 0, remaining: header.blobs.first?.size ?? 0)
|
||||
try advance(handler: handler)
|
||||
case .blobs(let blobs, let index, let remaining):
|
||||
let count = Int(min(remaining, UInt64(input.count)))
|
||||
try handler(.blob(key: blobs[index].key, data: input.prefix(count)))
|
||||
input = input.dropFirst(count)
|
||||
state = .blobs(blobs, index: index, remaining: remaining - UInt64(count))
|
||||
try advance(handler: handler)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Validates that the stream did not end in the middle of an entry.
|
||||
func finish() throws {
|
||||
guard case .header = state, buffer.isEmpty else {
|
||||
throw AEAError("Apple Archive stream is truncated")
|
||||
}
|
||||
}
|
||||
|
||||
/// Skips past completed blobs, ending the entry if there are none left.
|
||||
private mutating func advance(handler: (Event) throws -> Void) throws {
|
||||
guard case .blobs(let blobs, var index, var remaining) = state else { return }
|
||||
while remaining == 0 {
|
||||
index += 1
|
||||
guard index < blobs.count else {
|
||||
state = .header
|
||||
try handler(.endOfEntry)
|
||||
return
|
||||
}
|
||||
remaining = blobs[index].size
|
||||
}
|
||||
state = .blobs(blobs, index: index, remaining: remaining)
|
||||
}
|
||||
|
||||
private static let uintSizes: [UInt8: Int] = [
|
||||
UInt8(ascii: "1"): 1, UInt8(ascii: "2"): 2, UInt8(ascii: "4"): 4, UInt8(ascii: "8"): 8,
|
||||
]
|
||||
private static let blobSizeSizes: [UInt8: Int] = [
|
||||
UInt8(ascii: "A"): 2, UInt8(ascii: "B"): 4, UInt8(ascii: "C"): 8,
|
||||
]
|
||||
private static let hashSizes: [UInt8: Int] = [
|
||||
UInt8(ascii: "F"): 4, UInt8(ascii: "G"): 20, UInt8(ascii: "H"): 32, UInt8(ascii: "I"): 48, UInt8(ascii: "J"): 64,
|
||||
]
|
||||
|
||||
private static func parseHeader(_ data: Data) throws -> AppleArchiveHeader {
|
||||
let data = Data(data)
|
||||
var fields: [(key: AppleArchiveHeader.Key, value: AppleArchiveHeader.Value)] = []
|
||||
var offset = 0
|
||||
|
||||
func take(_ count: Int) throws -> Data {
|
||||
guard data.count - offset >= count else {
|
||||
throw AEAError("Truncated Apple Archive header field")
|
||||
}
|
||||
defer { offset += count }
|
||||
return data.bytes(at: offset, count: count)
|
||||
}
|
||||
|
||||
func uint(size: Int) throws -> UInt64 {
|
||||
try take(size).reversed().reduce(0) { $0 << 8 | UInt64($1) }
|
||||
}
|
||||
|
||||
while offset < data.count {
|
||||
let tag = try take(4)
|
||||
let key = AppleArchiveHeader.Key(rawValue: String(decoding: tag.prefix(3), as: UTF8.self))
|
||||
let type = tag[3]
|
||||
let value: AppleArchiveHeader.Value
|
||||
if type == UInt8(ascii: "*") {
|
||||
value = .flag
|
||||
} else if let size = uintSizes[type] {
|
||||
value = .uint(try uint(size: size))
|
||||
} else if let size = blobSizeSizes[type] {
|
||||
value = .blob(size: try uint(size: size))
|
||||
} else if let size = hashSizes[type] {
|
||||
value = .hash(try take(size))
|
||||
} else if type == UInt8(ascii: "P") {
|
||||
value = .string(try take(Int(try uint(size: 2))))
|
||||
} else if type == UInt8(ascii: "S") {
|
||||
value = .timespec(seconds: Int64(bitPattern: try uint(size: 8)), nanoseconds: 0)
|
||||
} else if type == UInt8(ascii: "T") {
|
||||
let seconds = Int64(bitPattern: try uint(size: 8))
|
||||
value = .timespec(seconds: seconds, nanoseconds: UInt32(try uint(size: 4)))
|
||||
} else {
|
||||
throw AEAError("Unknown Apple Archive field type: \(String(decoding: tag, as: UTF8.self))")
|
||||
}
|
||||
fields.append((key, value))
|
||||
}
|
||||
return AppleArchiveHeader(fields: fields)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,266 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
|
||||
/// Extracts Apple Archive entries into a directory.
|
||||
///
|
||||
/// Supports regular files, directories, symbolic links and hard links,
|
||||
/// along with their permissions and modification times. Ownership, flags,
|
||||
/// extended attributes and ACLs are not restored.
|
||||
///
|
||||
/// Entries may not escape the destination, either via `..` components
|
||||
/// or via symbolic links created by earlier entries.
|
||||
final class AppleArchiveExtractor {
|
||||
private struct PendingDirectory {
|
||||
var path: String
|
||||
var mode: UInt16
|
||||
var modificationDate: Date?
|
||||
}
|
||||
|
||||
private struct OpenFile {
|
||||
var path: String
|
||||
var fd: FileDescriptor
|
||||
var header: AppleArchiveHeader
|
||||
}
|
||||
|
||||
private enum Current {
|
||||
case none
|
||||
case skipped
|
||||
case file(OpenFile)
|
||||
}
|
||||
|
||||
private let fileManager = FileManager.default
|
||||
private let destination: String
|
||||
private let filter: ((String) -> Bool)?
|
||||
private var current = Current.none
|
||||
private var knownDirectories: Set<String> = [""]
|
||||
private var symlinks: Set<String> = []
|
||||
private var hardLinkClusters: [UInt64: String] = [:]
|
||||
private var directories: [PendingDirectory] = []
|
||||
|
||||
/// - Parameter filter: Called with each entry's path. Return `false` to skip the entry.
|
||||
init(destination: FilePath, filter: ((String) -> Bool)? = nil) throws {
|
||||
self.destination = destination.string
|
||||
self.filter = filter
|
||||
try fileManager.createDirectory(atPath: self.destination, withIntermediateDirectories: true)
|
||||
}
|
||||
|
||||
deinit {
|
||||
if case .file(let file) = current {
|
||||
try? file.fd.close()
|
||||
}
|
||||
}
|
||||
|
||||
/// Extracts the (unencrypted) Apple Archive at `archive` into `destination`.
|
||||
static func extract(archive: FilePath, to destination: FilePath) throws {
|
||||
let extractor = try AppleArchiveExtractor(destination: destination)
|
||||
let input = try FileDescriptor.open(archive, .readOnly)
|
||||
defer { try? input.close() }
|
||||
var decoder = AppleArchiveDecoder()
|
||||
var buffer = Data(count: 1 << 20)
|
||||
while true {
|
||||
let count = try buffer.withUnsafeMutableBytes { try input.read(into: $0) }
|
||||
if count == 0 { break }
|
||||
try decoder.decode(buffer.prefix(count)) { try extractor.handle($0) }
|
||||
}
|
||||
try decoder.finish()
|
||||
try extractor.finish()
|
||||
}
|
||||
|
||||
func handle(_ event: AppleArchiveDecoder.Event) throws {
|
||||
switch event {
|
||||
case .header(let header):
|
||||
current = try begin(header)
|
||||
case .blob(let key, let data):
|
||||
guard key == .data, case .file(let file) = current else { break }
|
||||
_ = try file.fd.writeAll(data)
|
||||
case .endOfEntry:
|
||||
let entry = current
|
||||
current = .none
|
||||
if case .file(let file) = entry {
|
||||
try end(file)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Applies deferred directory metadata. Call this once all entries
|
||||
/// have been handled.
|
||||
func finish() throws {
|
||||
// children before parents, so that read-only directories
|
||||
// and modification times are applied last.
|
||||
for directory in directories.reversed() {
|
||||
try setAttributes(
|
||||
path: directory.path,
|
||||
mode: directory.mode,
|
||||
modificationDate: directory.modificationDate
|
||||
)
|
||||
}
|
||||
directories.removeAll()
|
||||
}
|
||||
|
||||
private func absolute(_ path: String) -> String {
|
||||
path.isEmpty ? destination : "\(destination)/\(path)"
|
||||
}
|
||||
|
||||
private func begin(_ header: AppleArchiveHeader) throws -> Current {
|
||||
guard let type = header.entryType, let rawPath = header.path else {
|
||||
throw AEAError("Apple Archive entry is missing a type or path")
|
||||
}
|
||||
if type == .metadata { return .skipped }
|
||||
|
||||
let path = try Self.sanitize(rawPath)
|
||||
if let filter, !filter(path) { return .skipped }
|
||||
if !path.isEmpty {
|
||||
try ensureParent(of: path)
|
||||
}
|
||||
|
||||
switch type {
|
||||
case .directory:
|
||||
try createDirectory(path: path, header: header)
|
||||
return .skipped
|
||||
case .symbolicLink:
|
||||
guard let target = header.linkPath, !path.isEmpty else {
|
||||
throw AEAError("Invalid symbolic link entry '\(rawPath)'")
|
||||
}
|
||||
try createSymlink(path: path, target: target, header: header)
|
||||
return .skipped
|
||||
case .regularFile:
|
||||
guard !path.isEmpty else {
|
||||
throw AEAError("Invalid file entry '\(rawPath)'")
|
||||
}
|
||||
return try createFile(path: path, header: header)
|
||||
default:
|
||||
throw AEAError(
|
||||
"Unsupported Apple Archive entry type '\(UnicodeScalar(type.rawValue))' for '\(rawPath)'"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private func createDirectory(path: String, header: AppleArchiveHeader) throws {
|
||||
if !path.isEmpty {
|
||||
// the real mode is applied by finish(), once we're done writing to it
|
||||
do {
|
||||
try fileManager.createDirectory(atPath: absolute(path), withIntermediateDirectories: false)
|
||||
} catch where Self.isFileExists(error) {
|
||||
let type = try fileManager.attributesOfItem(atPath: absolute(path))[.type] as? FileAttributeType
|
||||
if type != .typeDirectory {
|
||||
try fileManager.removeItem(atPath: absolute(path))
|
||||
symlinks.remove(path)
|
||||
try fileManager.createDirectory(atPath: absolute(path), withIntermediateDirectories: false)
|
||||
}
|
||||
}
|
||||
knownDirectories.insert(path)
|
||||
}
|
||||
directories.append(PendingDirectory(
|
||||
path: path,
|
||||
mode: header.mode ?? 0o755,
|
||||
modificationDate: header.modificationDate
|
||||
))
|
||||
}
|
||||
|
||||
private func createSymlink(path: String, target: String, header: AppleArchiveHeader) throws {
|
||||
try replacingExisting(path) {
|
||||
try fileManager.createSymbolicLink(atPath: absolute(path), withDestinationPath: target)
|
||||
}
|
||||
symlinks.insert(path)
|
||||
#if canImport(Darwin)
|
||||
// only Darwin supports modes on symlinks, and FileManager.setAttributes
|
||||
// follows them, so this needs lchmod.
|
||||
if let mode = header.mode, lchmod(absolute(path), mode_t(Self.permissions(mode))) != 0 {
|
||||
throw Errno(rawValue: errno)
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
private func createFile(path: String, header: AppleArchiveHeader) throws -> Current {
|
||||
// every member of a hard link cluster may carry its own copy of the data;
|
||||
// link to the first one we extracted and discard the rest.
|
||||
if let cluster = header.hardLinkCluster {
|
||||
if let existing = hardLinkClusters[cluster] {
|
||||
try replacingExisting(path) {
|
||||
try fileManager.linkItem(atPath: absolute(existing), toPath: absolute(path))
|
||||
}
|
||||
return .skipped
|
||||
}
|
||||
hardLinkClusters[cluster] = path
|
||||
}
|
||||
let fd = try replacingExisting(path) {
|
||||
try FileDescriptor.open(
|
||||
absolute(path), .writeOnly,
|
||||
options: [.create, .exclusiveCreate],
|
||||
permissions: .ownerReadWrite
|
||||
)
|
||||
}
|
||||
return .file(OpenFile(path: path, fd: fd, header: header))
|
||||
}
|
||||
|
||||
private func end(_ file: OpenFile) throws {
|
||||
try file.fd.close()
|
||||
try setAttributes(
|
||||
path: file.path,
|
||||
mode: file.header.mode ?? 0o644,
|
||||
modificationDate: file.header.modificationDate
|
||||
)
|
||||
}
|
||||
|
||||
/// Sets the attributes of the item at `path`, following symlinks.
|
||||
private func setAttributes(path: String, mode: UInt16, modificationDate: Date?) throws {
|
||||
var attributes: [FileAttributeKey: Any] = [.posixPermissions: Int(Self.permissions(mode))]
|
||||
attributes[.modificationDate] = modificationDate
|
||||
try fileManager.setAttributes(attributes, ofItemAtPath: absolute(path))
|
||||
}
|
||||
|
||||
/// Drops setuid/setgid bits.
|
||||
private static func permissions(_ mode: UInt16) -> UInt16 {
|
||||
mode & 0o1777
|
||||
}
|
||||
|
||||
/// Creates the parent directory of `path` if needed, rejecting paths that
|
||||
/// traverse symlinks created by earlier entries.
|
||||
private func ensureParent(of path: String) throws {
|
||||
var prefix = ""
|
||||
for component in path.split(separator: "/").dropLast() {
|
||||
prefix = prefix.isEmpty ? String(component) : "\(prefix)/\(component)"
|
||||
if symlinks.contains(prefix) {
|
||||
throw AEAError("Apple Archive entry '\(path)' traverses a symbolic link")
|
||||
}
|
||||
}
|
||||
guard !knownDirectories.contains(prefix) else { return }
|
||||
try fileManager.createDirectory(atPath: absolute(prefix), withIntermediateDirectories: true)
|
||||
while !prefix.isEmpty, knownDirectories.insert(prefix).inserted {
|
||||
prefix = String(prefix[..<(prefix.lastIndex(of: "/") ?? prefix.startIndex)])
|
||||
}
|
||||
}
|
||||
|
||||
/// Runs `create`. If that fails because a non-directory already exists at
|
||||
/// `path` (relative to the destination), removes it and tries again.
|
||||
@discardableResult
|
||||
private func replacingExisting<T>(_ path: String, _ create: () throws -> T) throws -> T {
|
||||
do {
|
||||
return try create()
|
||||
} catch where Self.isFileExists(error) {
|
||||
let absolutePath = absolute(path)
|
||||
if try fileManager.attributesOfItem(atPath: absolutePath)[.type] as? FileAttributeType == .typeDirectory {
|
||||
throw AEAError("Cannot replace directory '\(absolutePath)'")
|
||||
}
|
||||
try fileManager.removeItem(atPath: absolutePath)
|
||||
symlinks.remove(path)
|
||||
return try create()
|
||||
}
|
||||
}
|
||||
|
||||
private static func isFileExists(_ error: any Error) -> Bool {
|
||||
(error as? CocoaError)?.code == .fileWriteFileExists || (error as? Errno) == .fileExists
|
||||
}
|
||||
|
||||
/// Normalizes an entry path, rejecting ones that could escape the destination.
|
||||
static func sanitize(_ path: String) throws -> String {
|
||||
guard !path.hasPrefix("/") else {
|
||||
throw AEAError("Apple Archive entry has an absolute path: '\(path)'")
|
||||
}
|
||||
let components = path.split(separator: "/").filter { $0 != "." }
|
||||
guard !components.contains("..") else {
|
||||
throw AEAError("Apple Archive entry escapes the destination: '\(path)'")
|
||||
}
|
||||
return components.joined(separator: "/")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
import Foundation
|
||||
|
||||
extension Data {
|
||||
/// Reads a little-endian integer at the zero-based `offset`.
|
||||
func loadLE<T: FixedWidthInteger>(_: T.Type = T.self, at offset: Int) -> T {
|
||||
var value: T = 0
|
||||
Swift.withUnsafeMutableBytes(of: &value) { dest in
|
||||
let start = startIndex + offset
|
||||
dest.copyBytes(from: self[start..<(start + MemoryLayout<T>.size)])
|
||||
}
|
||||
return T(littleEndian: value)
|
||||
}
|
||||
|
||||
/// A copy of the `count` bytes starting at the zero-based `offset`.
|
||||
func bytes(at offset: Int, count: Int) -> Data {
|
||||
let start = startIndex + offset
|
||||
return Data(self[start..<(start + count)])
|
||||
}
|
||||
|
||||
mutating func appendLE<T: FixedWidthInteger>(_ value: T) {
|
||||
Swift.withUnsafeBytes(of: value.littleEndian) { append(contentsOf: $0) }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
import Dependencies
|
||||
import Foundation
|
||||
import XUtils
|
||||
|
||||
package struct CommandInput: DependencyKey, Sendable {
|
||||
// nil = EOF
|
||||
private let readImpl: @Sendable (DataChannel.Limit) async throws -> Data?
|
||||
|
||||
package init(
|
||||
read: @escaping @Sendable (DataChannel.Limit) async throws -> Data?,
|
||||
) {
|
||||
self.readImpl = read
|
||||
}
|
||||
|
||||
package init(channel: DataChannel) {
|
||||
self.init(read: { try await channel.read(upTo: $0) })
|
||||
}
|
||||
|
||||
package func read(upTo limit: DataChannel.Limit = .unlimited) async throws -> Data? {
|
||||
try Task.checkCancellation()
|
||||
return try await readImpl(limit)
|
||||
}
|
||||
|
||||
/// Cancellation discards bytes already consumed for this line.
|
||||
package func readLine() async throws -> String? {
|
||||
var line = Data()
|
||||
while let chunk = try await read(upTo: .newline) {
|
||||
line.append(chunk)
|
||||
if line.last == UInt8(ascii: "\n") {
|
||||
line.removeLast()
|
||||
return String(decoding: line, as: UTF8.self).trimmingTrailingCarriageReturn()
|
||||
}
|
||||
}
|
||||
guard !line.isEmpty else { return nil }
|
||||
return String(decoding: line, as: UTF8.self).trimmingTrailingCarriageReturn()
|
||||
}
|
||||
|
||||
package static var liveValue: CommandInput {
|
||||
@Dependency(\.shutdownRegistry) var shutdownRegistry
|
||||
do {
|
||||
let input = try DispatchInput(fileDesciptor: .standardInput)
|
||||
shutdownRegistry.register { await input.close() }
|
||||
return Self(read: { try await input.read(upTo: $0) })
|
||||
} catch {
|
||||
return Self(read: { _ in throw error })
|
||||
}
|
||||
}
|
||||
|
||||
package static var testValue: CommandInput {
|
||||
Self(read: unimplemented("CommandInput.read", placeholder: nil))
|
||||
}
|
||||
}
|
||||
|
||||
private extension String {
|
||||
func trimmingTrailingCarriageReturn() -> String {
|
||||
hasSuffix("\r") ? String(dropLast()) : self
|
||||
}
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
package var input: CommandInput {
|
||||
get { self[CommandInput.self] }
|
||||
set { self[CommandInput.self] = newValue }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
public struct CommandVersion: Sendable, Hashable {
|
||||
public var version: String
|
||||
public var hasUncommittedChanges: Bool
|
||||
|
||||
public init(version: String, hasUncommittedChanges: Bool) {
|
||||
self.version = version
|
||||
self.hasUncommittedChanges = hasUncommittedChanges
|
||||
}
|
||||
|
||||
public static var unversioned: Self {
|
||||
.init(version: "unversioned", hasUncommittedChanges: true)
|
||||
}
|
||||
}
|
||||
|
||||
extension CommandVersion: CustomStringConvertible {
|
||||
public var description: String {
|
||||
version + (hasUncommittedChanges ? "-dirty" : "")
|
||||
}
|
||||
}
|
||||
@@ -1,47 +1,15 @@
|
||||
import Foundation
|
||||
import XKit
|
||||
import XUtils
|
||||
import NIOPosix
|
||||
import NIOCore
|
||||
import Dependencies
|
||||
|
||||
enum Console {
|
||||
private static func withStdio<T>(
|
||||
_ body: (
|
||||
_ stdin: NIOAsyncChannelInboundStream<ByteBuffer>,
|
||||
_ stdout: NIOAsyncChannelOutboundWriter<ByteBuffer>
|
||||
) async throws -> T
|
||||
) async throws -> T {
|
||||
try await NIOPipeBootstrap(group: .singletonMultiThreadedEventLoopGroup)
|
||||
.takingOwnershipOfDescriptors(
|
||||
input: FileDescriptor.standardInput.duplicate().rawValue,
|
||||
output: FileDescriptor.standardOutput.duplicate().rawValue
|
||||
)
|
||||
.flatMapThrowing { try NIOAsyncChannel(wrappingChannelSynchronously: $0) }
|
||||
.get()
|
||||
.executeThenClose { try await body($0, $1) }
|
||||
package enum Console {
|
||||
package static func prompt(_ message: String) async throws -> String {
|
||||
d.out.print(message, terminator: "", flush: true)
|
||||
guard let line = try await d.input.readLine() else { throw Console.Error("Input ended before a response was received.") }
|
||||
return line
|
||||
}
|
||||
|
||||
static func prompt(_ message: String) async throws -> String {
|
||||
try await withStdio { stdin, stdout in
|
||||
try await stdout.write(ByteBuffer(bytes: message.utf8))
|
||||
|
||||
fflush(stdoutSafe)
|
||||
|
||||
var data = Data()
|
||||
for try await chunk in stdin {
|
||||
let view = chunk.readableBytesView
|
||||
if let endIndex = view.firstIndex(of: UInt8(ascii: "\n")) {
|
||||
data += view[..<endIndex]
|
||||
break
|
||||
} else {
|
||||
data += view
|
||||
}
|
||||
}
|
||||
return String(decoding: data, as: UTF8.self)
|
||||
}
|
||||
}
|
||||
|
||||
static func promptRequired(_ message: String, existing: String?) async throws -> String {
|
||||
package static func promptRequired(_ message: String, existing: String?) async throws -> String {
|
||||
let value: String
|
||||
if let existing {
|
||||
value = existing
|
||||
@@ -54,12 +22,12 @@ enum Console {
|
||||
return value
|
||||
}
|
||||
|
||||
static func getPassword(_ message: String) async throws -> String {
|
||||
package static func getPassword(_ message: String) async throws -> String {
|
||||
if !message.isEmpty {
|
||||
print(message, terminator: "")
|
||||
d.out.print(message, terminator: "")
|
||||
}
|
||||
let password = try await withoutEcho { try await prompt("") }
|
||||
print()
|
||||
d.out.print()
|
||||
return password
|
||||
}
|
||||
|
||||
@@ -90,7 +58,7 @@ enum Console {
|
||||
#endif
|
||||
}
|
||||
|
||||
static func chooseNumber(in range: Range<Int>) async throws -> Int {
|
||||
package static func chooseNumber(in range: Range<Int>) async throws -> Int {
|
||||
let message = "Choice (\(range.lowerBound)-\(range.upperBound - 1)): "
|
||||
while true {
|
||||
if let choice = try await Int(prompt(message)), range.contains(choice) {
|
||||
@@ -99,7 +67,7 @@ enum Console {
|
||||
}
|
||||
}
|
||||
|
||||
static func choose<T>(
|
||||
package static func choose<T>(
|
||||
from elements: [T],
|
||||
onNoElement: () throws -> T,
|
||||
multiPrompt: @autoclosure () -> String,
|
||||
@@ -111,9 +79,9 @@ enum Console {
|
||||
case 1:
|
||||
return elements[0]
|
||||
default:
|
||||
print(multiPrompt())
|
||||
d.out.print(multiPrompt())
|
||||
try elements.enumerated().forEach { index, element in
|
||||
try print("\(index): \(formatter(element))")
|
||||
try d.out.print("\(index): \(formatter(element))")
|
||||
}
|
||||
let choice = try await chooseNumber(in: elements.indices)
|
||||
return elements[choice]
|
||||
@@ -123,7 +91,7 @@ enum Console {
|
||||
private static let yesSet: Set<String> = ["yes", "y"]
|
||||
private static let noSet: Set<String> = ["no", "n"]
|
||||
|
||||
static func confirm(_ message: String) async throws -> Bool {
|
||||
package static func confirm(_ message: String) async throws -> Bool {
|
||||
while true {
|
||||
let resp = try await prompt("\(message) (yes/no): ").lowercased()
|
||||
if yesSet.contains(resp) {
|
||||
@@ -134,9 +102,9 @@ enum Console {
|
||||
}
|
||||
}
|
||||
|
||||
struct Error: Swift.Error, CustomStringConvertible {
|
||||
let description: String
|
||||
init(_ description: String) {
|
||||
package struct Error: Swift.Error, CustomStringConvertible {
|
||||
package let description: String
|
||||
package init(_ description: String) {
|
||||
self.description = description
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import ConcurrencyExtras
|
||||
import Dependencies
|
||||
|
||||
/// Anything registered here will be cleaned up when the process exits
|
||||
public final class ShutdownRegistry: DependencyKey, Sendable {
|
||||
public static var liveValue: ShutdownRegistry { ShutdownRegistry() }
|
||||
public static var testValue: ShutdownRegistry { ShutdownRegistry() }
|
||||
|
||||
private struct State {
|
||||
var operations: [@Sendable () async -> Void] = []
|
||||
var shutdownTask: Task<Void, Never>?
|
||||
}
|
||||
|
||||
private let state = LockIsolated(State())
|
||||
|
||||
public init() {}
|
||||
|
||||
/// Register cleanup before shutdown begins.
|
||||
public func register(_ operation: @escaping @Sendable () async -> Void) {
|
||||
state.withValue { $0.operations.append(operation) }
|
||||
}
|
||||
|
||||
/// Runs cleanup in reverse registration order, once, even for concurrent callers.
|
||||
public func shutdown() async {
|
||||
let task = state.withValue { state in
|
||||
if let task = state.shutdownTask { return task }
|
||||
let pending = state.operations.reversed()
|
||||
state.operations.removeAll()
|
||||
let task = Task {
|
||||
for operation in pending { await operation() }
|
||||
}
|
||||
state.shutdownTask = task
|
||||
return task
|
||||
}
|
||||
await task.value
|
||||
}
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
public var shutdownRegistry: ShutdownRegistry {
|
||||
get { self[ShutdownRegistry.self] }
|
||||
set { self[ShutdownRegistry.self] = newValue }
|
||||
}
|
||||
}
|
||||
+5
-4
@@ -8,6 +8,7 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Replaces all of the app's groups with the given ones
|
||||
public final class DeveloperServicesAssignAppGroupRequest: DeveloperServicesPlatformRequest {
|
||||
|
||||
public struct Response: Decodable, Sendable {}
|
||||
@@ -16,14 +17,14 @@ public final class DeveloperServicesAssignAppGroupRequest: DeveloperServicesPlat
|
||||
public let platform: DeveloperServicesPlatform
|
||||
public let teamID: DeveloperServicesTeam.ID
|
||||
public let appIDID: String
|
||||
public let groupID: DeveloperServicesAppGroup.ID
|
||||
public let groupIDs: [DeveloperServicesAppGroup.ID]
|
||||
|
||||
var subAction: String { return "assignApplicationGroupToAppId" }
|
||||
var subParameters: [String: Any] {
|
||||
return [
|
||||
"teamId": teamID.rawValue,
|
||||
"appIdId": appIDID,
|
||||
"applicationGroups": groupID.rawValue
|
||||
"applicationGroups": groupIDs.map(\.rawValue)
|
||||
]
|
||||
}
|
||||
|
||||
@@ -31,12 +32,12 @@ public final class DeveloperServicesAssignAppGroupRequest: DeveloperServicesPlat
|
||||
platform: DeveloperServicesPlatform,
|
||||
teamID: DeveloperServicesTeam.ID,
|
||||
appIDID: String,
|
||||
groupID: DeveloperServicesAppGroup.ID
|
||||
groupIDs: [DeveloperServicesAppGroup.ID]
|
||||
) {
|
||||
self.platform = platform
|
||||
self.teamID = teamID
|
||||
self.appIDID = appIDID
|
||||
self.groupID = groupID
|
||||
self.groupIDs = groupIDs
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+25
-31
@@ -8,6 +8,7 @@
|
||||
|
||||
import Foundation
|
||||
import DeveloperAPI
|
||||
import XUtils
|
||||
|
||||
public struct DeveloperServicesAssignAppGroupsOperation: DeveloperServicesOperation {
|
||||
|
||||
@@ -33,36 +34,23 @@ public struct DeveloperServicesAssignAppGroupsOperation: DeveloperServicesOperat
|
||||
self.client = DeveloperServicesClient(authData: authData)
|
||||
}
|
||||
|
||||
private func upsertAppGroup(
|
||||
private func getOrCreateAppGroup(
|
||||
_ groupID: DeveloperServicesAppGroup.GroupID,
|
||||
existingGroups: [String: DeveloperServicesAppGroup]
|
||||
) async throws -> DeveloperServicesAppGroup.GroupID {
|
||||
) async throws -> DeveloperServicesAppGroup {
|
||||
let sanitized = ProvisioningIdentifiers.sanitize(groupID: groupID)
|
||||
let group: DeveloperServicesAppGroup
|
||||
if let existingGroup = existingGroups[sanitized] {
|
||||
group = existingGroup
|
||||
} else {
|
||||
let groupID = ProvisioningIdentifiers.groupID(fromSanitized: sanitized, context: context)
|
||||
let name = ProvisioningIdentifiers.groupName(fromSanitized: sanitized)
|
||||
let request = DeveloperServicesAddAppGroupRequest(
|
||||
platform: .iOS,
|
||||
teamID: xcodeAuthData.teamID,
|
||||
name: name,
|
||||
groupID: groupID
|
||||
)
|
||||
group = try await client.send(request)
|
||||
return existingGroup
|
||||
}
|
||||
|
||||
_ = try await client.send(
|
||||
DeveloperServicesAssignAppGroupRequest(
|
||||
platform: .iOS,
|
||||
teamID: xcodeAuthData.teamID,
|
||||
appIDID: appID.id,
|
||||
groupID: group.id
|
||||
)
|
||||
let groupID = ProvisioningIdentifiers.groupID(fromSanitized: sanitized, context: context)
|
||||
let name = ProvisioningIdentifiers.groupName(fromSanitized: sanitized)
|
||||
let request = DeveloperServicesAddAppGroupRequest(
|
||||
platform: .iOS,
|
||||
teamID: xcodeAuthData.teamID,
|
||||
name: name,
|
||||
groupID: groupID
|
||||
)
|
||||
|
||||
return group.groupID
|
||||
return try await client.send(request)
|
||||
}
|
||||
|
||||
public func perform() async throws -> [DeveloperServicesAppGroup.GroupID] {
|
||||
@@ -71,14 +59,20 @@ public struct DeveloperServicesAssignAppGroupsOperation: DeveloperServicesOperat
|
||||
))
|
||||
let sanitized = existing.map { (ProvisioningIdentifiers.sanitize(groupID: $0.groupID), $0) }
|
||||
let dict = Dictionary(sanitized, uniquingKeysWith: { $1 })
|
||||
return try await withThrowingTaskGroup(of: DeveloperServicesAppGroup.GroupID.self) { group in
|
||||
for groupID in groupIDs {
|
||||
group.addTask {
|
||||
try await upsertAppGroup(groupID, existingGroups: dict)
|
||||
}
|
||||
}
|
||||
return try await group.reduce(into: []) { $0.append($1) }
|
||||
let groups = try await groupIDs.concurrentMap { groupID in
|
||||
try await getOrCreateAppGroup(groupID, existingGroups: dict)
|
||||
}
|
||||
|
||||
_ = try await client.send(
|
||||
DeveloperServicesAssignAppGroupRequest(
|
||||
platform: .iOS,
|
||||
teamID: xcodeAuthData.teamID,
|
||||
appIDID: appID.id,
|
||||
groupIDs: groups.map(\.id)
|
||||
)
|
||||
)
|
||||
|
||||
return groups.map(\.groupID)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -8,22 +8,29 @@
|
||||
|
||||
import Foundation
|
||||
import DeveloperAPI
|
||||
import Dependencies
|
||||
|
||||
public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
@Dependency(\.signer) private var signer
|
||||
|
||||
public enum Error: LocalizedError, CustomStringConvertible {
|
||||
case invalidApp(URL)
|
||||
case tooManyAppGroups(bundleID: String, groups: [DeveloperServicesAppGroup.GroupID])
|
||||
|
||||
public var errorDescription: String? {
|
||||
description
|
||||
}
|
||||
|
||||
public var description: String {
|
||||
switch self {
|
||||
case .invalidApp(let url):
|
||||
return url.path.withCString {
|
||||
String.localizedStringWithFormat(
|
||||
NSLocalizedString(
|
||||
"add_app_operation.error.invalid_app", value: "Invalid app: %s", comment: ""
|
||||
), $0
|
||||
)
|
||||
}
|
||||
"Invalid app: \(url.path)"
|
||||
case .tooManyAppGroups(let bundleID, let groups):
|
||||
"""
|
||||
App '\(bundleID)' requests multiple app groups: \(groups.map(\.rawValue).joined(separator: ", ")), \
|
||||
which is not permitted when using a free team.
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -172,7 +179,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
var entitlements: Entitlements
|
||||
// if the executable doesn't already have entitlements, that's
|
||||
// okay. We don't have to throw an error.
|
||||
if let entitlementsData = try? await context.signer.analyze(executable: executableURL),
|
||||
if let entitlementsData = try? await signer.analyze(executable: executableURL),
|
||||
let decodedEntitlements = try? PropertyListDecoder().decode(Entitlements.self, from: entitlementsData) {
|
||||
entitlements = decodedEntitlements
|
||||
|
||||
@@ -180,6 +187,10 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
// re-assign rather than using updateEntitlements since the latter will
|
||||
// retain unrecognized entitlements
|
||||
let filtered = try entitlements.entitlements().filter { $0.anyCapability?.isFree != false }
|
||||
if let groups = filtered.lazy.compactMap({ $0 as? AppGroupEntitlement }).first?.rawValue,
|
||||
groups.count > 1 {
|
||||
throw Error.tooManyAppGroups(bundleID: bundleID, groups: groups)
|
||||
}
|
||||
entitlements = try Entitlements(entitlements: filtered)
|
||||
}
|
||||
} else {
|
||||
|
||||
+17
-3
@@ -73,9 +73,23 @@ extension DataProtectionEntitlement: EntitlementWithCapability {
|
||||
|
||||
extension AppGroupEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
// FIXME: Enable app groups on free accounts
|
||||
// but we need to always assign only one group
|
||||
DeveloperServicesCapability(.appGroups, isFree: false)
|
||||
DeveloperServicesCapability(.appGroups, isFree: true)
|
||||
}
|
||||
}
|
||||
|
||||
extension AppleSignInEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
// A primary App ID: the app is its own Sign in with Apple group.
|
||||
DeveloperServicesCapability(
|
||||
.appleIdAuth,
|
||||
isFree: false,
|
||||
settings: [
|
||||
.init(
|
||||
key: .init(.appleIdAuthAppConsent),
|
||||
options: [.init(key: .init(.primaryAppConsent))]
|
||||
)
|
||||
]
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-2
@@ -100,8 +100,9 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
|
||||
return try await self.replaceCertificates(certificates, requireConfirmation: true)
|
||||
}
|
||||
|
||||
let knownSerialNumber = signingInfo.certificate.serialNumber()
|
||||
guard let certificate = certificates.first(where: { $0.attributes?.serialNumber == knownSerialNumber }) else {
|
||||
guard let certificate = certificates.first(where: {
|
||||
$0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true
|
||||
}) 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,7 +54,6 @@ public struct DeveloperServicesClient: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
@@ -76,8 +75,6 @@ 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: ", ")
|
||||
|
||||
@@ -88,8 +85,6 @@ 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
|
||||
@@ -103,8 +98,6 @@ 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)
|
||||
|
||||
@@ -25,8 +25,8 @@ public struct DeveloperAPIPages<Page>: AsyncSequence {
|
||||
public var getNext: @Sendable (Page) -> String?
|
||||
|
||||
public init(
|
||||
_ getNext: @escaping @Sendable (Page) -> String?,
|
||||
request: @escaping @Sendable () async throws -> Page,
|
||||
next getNext: @escaping @Sendable (Page) -> String?
|
||||
) {
|
||||
self.request = request
|
||||
self.getNext = getNext
|
||||
|
||||
@@ -105,7 +105,6 @@ public struct XcodeAuthData: Sendable {
|
||||
}
|
||||
|
||||
public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
@Dependency(\.deviceInfoProvider) private var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) private var anisetteDataProvider
|
||||
|
||||
public var authData: XcodeAuthData
|
||||
@@ -130,7 +129,7 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var request = request
|
||||
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
|
||||
|
||||
// General
|
||||
request.headerFields[.acceptLanguage] = Locale.preferredLanguages.joined(separator: ", ")
|
||||
@@ -142,17 +141,12 @@ 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
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import XUtils
|
||||
import Foundation
|
||||
import OpenAPIRuntime
|
||||
import HTTPTypes
|
||||
@@ -23,7 +24,7 @@ struct LoggingMiddleware: ClientMiddleware {
|
||||
) != nil
|
||||
else { return (response, body) }
|
||||
|
||||
print("\n\(operationID) response status -> \(response.status)")
|
||||
d.out.print("\n\(operationID) response status -> \(response.status)")
|
||||
|
||||
if let unwrapped = body {
|
||||
let data = try await Data(collecting: unwrapped, upTo: .max)
|
||||
@@ -31,7 +32,7 @@ struct LoggingMiddleware: ClientMiddleware {
|
||||
body = .init(data)
|
||||
|
||||
let text = String(decoding: data, as: UTF8.self)
|
||||
print("\(operationID) response body -> \(text)")
|
||||
d.out.print("\(operationID) response body -> \(text)")
|
||||
}
|
||||
|
||||
return (response, body)
|
||||
|
||||
+36
-20
@@ -49,29 +49,45 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
throw Errors.tooManyMatchingBundleIDs
|
||||
}
|
||||
|
||||
let profiles = bundleID.relationships?.profiles?.data ?? []
|
||||
switch profiles.count {
|
||||
case 0:
|
||||
// we're good
|
||||
break
|
||||
case 1:
|
||||
_ = try await context.developerAPIClient.profilesDeleteInstance(path: .init(id: profiles[0].id)).noContent
|
||||
default:
|
||||
// if the user has >1 profile, it's probably okay to add another one (acceptable for non-free accounts?)
|
||||
break
|
||||
// match locally rather than with filter[serialNumber]: server-side matching bugs out
|
||||
// when the serial has leading zeroes (#305)
|
||||
let certs = try await DeveloperAPIPages(\.links.next) {
|
||||
try await context.developerAPIClient.certificatesGetCollection().ok.body.json
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
.filter { $0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true }
|
||||
|
||||
let allDevices = try await DeveloperAPIPages(\.links.next) {
|
||||
try await context.developerAPIClient.devicesGetCollection().ok.body.json
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
.filter {
|
||||
$0.attributes?.status?.value1 != .disabled
|
||||
&& $0.attributes?.deviceClass?.value1?.supportsIOSApps == true
|
||||
}
|
||||
|
||||
let serialNumber = signingInfo.certificate.serialNumber()
|
||||
let certs = try await context.developerAPIClient.certificatesGetCollection(
|
||||
query: .init(
|
||||
filter_lbrack_serialNumber_rbrack_: [serialNumber]
|
||||
)
|
||||
)
|
||||
.ok.body.json.data
|
||||
try Task.checkCancellation()
|
||||
|
||||
let allDevices = try await context.developerAPIClient.devicesGetCollection()
|
||||
let profileName = "XTL profile \(bundleID.id)"
|
||||
|
||||
let profiles = bundleID.relationships?.profiles?.data ?? []
|
||||
if !profiles.isEmpty {
|
||||
// we can't create multiple profiles with the same name, so
|
||||
// if there's already one delete it first
|
||||
let matchingProfiles = try await context.developerAPIClient.profilesGetCollection(query: .init(
|
||||
filter_lbrack_name_rbrack_: [profileName],
|
||||
filter_lbrack_id_rbrack_: profiles.map(\.id),
|
||||
fields_lbrack_profiles_rbrack_: [.name],
|
||||
))
|
||||
.ok.body.json.data
|
||||
.filter { $0.attributes?.deviceClass?.value1?.supportsIOSApps == true }
|
||||
.filter { $0.attributes?.name == profileName }
|
||||
|
||||
_ = try await matchingProfiles.concurrentMap {
|
||||
try await context.developerAPIClient.profilesDeleteInstance(path: .init(id: $0.id)).noContent
|
||||
}
|
||||
}
|
||||
|
||||
let response = try await context.developerAPIClient.profilesCreateInstance(
|
||||
body: .json(
|
||||
@@ -79,7 +95,7 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
data: .init(
|
||||
_type: .profiles,
|
||||
attributes: .init(
|
||||
name: "XTL profile \(bundleID.id)",
|
||||
name: profileName,
|
||||
profileType: .init(.iosAppDevelopment)
|
||||
),
|
||||
relationships: .init(
|
||||
|
||||
@@ -4,7 +4,7 @@ import ConcurrencyExtras
|
||||
import Dependencies
|
||||
|
||||
public protocol RawADIProvider: Sendable {
|
||||
func clientInfo() async throws -> String
|
||||
func clientInfo() async throws -> ClientInfoWithUserAgent
|
||||
|
||||
func startProvisioning(
|
||||
spim: Data,
|
||||
@@ -18,13 +18,9 @@ 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)>
|
||||
"""
|
||||
}
|
||||
public struct ClientInfoWithUserAgent: Sendable {
|
||||
public let clientInfo: String
|
||||
public let akdUserAgent: String
|
||||
}
|
||||
|
||||
private struct UnimplementedRawADIProvider: RawADIProvider {
|
||||
@@ -44,17 +40,16 @@ 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 -> ClientInfoWithUserAgent {
|
||||
let closure: () async throws -> ClientInfoWithUserAgent = unimplemented()
|
||||
return try await closure()
|
||||
}
|
||||
}
|
||||
|
||||
private enum RawADIProviderDependencyKey: DependencyKey {
|
||||
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
|
||||
static let liveValue: RawADIProvider = {
|
||||
#if canImport(XADI)
|
||||
return XADIProvider()
|
||||
#else
|
||||
return OmnisetteADIProvider()
|
||||
#endif
|
||||
}()
|
||||
static let liveValue: RawADIProvider = OmnisetteADIProvider()
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
@@ -90,7 +85,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
private let localUserUID: UUID
|
||||
private let localUserID: String
|
||||
|
||||
private let _clientInfo = LockIsolated<String?>(nil)
|
||||
private let _clientInfo = LockIsolated<ClientInfoWithUserAgent?>(nil)
|
||||
|
||||
public init() {
|
||||
@Dependency(\.keyValueStorage) var storage
|
||||
@@ -155,7 +150,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
return encoder
|
||||
}()
|
||||
|
||||
private func clientInfo() async throws -> String {
|
||||
private func clientInfo() async throws -> ClientInfoWithUserAgent {
|
||||
if let clientInfo = _clientInfo.value { return clientInfo }
|
||||
let clientInfo = try await rawProvider.clientInfo()
|
||||
_clientInfo.setValue(clientInfo)
|
||||
@@ -179,14 +174,11 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
]
|
||||
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
|
||||
|
||||
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 }
|
||||
for (key, value) in try await deviceInfo().dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
|
||||
let (_, response) = try await self.httpClient.makeRequest(request, body: body)
|
||||
|
||||
// print(String(data: response, encoding: .utf8) ?? "<no utf8 data>")
|
||||
let (_, response) = try await self.httpClient.makeRequest(request, body: body, ephemeral: true)
|
||||
|
||||
return try GrandSlamOperationDecoder<Response>.decode(data: response)
|
||||
}
|
||||
@@ -239,7 +231,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
machineID: mid.base64EncodedString(),
|
||||
localUserID: self.localUserID,
|
||||
oneTimePassword: otp.base64EncodedString(),
|
||||
deviceID: self.localUserUID.uuidString
|
||||
deviceInfo: try await deviceInfo(),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -249,11 +241,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
}
|
||||
|
||||
private static var providerID: String? {
|
||||
#if os(macOS)
|
||||
return "1"
|
||||
#else
|
||||
return nil
|
||||
#endif
|
||||
"mac-omnisette"
|
||||
}
|
||||
|
||||
public var providerID: String? { Self.providerID }
|
||||
@@ -291,6 +279,15 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
)
|
||||
}
|
||||
|
||||
public func deviceInfo() async throws -> DeviceInfo {
|
||||
let clientInfo = try await clientInfo()
|
||||
return DeviceInfo(
|
||||
deviceID: localUserUID.uuidString,
|
||||
clientInfo: clientInfo.clientInfo,
|
||||
akdUserAgent: clientInfo.akdUserAgent,
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public struct ADIError: Error, CustomStringConvertible {
|
||||
|
||||
@@ -10,14 +10,14 @@ import Foundation
|
||||
|
||||
public struct AnisetteData {
|
||||
|
||||
private static let dateFormatter: DateFormatter = {
|
||||
let dateFormatter = DateFormatter()
|
||||
dateFormatter.locale = Locale(identifier: "en_US_POSIX")
|
||||
dateFormatter.calendar = Calendar(identifier: .gregorian)
|
||||
dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
|
||||
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
|
||||
return dateFormatter
|
||||
}()
|
||||
private static let clientTimeFormat = Date.ISO8601FormatStyle(
|
||||
dateSeparator: .dash,
|
||||
dateTimeSeparator: .standard,
|
||||
timeSeparator: .colon,
|
||||
timeZoneSeparator: .omitted,
|
||||
includingFractionalSeconds: false,
|
||||
timeZone: .gmt
|
||||
)
|
||||
|
||||
/// `X-Apple-I-Locale`
|
||||
static let iLocaleKey = "X-Apple-I-Locale"
|
||||
@@ -49,10 +49,9 @@ public struct AnisetteData {
|
||||
static let oneTimePasswordKey = "X-Apple-I-MD"
|
||||
public let oneTimePassword: String
|
||||
|
||||
static let deviceIDKey = "X-Mme-Device-Id"
|
||||
public var deviceID: String?
|
||||
public let deviceInfo: DeviceInfo
|
||||
|
||||
var dictionary: [String: String] {
|
||||
public 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 {
|
||||
@@ -60,19 +59,16 @@ public struct AnisetteData {
|
||||
} else {
|
||||
"en_US"
|
||||
}
|
||||
var dictionary = [
|
||||
return [
|
||||
Self.localeKey: localeIdentifier,
|
||||
Self.timeZoneKey: timeZone.abbreviation() ?? "UTC",
|
||||
Self.clientTimeKey: Self.dateFormatter.string(from: clientTime),
|
||||
Self.clientTimeKey: clientTime.formatted(Self.clientTimeFormat),
|
||||
Self.routingInfoKey: "\(routingInfo)",
|
||||
Self.machineIDKey: machineID,
|
||||
Self.localUserIDKey: localUserID,
|
||||
Self.oneTimePasswordKey: oneTimePassword,
|
||||
]
|
||||
if let deviceID {
|
||||
dictionary[Self.deviceIDKey] = deviceID
|
||||
}
|
||||
return dictionary
|
||||
.merging(deviceInfo.dictionary) { _, b in b }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,6 +22,8 @@ public protocol AnisetteDataProvider: Sendable {
|
||||
func resetProvisioning() async
|
||||
func provisioningData() -> ProvisioningData?
|
||||
|
||||
func deviceInfo() async throws -> DeviceInfo
|
||||
|
||||
func fetchAnisetteData() async throws -> AnisetteData
|
||||
}
|
||||
|
||||
@@ -54,4 +56,9 @@ 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()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,102 +0,0 @@
|
||||
//
|
||||
// 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,116 +1,21 @@
|
||||
//
|
||||
// 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 {
|
||||
|
||||
/// `X-Xcode-Version`
|
||||
static let xcodeVersionKey = "X-Xcode-Version"
|
||||
/// Not included in `dictionary`
|
||||
public static let xcodeVersionKey = "X-Xcode-Version"
|
||||
public static let xcodeVersion = "26.5 (17F42)"
|
||||
|
||||
public struct ClientInfo: Codable {
|
||||
public let modelID: String // e.g. MacBookPro11,5
|
||||
|
||||
var clientString: String {
|
||||
"""
|
||||
<\(modelID)> <macOS;27.0;26A5378j> <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 static let deviceIDKey = "X-Mme-Device-Id"
|
||||
public let deviceID: String
|
||||
|
||||
/// `X-Apple-I-ROM`
|
||||
static let romAddressKey = "X-Apple-I-ROM"
|
||||
public let romAddress: String
|
||||
public static let clientInfoKey = "X-MMe-Client-Info"
|
||||
public let clientInfo: String
|
||||
|
||||
/// `X-Apple-I-MLB`
|
||||
static let mlbSerialNumberKey = "X-Apple-I-MLB"
|
||||
/// main logic board serial number
|
||||
public let mlbSerialNumber: String
|
||||
public let akdUserAgent: 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] {
|
||||
public 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 }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,256 +0,0 @@
|
||||
//
|
||||
// LocalAnisetteDataProviders.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 29/06/20.
|
||||
// Copyright © 2020 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
#if false
|
||||
|
||||
// For reference: https://github.com/xtool-org/xtool/issues/196
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Creates a socket connected to `ip` on `port`.
|
||||
///
|
||||
/// - Returns: A connected socket file descriptor, or `nil` if
|
||||
/// the connection failed. The caller is responsible for closing
|
||||
/// the returned file descriptor.
|
||||
private func connect(toIP ip: String, port: UInt16) -> Int32? {
|
||||
var addr = sockaddr_in()
|
||||
addr.sin_family = .init(AF_INET)
|
||||
addr.sin_port = CFSwapInt16HostToBig(port)
|
||||
addr.sin_addr.s_addr = inet_addr(ip)
|
||||
|
||||
// we can't do this inside withUnsafePointer due to memory exclusivity rules
|
||||
let addrSize = MemoryLayout.size(ofValue: addr)
|
||||
|
||||
let socketFd = socket(AF_INET, SOCK_STREAM, 0)
|
||||
guard socketFd != -1 else { return nil }
|
||||
guard withUnsafePointer(to: &addr, {
|
||||
connect(
|
||||
socketFd,
|
||||
UnsafeRawPointer($0).assumingMemoryBound(to: sockaddr.self),
|
||||
.init(addrSize)
|
||||
)
|
||||
}) == 0 else { return nil }
|
||||
|
||||
return socketFd
|
||||
}
|
||||
|
||||
public class NetcatAnisetteDataProvider: AnisetteDataProvider {
|
||||
|
||||
private struct RawAnisetteData {
|
||||
let machineID: String
|
||||
let localUserID: String
|
||||
let routingInfo: String
|
||||
let oneTimePassword: String
|
||||
}
|
||||
|
||||
private class ConnectionInfo {
|
||||
let socketFd: Int32
|
||||
let machineID: String
|
||||
let localUserID: String
|
||||
let routingInfo: String
|
||||
let firstOTP: String
|
||||
|
||||
init(socketFd: Int32, machineID: String, localUserID: String, routingInfo: String, firstOTP: String) {
|
||||
self.socketFd = socketFd
|
||||
self.machineID = machineID
|
||||
self.localUserID = localUserID
|
||||
self.routingInfo = routingInfo
|
||||
self.firstOTP = firstOTP
|
||||
}
|
||||
|
||||
deinit { close(socketFd) }
|
||||
}
|
||||
|
||||
public enum Error: Swift.Error {
|
||||
/// The user is probably not running anisettehelperd on the host machine
|
||||
case helperUnreachable
|
||||
case invalidAnisetteData
|
||||
case networkError(errno: Int32)
|
||||
}
|
||||
|
||||
public let ip: String
|
||||
public let port: UInt16
|
||||
public let deviceInfo: DeviceInfo
|
||||
private var _connectionInfo: ConnectionInfo?
|
||||
private var hasUsedFirstOTP = false
|
||||
|
||||
public init(ip: String, port: UInt16, deviceInfo: DeviceInfo) {
|
||||
self.ip = ip
|
||||
self.port = port
|
||||
self.deviceInfo = deviceInfo
|
||||
}
|
||||
|
||||
public convenience init(localPort port: UInt16, deviceInfo: DeviceInfo) {
|
||||
self.init(ip: "0.0.0.0", port: port, deviceInfo: deviceInfo)
|
||||
}
|
||||
|
||||
private func readAll(fromSocket sock: Int32) throws -> Data {
|
||||
let capacity = 1024
|
||||
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
|
||||
defer { buf.deallocate() }
|
||||
var data = Data()
|
||||
while true {
|
||||
let count = recv(sock, buf, capacity, 0)
|
||||
guard count != -1 else {
|
||||
throw Error.networkError(errno: errno)
|
||||
}
|
||||
data.append(buf, count: count)
|
||||
if count < capacity {
|
||||
break
|
||||
}
|
||||
}
|
||||
return data
|
||||
}
|
||||
|
||||
private func connectionInfo() throws -> ConnectionInfo {
|
||||
if let connectionInfo = _connectionInfo { return connectionInfo }
|
||||
|
||||
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
|
||||
|
||||
let id = deviceInfo.deviceID
|
||||
write(socketFd, id, strlen(id) + 1) // include null
|
||||
let clientInfo = deviceInfo.clientInfo.clientString
|
||||
write(socketFd, clientInfo, strlen(clientInfo) + 1)
|
||||
|
||||
let initialData = try readAll(fromSocket: socketFd)
|
||||
guard let string = String(data: initialData, encoding: .utf8)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
|
||||
let components = string.split(separator: "\r\n")
|
||||
guard components.count == 4 else { throw Error.invalidAnisetteData }
|
||||
|
||||
let connectionInfo = ConnectionInfo(
|
||||
socketFd: socketFd,
|
||||
machineID: String(components[0]),
|
||||
localUserID: String(components[1]),
|
||||
routingInfo: String(components[2]),
|
||||
firstOTP: String(components[3])
|
||||
)
|
||||
_connectionInfo = connectionInfo
|
||||
return connectionInfo
|
||||
}
|
||||
|
||||
private func rawAnisetteData() throws -> RawAnisetteData {
|
||||
let info = try connectionInfo()
|
||||
if !hasUsedFirstOTP {
|
||||
return RawAnisetteData(
|
||||
machineID: info.machineID,
|
||||
localUserID: info.localUserID,
|
||||
routingInfo: info.routingInfo,
|
||||
oneTimePassword: info.firstOTP
|
||||
)
|
||||
}
|
||||
|
||||
write(info.socketFd, "a\n", 3)
|
||||
let response = try readAll(fromSocket: info.socketFd)
|
||||
guard let otp = String(data: response, encoding: .utf8)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
return RawAnisetteData(
|
||||
machineID: info.machineID,
|
||||
localUserID: info.localUserID,
|
||||
routingInfo: info.routingInfo,
|
||||
oneTimePassword: otp
|
||||
)
|
||||
}
|
||||
|
||||
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
|
||||
let time = Date()
|
||||
|
||||
let raw: RawAnisetteData
|
||||
let routingInfo: UInt64
|
||||
do {
|
||||
raw = try rawAnisetteData()
|
||||
guard let rinfo = UInt64(raw.routingInfo)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
routingInfo = rinfo
|
||||
} catch {
|
||||
return completion(.failure(error))
|
||||
}
|
||||
|
||||
let anisette = AnisetteData(
|
||||
clientTime: time,
|
||||
routingInfo: routingInfo,
|
||||
machineID: raw.machineID,
|
||||
localUserID: raw.localUserID,
|
||||
oneTimePassword: raw.oneTimePassword
|
||||
)
|
||||
|
||||
completion(.success(anisette))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// Provides Anisette Data by making a request to a TCP server
|
||||
public class TCPAnisetteDataProvider: AnisetteDataProvider {
|
||||
|
||||
public enum Error: Swift.Error {
|
||||
/// The user is probably not running anisettehelperd on the host machine
|
||||
case helperUnreachable
|
||||
case invalidAnisetteData
|
||||
}
|
||||
|
||||
public let ip: String
|
||||
public let port: UInt16
|
||||
|
||||
public init(ip: String, port: UInt16) {
|
||||
self.ip = ip
|
||||
self.port = port
|
||||
}
|
||||
|
||||
public convenience init(localPort port: UInt16) {
|
||||
self.init(ip: "0.0.0.0", port: port)
|
||||
}
|
||||
|
||||
private func rawAnisetteData() throws -> Data {
|
||||
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
|
||||
|
||||
let capacity = 1024
|
||||
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
|
||||
defer { buf.deallocate() }
|
||||
var data = Data()
|
||||
while true {
|
||||
let count = recv(socketFd, buf, capacity, 0)
|
||||
// swiftlint:disable:next empty_count
|
||||
guard count != 0 else { break }
|
||||
data.append(buf, count: count)
|
||||
}
|
||||
|
||||
return data
|
||||
}
|
||||
|
||||
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
|
||||
let time = Date()
|
||||
|
||||
let rawDeserialized: Any
|
||||
do {
|
||||
let raw = try rawAnisetteData()
|
||||
rawDeserialized = try PropertyListSerialization.propertyList(from: raw, format: nil)
|
||||
} catch {
|
||||
return completion(.failure(error))
|
||||
}
|
||||
|
||||
guard let data = rawDeserialized as? [String: Any],
|
||||
let rinfoString = data[AnisetteData.routingInfoKey] as? String,
|
||||
let rinfo = UInt64(rinfoString),
|
||||
let machineID = data[AnisetteData.machineIDKey] as? String,
|
||||
let localUserID = data[AnisetteData.localUserIDKey] as? String,
|
||||
let oneTimePassword = data[AnisetteData.oneTimePasswordKey] as? String
|
||||
else { return completion(.failure(Error.invalidAnisetteData)) }
|
||||
|
||||
completion(.success(AnisetteData(
|
||||
clientTime: time,
|
||||
routingInfo: rinfo,
|
||||
machineID: machineID,
|
||||
localUserID: localUserID,
|
||||
oneTimePassword: oneTimePassword
|
||||
)))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -6,10 +6,9 @@ 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://ani.sidestore.io")! // URL(string: "http://localhost:6969")!
|
||||
url: URL = URL(string: "https://mac-ani.jkcoxson.com")!
|
||||
) {
|
||||
self.url = url
|
||||
}
|
||||
@@ -28,15 +27,19 @@ struct OmnisetteADIProvider: RawADIProvider {
|
||||
return encoder
|
||||
}()
|
||||
|
||||
func clientInfo() async throws -> String {
|
||||
func clientInfo() async throws -> ClientInfoWithUserAgent {
|
||||
struct ClientInfo: Decodable {
|
||||
let clientInfo: String
|
||||
let userAgent: String
|
||||
}
|
||||
let body = try await client.makeRequest(
|
||||
HTTPRequest(url: url.appendingPathComponent("v3/client_info"))
|
||||
).body
|
||||
let clientInfo = try Self.decoder.decode(ClientInfo.self, from: body)
|
||||
return clientInfo.clientInfo
|
||||
return ClientInfoWithUserAgent(
|
||||
clientInfo: clientInfo.clientInfo,
|
||||
akdUserAgent: clientInfo.userAgent,
|
||||
)
|
||||
}
|
||||
|
||||
func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
|
||||
|
||||
@@ -1,196 +0,0 @@
|
||||
#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
|
||||
@@ -15,37 +15,34 @@ 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(deviceInfo: deviceInfo, anisetteData: anisetteData)
|
||||
var httpRequest = HTTPRequest(method: method.httpMethod, url: url)
|
||||
let content = request.content(anisetteData: anisetteData)
|
||||
var httpRequest = HTTPRequest(method: content.httpMethod, url: url)
|
||||
httpRequest.headerFields[.contentType] = "text/x-xml-plist"
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
let body: Data? = switch method {
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = anisetteData.deviceInfo.clientInfo
|
||||
let body: Data? = switch content {
|
||||
case .get:
|
||||
nil
|
||||
case .post(let body):
|
||||
case .data(let body, _, .xml):
|
||||
try PropertyListSerialization.data(
|
||||
fromPropertyList: body, format: .xml, options: 0
|
||||
)
|
||||
case .data(let body, _, .json):
|
||||
try JSONSerialization.data(withJSONObject: body)
|
||||
}
|
||||
request.configure(request: &httpRequest, deviceInfo: deviceInfo, anisetteData: anisetteData)
|
||||
request.configure(request: &httpRequest, 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
|
||||
let resp = try await httpClient.withEphemeralClient {
|
||||
try await $0.makeRequest(httpRequest, body: body)
|
||||
}
|
||||
let resp = try await httpClient.makeRequest(httpRequest, body: body, ephemeral: true)
|
||||
return try R.Decoder.decode(data: resp.body)
|
||||
}
|
||||
|
||||
|
||||
@@ -21,34 +21,28 @@ actor GrandSlamLookupManager {
|
||||
private let decoder = PropertyListDecoder()
|
||||
private var endpoints: GrandSlamEndpoints?
|
||||
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
init() {}
|
||||
|
||||
private func performLookup() async throws -> GrandSlamEndpoints {
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
let deviceInfo = try await anisetteDataProvider.deviceInfo()
|
||||
|
||||
/* {
|
||||
"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.clientInfo.userAgent,
|
||||
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
|
||||
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
|
||||
.userAgent: deviceInfo.akdUserAgent,
|
||||
.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
|
||||
|
||||
let (_, body) = try await httpClient.makeRequest(request)
|
||||
for (key, value) in deviceInfo.dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
|
||||
let (_, body) = try await httpClient.makeRequest(request, ephemeral: true)
|
||||
|
||||
return try self.decoder.decode(Response.self, from: body).urls
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import XUtils
|
||||
import Foundation
|
||||
|
||||
public protocol TwoFactorAuthDelegate: AnyObject, Sendable {
|
||||
@@ -26,12 +27,20 @@ struct GrandSlamTwoFactorAuthenticateOperation {
|
||||
|
||||
private func performSMSAuth() async throws {
|
||||
// TODO: parse phone number list from o=complete req?
|
||||
let phoneNumberID = "1"
|
||||
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
|
||||
let phoneNumberID = 1
|
||||
do {
|
||||
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
|
||||
} catch let error as HTTPResponseError where error.status.code == 403 {
|
||||
d.out.print("""
|
||||
warning: Could not send verification code via SMS. Falling back to trusted device authentication...
|
||||
""")
|
||||
try await performTrustedDeviceAuth()
|
||||
return
|
||||
}
|
||||
try await validateCode(phoneNumberID: phoneNumberID)
|
||||
}
|
||||
|
||||
private func validateCode(phoneNumberID: String? = nil) async throws {
|
||||
private func validateCode(phoneNumberID: Int? = nil) async throws {
|
||||
guard let code = await self.delegate.fetchCode() else { throw Error.userCancelled }
|
||||
let request: any GrandSlamRequest = if let phoneNumberID {
|
||||
GrandSlamValidateSMSRequest(
|
||||
@@ -51,7 +60,14 @@ struct GrandSlamTwoFactorAuthenticateOperation {
|
||||
|
||||
private func performTrustedDeviceAuth() async throws {
|
||||
let request = GrandSlamTrustedDeviceRequest(loginData: loginData)
|
||||
try await client.send(request)
|
||||
do {
|
||||
try await client.send(request)
|
||||
} catch let error as HTTPResponseError where error.status.code == 403 {
|
||||
d.out.print("""
|
||||
warning: Could not send verification code. Generate one manually.
|
||||
See https://github.com/xtool-org/xtool/discussions/368
|
||||
""")
|
||||
}
|
||||
try await validateCode()
|
||||
}
|
||||
|
||||
|
||||
@@ -35,16 +35,22 @@ struct GrandSlamSMSAuthRequest: GrandSlamTwoFactorRequest {
|
||||
static func decode(data: Data) throws {}
|
||||
}
|
||||
|
||||
static let endpoint: GrandSlamEndpoint = .url(URL(string: "https://gsa.apple.com/auth/verify/phone/put?mode=sms")!)
|
||||
static let endpoint: GrandSlamEndpoint = .url(URL(string: "https://gsa.apple.com/auth/verify/phone")!)
|
||||
|
||||
let loginData: GrandSlamLoginData
|
||||
let phoneNumberID: String
|
||||
let phoneNumberID: Int
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
.post([
|
||||
"serverInfo": [
|
||||
"phoneNumber.id": phoneNumberID
|
||||
],
|
||||
])
|
||||
var extraHeaders: [String: String] {
|
||||
[
|
||||
"Content-Type": "application/json",
|
||||
"Accept": "application/json",
|
||||
]
|
||||
}
|
||||
|
||||
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
|
||||
.put([
|
||||
"phoneNumber": ["id": phoneNumberID],
|
||||
"mode": "sms",
|
||||
], type: .json)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,20 +29,25 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
|
||||
}
|
||||
|
||||
static let endpoint: GrandSlamEndpoint = .url(URL(
|
||||
string: "https://gsa.apple.com/auth/verify/phone/securitycode?referrer=/auth/verify/phone/put"
|
||||
string: "https://gsa.apple.com/auth/verify/phone/securitycode"
|
||||
)!)
|
||||
|
||||
let loginData: GrandSlamLoginData
|
||||
let phoneNumberID: String
|
||||
let phoneNumberID: Int
|
||||
let verificationCode: String
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
var extraHeaders: [String: String] {
|
||||
[
|
||||
"Content-Type": "application/json",
|
||||
"Accept": "application/json",
|
||||
]
|
||||
}
|
||||
|
||||
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
|
||||
.post([
|
||||
"securityCode.code": verificationCode,
|
||||
"serverInfo": [
|
||||
"mode": "sms",
|
||||
"phoneNumber.id": phoneNumberID
|
||||
]
|
||||
])
|
||||
"securityCode": ["code": verificationCode],
|
||||
"phoneNumber": ["id": phoneNumberID],
|
||||
"mode": "sms",
|
||||
], type: .json)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,12 +69,12 @@ extension GrandSlamOperationRequest {
|
||||
|
||||
static var endpoint: GrandSlamEndpoint { .lookup(\.gsService) }
|
||||
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
|
||||
request.headerFields[.accept] = "*/*"
|
||||
request.headerFields[.userAgent] = deviceInfo.clientInfo.userAgent
|
||||
request.headerFields[.userAgent] = anisetteData.deviceInfo.akdUserAgent
|
||||
}
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
|
||||
var clientData: [String: Any] = [
|
||||
"bootstrap": true,
|
||||
"icscrec": true,
|
||||
@@ -83,7 +83,6 @@ 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] = [
|
||||
|
||||
@@ -7,15 +7,29 @@
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import HTTPTypes
|
||||
|
||||
enum GrandSlamRequestContent {
|
||||
enum ContentType {
|
||||
case xml
|
||||
case json
|
||||
}
|
||||
|
||||
enum GrandSlamMethod {
|
||||
case get
|
||||
case post([String: Any])
|
||||
case data([String: Any], method: HTTPRequest.Method, type: ContentType = .xml)
|
||||
|
||||
static func post(_ body: [String: Any], type: ContentType = .xml) -> Self {
|
||||
.data(body, method: .post, type: type)
|
||||
}
|
||||
|
||||
static func put(_ body: [String: Any], type: ContentType = .xml) -> Self {
|
||||
.data(body, method: .put, type: type)
|
||||
}
|
||||
|
||||
var httpMethod: HTTPRequest.Method {
|
||||
switch self {
|
||||
case .get: return .get
|
||||
case .post: return .post
|
||||
case .data(_, let method, _): return method
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -30,6 +44,6 @@ protocol GrandSlamRequest: Sendable {
|
||||
|
||||
static var endpoint: GrandSlamEndpoint { get }
|
||||
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData)
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData)
|
||||
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent
|
||||
}
|
||||
|
||||
@@ -17,9 +17,10 @@ extension GrandSlamTwoFactorRequest {
|
||||
|
||||
var extraHeaders: [String: String] { [:] }
|
||||
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
|
||||
request.headerFields[.accept] = "application/x-buddyml"
|
||||
request.headerFields[.contentType] = "application/x-plist"
|
||||
request.headerFields[.userAgent] = anisetteData.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
|
||||
@@ -27,7 +28,7 @@ extension GrandSlamTwoFactorRequest {
|
||||
extraHeaders.forEach { request.headerFields[.init($0)!] = $1 }
|
||||
}
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
|
||||
.get
|
||||
}
|
||||
|
||||
|
||||
@@ -35,11 +35,13 @@ private struct Client: HTTPClientProtocol {
|
||||
}
|
||||
|
||||
private static let tlsConfiguration: TLSConfiguration = {
|
||||
// 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)
|
||||
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)
|
||||
}
|
||||
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates(appleRoots)]
|
||||
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
|
||||
tlsConfiguration.certificateVerification = .none
|
||||
}
|
||||
@@ -136,6 +138,17 @@ 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
|
||||
@@ -166,4 +179,59 @@ 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
|
||||
|
||||
@@ -46,8 +46,21 @@ extension HTTPClientProtocol {
|
||||
_ request: HTTPRequest,
|
||||
body: Data? = nil,
|
||||
requireHTTPSuccess: Bool = true,
|
||||
ephemeral: Bool = false,
|
||||
onProgress: @isolated(any) (Double?) -> Void = { _ in }
|
||||
) async throws -> (response: HTTPResponse, body: Data) {
|
||||
if ephemeral {
|
||||
return try await self.withEphemeralClient { client in
|
||||
try await client.makeRequest(
|
||||
request,
|
||||
body: body,
|
||||
requireHTTPSuccess: requireHTTPSuccess,
|
||||
ephemeral: false,
|
||||
onProgress: onProgress
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
await onProgress(0)
|
||||
let (response, responseBody) = try await send(request, body: body.map { HTTPBody($0) })
|
||||
guard !requireHTTPSuccess || ![.clientError, .serverError].contains(response.status.kind) else {
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import XUtils
|
||||
import SwiftyMobileDevice
|
||||
|
||||
public final class ProfileManager {
|
||||
@@ -53,16 +54,16 @@ public final class ProfileManager {
|
||||
|
||||
for (bundleID, profiles) in toInstall {
|
||||
guard profiles.count == 1 else {
|
||||
print("Unexpected # of profiles for \(bundleID): \(profiles.count). Skipping.")
|
||||
d.out.print("Unexpected # of profiles for \(bundleID): \(profiles.count). Skipping.")
|
||||
continue
|
||||
}
|
||||
let profile = profiles[0]
|
||||
let installedProfiles = installed[bundleID] ?? []
|
||||
for installedProfile in installedProfiles {
|
||||
print("Removing \(installedProfile.1.uuid) for \(bundleID)")
|
||||
d.out.print("Removing \(installedProfile.1.uuid) for \(bundleID)")
|
||||
try client.removeProfile(withUUID: installedProfile.1.uuid)
|
||||
}
|
||||
print("Installing profile with UUID \(profile.1.uuid)")
|
||||
d.out.print("Installing profile with UUID \(profile.1.uuid)")
|
||||
try client.install(profile: profile.0.data())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -294,7 +294,7 @@ public actor IntegratedInstaller {
|
||||
app: URL,
|
||||
targetDevice: SigningContext.TargetDevice? = nil,
|
||||
) async throws -> String {
|
||||
let context = try SigningContext(
|
||||
let context = SigningContext(
|
||||
auth: auth,
|
||||
targetDevice: targetDevice,
|
||||
)
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
//
|
||||
// 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))
|
||||
}
|
||||
}
|
||||
@@ -57,12 +57,23 @@ public struct Certificate: Codable, Sendable {
|
||||
}
|
||||
|
||||
public func serialNumber() -> String {
|
||||
// big endian, hex-encoded
|
||||
let content = raw.serialNumber.bytes.lazy
|
||||
// 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 }
|
||||
.map { String(format: "%02hhX", $0) }
|
||||
.joined()
|
||||
.drop { $0 == "0" }
|
||||
return String(content)
|
||||
}
|
||||
|
||||
/// 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())
|
||||
}
|
||||
|
||||
public func wasIssuedBefore(_ other: Certificate) -> Bool {
|
||||
|
||||
@@ -29,6 +29,7 @@ extension EntitlementContainer {
|
||||
WiFiAwareEntitlement.self,
|
||||
HomeKitEntitlement.self,
|
||||
HealthKitEntitlement.self,
|
||||
AppleSignInEntitlement.self,
|
||||
]
|
||||
}
|
||||
|
||||
@@ -99,6 +100,21 @@ public struct AssociatedDomainsEntitlement: Entitlement, RawRepresentable {
|
||||
}
|
||||
}
|
||||
|
||||
public struct AppleSignInEntitlement: Entitlement, RawRepresentable {
|
||||
public static let identifier = "com.apple.developer.applesignin"
|
||||
|
||||
public var rawValue: [String]
|
||||
public init(rawValue: [String]) { self.rawValue = rawValue }
|
||||
|
||||
public init(from decoder: Decoder) throws {
|
||||
rawValue = try decoder.singleValueContainer().decode([String].self)
|
||||
}
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.singleValueContainer()
|
||||
try container.encode(rawValue)
|
||||
}
|
||||
}
|
||||
|
||||
public enum APSEnvironmentEntitlement: String, Entitlement {
|
||||
public static let identifier = "aps-environment"
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
import Foundation
|
||||
import Dependencies
|
||||
|
||||
/// Provisions and codesigns.
|
||||
public struct AutoSigner {
|
||||
|
||||
@Dependency(\.signer) private var signer
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case noSigners
|
||||
case errorReading(String)
|
||||
case errorWriting(String)
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
case .noSigners:
|
||||
return NSLocalizedString("signer.error.no_signers", value: "No signers found", comment: "")
|
||||
case .errorReading(let file):
|
||||
return "\(file)".withCString {
|
||||
String.localizedStringWithFormat(
|
||||
@@ -82,13 +82,16 @@ public struct AutoSigner {
|
||||
try info.mobileprovision.data().write(to: profURL)
|
||||
}
|
||||
|
||||
let entitlements = provisioningDict.mapValues(\.entitlements)
|
||||
let encoder = PropertyListEncoder()
|
||||
encoder.outputFormat = .xml
|
||||
let entitlements = try provisioningDict.mapValues { try encoder.encode($0.entitlements) }
|
||||
|
||||
status(NSLocalizedString("signer.signing", value: "Signing", comment: ""))
|
||||
try await context.signer.sign(
|
||||
try await signer.sign(
|
||||
app: app,
|
||||
identity: .real(signingInfo.certificate, signingInfo.privateKey),
|
||||
entitlementMapping: entitlements,
|
||||
deep: true,
|
||||
progress: progress
|
||||
)
|
||||
progress(1)
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
import Foundation
|
||||
import RCodesign
|
||||
|
||||
public actor RCodesignSigner: Signer {
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case badFilePath
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
case .badFilePath:
|
||||
return NSLocalizedString(
|
||||
"signer_impl.error.bad_file_path", value: "A bad file path was provided", comment: ""
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public init() {}
|
||||
|
||||
public func sign(
|
||||
app: URL,
|
||||
identity: SignerIdentity,
|
||||
entitlementMapping: [URL: Data],
|
||||
deep: Bool,
|
||||
progress: @escaping @Sendable (Double?) -> Void
|
||||
) throws {
|
||||
progress(nil)
|
||||
guard app.isFileURL else { throw Error.badFilePath }
|
||||
let root = app.standardizedFileURL.pathComponents
|
||||
var entitlements: [String: Data] = [:]
|
||||
for (bundle, value) in entitlementMapping {
|
||||
let components = bundle.standardizedFileURL.pathComponents
|
||||
guard bundle.isFileURL, components.starts(with: root) else { throw Error.badFilePath }
|
||||
// RCodesign scopes entitlements by bundle-relative path: "" for the
|
||||
// app itself and e.g. "PlugIns/Widget.appex" for an extension. Compare
|
||||
// path components so a sibling such as App.app-copy cannot match App.app.
|
||||
let path = components.dropFirst(root.count).joined(separator: "/")
|
||||
guard entitlements[path] == nil else { throw Error.badFilePath }
|
||||
entitlements[path] = value
|
||||
}
|
||||
|
||||
let signingIdentity: RCodesign.Identity
|
||||
switch identity {
|
||||
case .real(let certificate, let privateKey):
|
||||
signingIdentity = .certificate(certificateDER: try certificate.data(), privateKeyPEM: privateKey.data)
|
||||
case .adhoc:
|
||||
signingIdentity = .adHoc
|
||||
}
|
||||
try RCodesign.sign(at: app, identity: signingIdentity, options: .init(entitlements: entitlements, shallow: !deep))
|
||||
}
|
||||
|
||||
public func analyze(executable: URL) throws -> Data? {
|
||||
try RCodesign.entitlements(at: executable)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
import Foundation
|
||||
import Dependencies
|
||||
|
||||
public enum SignerIdentity: Sendable {
|
||||
case real(Certificate, PrivateKey)
|
||||
case adhoc
|
||||
}
|
||||
|
||||
public protocol Signer: Sendable {
|
||||
// entitlementMapping is [bundle url] -> [plist data]
|
||||
func sign(
|
||||
app: URL,
|
||||
identity: SignerIdentity,
|
||||
entitlementMapping: [URL: Data],
|
||||
deep: Bool,
|
||||
progress: @escaping @Sendable (Double?) -> Void
|
||||
) async throws
|
||||
|
||||
func analyze(executable: URL) async throws -> Data?
|
||||
}
|
||||
|
||||
private enum SignerDependencyKey: DependencyKey {
|
||||
static var liveValue: any Signer { RCodesignSigner() }
|
||||
static var testValue: any Signer { UnimplementedSigner() }
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
public var signer: any Signer {
|
||||
get { self[SignerDependencyKey.self] }
|
||||
set { self[SignerDependencyKey.self] = newValue }
|
||||
}
|
||||
}
|
||||
|
||||
private struct UnimplementedSigner: Signer {
|
||||
func sign(
|
||||
app: URL,
|
||||
identity: SignerIdentity,
|
||||
entitlementMapping: [URL: Data],
|
||||
deep: Bool,
|
||||
progress: @escaping @Sendable (Double?) -> Void
|
||||
) async throws {
|
||||
let operation: () throws -> Void = unimplemented()
|
||||
try operation()
|
||||
}
|
||||
|
||||
func analyze(executable: URL) async throws -> Data? {
|
||||
let operation: () throws -> Data? = unimplemented()
|
||||
return try operation()
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user