Compare commits

..

3 Commits

183 changed files with 1936 additions and 6606 deletions
+2 -2
View File
@@ -8,10 +8,10 @@
## AI tool usage
How much of the code in this PR was AI-assisted? (check one)
How much of this PR was AI-assisted? (check one)
- [ ] **0** - No AI was used to write code
- [ ] **1** - I was assisted by AI in writing code. I reviewed the finished result.
- [ ] **1** - I was assisted by AI. 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. -->
+1 -1
View File
@@ -6,4 +6,4 @@ runs:
- name: Set up Xcode
shell: bash
run: |
sudo xcode-select -s /Applications/Xcode_27.1.0.app
sudo xcode-select -s /Applications/Xcode_26.4.app
+2 -2
View File
@@ -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: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
@@ -39,7 +39,7 @@ jobs:
run: |
swift test
build-ios:
runs-on: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
+1 -2
View File
@@ -36,7 +36,7 @@ jobs:
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
build-mac:
runs-on: xcode-27
runs-on: macos-26
permissions:
contents: write
steps:
@@ -57,7 +57,6 @@ 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
-1
View File
@@ -13,4 +13,3 @@ DerivedData/
/openapi
/.tmp
/xtool
-7
View File
@@ -1,7 +0,0 @@
{
"swiftPM": {
"buildSystem": "swiftbuild",
"scratchPath": ".build/index-build"
},
"backgroundIndexing": true
}
+8 -10
View File
@@ -1,4 +1,4 @@
swiftlint_version: 0.65.1
swiftlint_version: 0.59.1
disabled_rules:
- trailing_comma
- nesting
@@ -42,19 +42,17 @@ 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
+1 -4
View File
@@ -13,7 +13,4 @@ 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 (`@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.
- Use swift-dependencies for Dependency Injection. Passing dependencies around as arguments is an anti-pattern.
+2 -4
View File
@@ -1,9 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
ARG SWIFT_VERSION=6.4.2
FROM swift:${SWIFT_VERSION}-jammy AS build-base
FROM swift:6.3-jammy AS build-base
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -104,7 +102,7 @@ RUN swift package resolve
ADD . /xtool
RUN ./Linux/build.sh
FROM swift:${SWIFT_VERSION} AS xtool
FROM swift:6.3 AS xtool
COPY --from=build-xtool /xtool/Linux/packages/xtool-*.AppImage /xtool/xtool.AppImage
RUN (cd /xtool && ./xtool.AppImage --appimage-extract) \
+1 -1
View File
@@ -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 `XDG_CACHE_HOME` on Linux.
- `XTL_TMPDIR`: Control the location where xtool stores temporary directories. We also respect `TMPDIR` and (on Linux) `XDG_CACHE_HOME`.
### Networking
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -12,7 +12,7 @@ Finished generating project Hello.
Developer$
Hello$
-rw-rw-r-- 1 user user 187 .gitignore
drwxrwxr-x 2 user user 4096 .bsp
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
-rw-rw-r-- 1 user user 463 Package.swift
drwxrwxr-x 3 user user 4096 Sources
-rw-rw-r-- 1 user user 39 xtool.yml
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -12,7 +12,7 @@ Finished generating project Hello.
Developer$ cd Hello
Hello$ ls -la
-rw-rw-r-- 1 user user 187 .gitignore
drwxrwxr-x 2 user user 4096 .bsp
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
-rw-rw-r-- 1 user user 463 Package.swift
drwxrwxr-x 3 user user 4096 Sources
-rw-rw-r-- 1 user user 39 xtool.yml
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -12,7 +12,7 @@ Finished generating project Hello.
Developer$ cd Hello
Hello$ ls -la
-rw-rw-r-- 1 user user 187 .gitignore
drwxrwxr-x 2 user user 4096 .bsp
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
-rw-rw-r-- 1 user user 463 Package.swift
drwxrwxr-x 3 user user 4096 Sources
-rw-rw-r-- 1 user user 39 xtool.yml
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -12,7 +12,7 @@ Finished generating project Hello.
Developer$ cd Hello
Hello$ ls -la
-rw-rw-r-- 1 user user 187 .gitignore
drwxrwxr-x 2 user user 4096 .bsp
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
-rw-rw-r-- 1 user user 463 Package.swift
drwxrwxr-x 3 user user 4096 Sources
-rw-rw-r-- 1 user user 39 xtool.yml
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -12,7 +12,7 @@ Finished generating project Hello.
Developer$ cd Hello
Hello$ ls -la
-rw-rw-r-- 1 user user 187 .gitignore
drwxrwxr-x 2 user user 4096 .bsp
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
-rw-rw-r-- 1 user user 463 Package.swift
drwxrwxr-x 3 user user 4096 Sources
-rw-rw-r-- 1 user user 39 xtool.yml
@@ -3,7 +3,7 @@ Creating package: Hello
Creating Package.swift
Creating xtool.yml
Creating .gitignore
Creating .bsp/xtool.json
Creating .sourcekit-lsp/config.json
Creating Sources/Hello/HelloApp.swift
Creating Sources/Hello/ContentView.swift
@@ -12,7 +12,7 @@ Finished generating project Hello.
Developer$ cd Hello
Hello$ ls -la
-rw-rw-r-- 1 user user 187 .gitignore
drwxrwxr-x 2 user user 4096 .bsp
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
-rw-rw-r-- 1 user user 463 Package.swift
drwxrwxr-x 3 user user 4096 Sources
-rw-rw-r-- 1 user user 39 xtool.yml
@@ -21,9 +21,5 @@ Hello$ cat xtool.yml
version: 1
bundleID: com.example.Hello
Hello$ cat .bsp/xtool.json
{
"name": "xtool",
...
"argv": ["/usr/bin/env", "xtool", "dev", "build-server"]
}
Hello$ cat .sourcekit-lsp/config.json
{ "swiftPM": { "swiftSDK": "arm64-apple-ios" } }
+2 -2
View File
@@ -30,9 +30,9 @@
}
@Step {
Read `.bsp/xtool.json`.
Read `.sourcekit-lsp/config.json`.
This file tells your IDE to ask xtool for build information (via the Build Server Protocol). It enables features like syntax highlighting and documentation lookup.
This file tells SourceKit to build for the `arm64-apple-ios` system defined in `darwin.artifactbundle`. This is the [Swift SDK](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0387-cross-compilation-destinations.md) that we built during the setup process. It contains the necessary modules for building iOS apps, such as UIKit and SwiftUI, as well as tools for building and manipulating iOS binaries. Under the hood, xtool also calls `swift build` with `--swift-sdk arm64-apple-ios` for the same reason.
@Code(name: "Terminal", file: "template-4b.sh", previousFile: "template-4a.sh") {}
}
@@ -22,14 +22,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft'
### Swift
Install the Swift 6.4 toolchain for your Linux distribution from <https://swift.org/install/linux>.
Install the Swift 6.3 toolchain for your Linux distribution from <https://swift.org/install/linux>.
After following the steps there, confirm that Swift is installed correctly:
```bash
swift --version
# should say something like:
# Swift version 6.4 (swift-6.4-RELEASE)
# Swift version 6.3 (swift-6.3-RELEASE)
```
### usbmuxd
@@ -68,7 +68,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
Download **Xcode 27.1** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
Download **Xcode 26** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
> Note:
>
@@ -131,7 +131,7 @@ Choice (0-1): 0
Path to Xcode.xip:
```
Enter the path (for example `~/Downloads/Xcode_27.1.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Enter the path (for example `~/Downloads/Xcode_16.3.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Confirm that it worked:
-6
View File
@@ -1,6 +0,0 @@
.DS_Store
.build
.swiftpm
*/xtool
*/.bsp
/out
-29
View File
@@ -1,29 +0,0 @@
// 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"),
]
),
]
)
@@ -1,12 +0,0 @@
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)")
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoDynamic
-33
View File
@@ -1,33 +0,0 @@
// 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"),
]
)
@@ -1,4 +0,0 @@
import SwiftUI
import ExampleSupport
@main struct DemoApp: ExampleApp {}
@@ -1,51 +0,0 @@
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)
))
}
}
}
@@ -1,11 +0,0 @@
<?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>
-6
View File
@@ -1,6 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoExtensions
product: DemoExtensions
extensions:
- product: DemoExtensionsWidget
infoPath: Support/DemoExtensionsWidget-Info.plist
-31
View File
@@ -1,31 +0,0 @@
// 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"),
]
),
]
)
-1
View File
@@ -1 +0,0 @@
Top level resource
@@ -1,34 +0,0 @@
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)")
}
}
@@ -1 +0,0 @@
Bundled resource
-4
View File
@@ -1,4 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoResources
resources:
- Resources/top.txt
-28
View File
@@ -1,28 +0,0 @@
// 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",
]
),
]
)
@@ -1,26 +0,0 @@
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()
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoSimple
-141
View File
@@ -1,141 +0,0 @@
{
"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
}
-33
View File
@@ -1,33 +0,0 @@
// 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"),
],
),
]
)
@@ -1,24 +0,0 @@
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()
}
}
}
@@ -1,31 +0,0 @@
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
}
}
}
}
@@ -1,15 +0,0 @@
import SwiftUI
import ComposableArchitecture
@main
struct DemoTCAApp: App {
private let store = Store(initialState: CounterFeature.State()) {
CounterFeature()
}
var body: some Scene {
WindowGroup {
ContentView(store: store)
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoTCA
-31
View File
@@ -1,31 +0,0 @@
// 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"),
]
),
]
)
@@ -1,9 +0,0 @@
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)"
}
@@ -1 +0,0 @@
from the dynamic library
@@ -1,25 +0,0 @@
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()
}
}
}
@@ -1,12 +0,0 @@
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)
}
}
}
-14
View File
@@ -1,14 +0,0 @@
# 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
-118
View File
@@ -1,118 +0,0 @@
#!/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
View File
@@ -13,7 +13,7 @@ fi
rm -rf staging/tmp
mkdir -p staging/tmp staging/linuxdeploy
swift build --package-path .. -c release --product xtool
swift build --package-path .. -c release --product xtool --static-swift-stdlib
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' -or -name '*.bundle' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
find "${bin}"/ -name '*.resources' -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"
+1 -2
View File
@@ -132,8 +132,7 @@ docs-preview:
SWIFTLINT_VERSION = $(shell head -1 .swiftlint.yml | cut -d' ' -f2)
SWIFTLINT_BIN = .tmp/swiftlint/swiftlint-$(SWIFTLINT_VERSION)
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
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux).zip
.PHONY: lint
lint: $(SWIFTLINT_BIN)
+140 -113
View File
@@ -1,13 +1,13 @@
{
"originHash" : "2ccd077fc130f0f1b1279d87aa61d1fc243964d7ad49489a12021577c54df9de",
"originHash" : "699acd851f15c2680059dd4a90ef6f0aca240fda0f5bdda5ec4156ff0df44adf",
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
"revision" : "dd9206de0717d658daec6a064992894fdab8ae17",
"version" : "4.7.3"
"revision" : "db806756c989760b35108146381535aec231092b",
"version" : "4.7.0"
}
},
{
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
"version" : "1.36.2"
"revision" : "3a5b74a58782c3b4c1f0bc75e9b67b10c2494e8f",
"version" : "1.33.1"
}
},
{
@@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt",
"state" : {
"revision" : "63feef7820abb1a8fb08587d7da56bb0b7db8751",
"version" : "6.0.1"
"revision" : "e07e00fa1fd435143a2dcf8b7eec9a7710b2fdfe",
"version" : "5.7.0"
}
},
{
@@ -33,8 +33,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
"version" : "1.2.2"
"revision" : "dcccb979a2183b8df3334237e3dc1ae2b4116a86",
"version" : "1.2.0"
}
},
{
"identity" : "jsonutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
"state" : {
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
"version" : "4.2.0"
}
},
{
@@ -42,17 +51,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattpolzin/OpenAPIKit",
"state" : {
"revision" : "5b72eb9a6b23b1fec439d9a0bf38f115400421f9",
"version" : "6.4.0"
}
},
{
"identity" : "opencombine",
"kind" : "remoteSourceControl",
"location" : "https://github.com/OpenCombine/OpenCombine.git",
"state" : {
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
"version" : "0.14.0"
"revision" : "57b6318128e3f901c93f4fbf98d1c1464ec168d3",
"version" : "6.2.0"
}
},
{
@@ -64,6 +64,15 @@
"version" : "1.0.1"
}
},
{
"identity" : "rainbow",
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
"revision" : "cdf146ae671b2624917648b61c908d1244b98ca1",
"version" : "4.2.1"
}
},
{
"identity" : "spectre",
"kind" : "remoteSourceControl",
@@ -85,10 +94,10 @@
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382",
"version" : "1.8.2"
"revision" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b",
"version" : "1.7.1"
}
},
{
@@ -96,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
"revision" : "3b6410f7dee09eb33cdd26260c5fd47fda19b0e2",
"version" : "1.7.3"
"revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab",
"version" : "1.7.0"
}
},
{
@@ -105,8 +114,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
"version" : "1.1.7"
"revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
"version" : "1.1.3"
}
},
{
@@ -114,8 +123,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34",
"version" : "1.3.1"
"revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
"version" : "1.3.0"
}
},
{
@@ -123,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-certificates",
"state" : {
"revision" : "ff86b924ead66f853b8baf91f3c41926a8f36177",
"version" : "1.21.0"
"revision" : "bde8ca32a096825dfce37467137c903418c1893d",
"version" : "1.19.1"
}
},
{
@@ -132,8 +141,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-clocks",
"state" : {
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
"version" : "1.1.1"
"revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
"version" : "1.0.6"
}
},
{
@@ -141,8 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
"version" : "1.7.3"
"revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
"version" : "1.5.1"
}
},
{
@@ -150,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
"version" : "1.4.3"
"revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
"version" : "1.3.2"
}
},
{
@@ -159,8 +168,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-configuration.git",
"state" : {
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
"version" : "1.2.2"
"revision" : "be76c4ad929eb6c4bcaf3351799f2adf9e6848a9",
"version" : "1.2.0"
}
},
{
@@ -168,17 +177,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
"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"
"revision" : "1b6b2e274e85105bfa155183145a1dcfd63331f1",
"version" : "4.5.0"
}
},
{
@@ -186,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
"version" : "1.17.1"
"revision" : "706feb7858a7f6c242879d137b8ee30926aa5b26",
"version" : "1.12.0"
}
},
{
@@ -195,8 +195,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
"version" : "1.7.2"
"revision" : "dc4030184203ffafbb2ec614352487235d747fe0",
"version" : "1.4.1"
}
},
{
@@ -231,17 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-types",
"state" : {
"revision" : "bff4b6903cdc99dda49649dd52f46c11cfd3ed50",
"version" : "1.8.0"
}
},
{
"identity" : "swift-issue-reporting",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
"state" : {
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
"version" : "2.1.2"
"revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca",
"version" : "1.5.1"
}
},
{
@@ -249,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
"version" : "1.16.1"
"revision" : "5073617dac96330a486245e4c0179cb0a6fd2256",
"version" : "1.12.0"
}
},
{
@@ -258,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
"version" : "2.104.0"
"revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237",
"version" : "2.99.0"
}
},
{
@@ -267,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
"revision" : "41449336c8ecfadac6b4b5be75f9c3c306e61ced",
"version" : "1.35.1"
"revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6",
"version" : "1.34.0"
}
},
{
@@ -276,8 +267,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
"revision" : "0f3e54e29c944c2e835ad52159da7d9e1c94ac69",
"version" : "1.46.0"
"revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9",
"version" : "1.43.0"
}
},
{
@@ -285,8 +276,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "322f3c2a4a21df31c84ca416bf65ee5e9059e440",
"version" : "2.37.5"
"revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da",
"version" : "2.37.0"
}
},
{
@@ -321,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
"version" : "1.14.2"
"revision" : "5dd0da1c7da7bac8f0c458a02a76f69031137a80",
"version" : "1.12.1"
}
},
{
@@ -330,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
"version" : "1.13.1"
"revision" : "f039fa6d6338aab5164f3d1be16281524c9a8f89",
"version" : "1.11.0"
}
},
{
@@ -339,17 +330,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
"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"
"revision" : "576a65b4ffb8c12ddad4950dc21eea2ef071bec2",
"version" : "1.3.0"
}
},
{
@@ -357,8 +339,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-service-context.git",
"state" : {
"revision" : "853ba3d9ce78851b9cc20108e8bd4f13f7fa546c",
"version" : "1.5.1"
"revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
"version" : "1.3.0"
}
},
{
@@ -366,8 +348,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-service-lifecycle",
"state" : {
"revision" : "a18ee16b8039866fd919bdb4e8e906882d4ecc75",
"version" : "2.13.0"
"revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a",
"version" : "2.11.0"
}
},
{
@@ -375,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-subprocess",
"state" : {
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
"version" : "1.0.2"
"revision" : "11633673a41f509f8945f23c96c7acd4adafd679",
"version" : "0.5.0"
}
},
{
@@ -384,17 +366,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
"version" : "604.0.0"
"revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081",
"version" : "603.0.1"
}
},
{
"identity" : "swift-system",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system.git",
"location" : "https://github.com/apple/swift-system",
"state" : {
"revision" : "869129b7bf4ecc57b97d0193ad29690ca2134750",
"version" : "1.8.1"
"revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
"version" : "1.6.4"
}
},
{
"identity" : "swiftcli",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jakeheis/SwiftCLI.git",
"state" : {
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
"version" : "6.0.3"
}
},
{
@@ -402,8 +393,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/SwiftyMobileDevice",
"state" : {
"revision" : "1f6e4cc614a31953bda5d1092a747cfdea90916f",
"version" : "1.7.0"
"revision" : "280d0dc8153469944491aee2f19af29e9c7a77f0",
"version" : "1.5.0"
}
},
{
@@ -415,6 +406,15 @@
"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",
@@ -425,12 +425,21 @@
}
},
{
"identity" : "xcode-project-format",
"identity" : "xadi",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/xcode-project-format.git",
"location" : "https://github.com/xtool-org/xadi",
"state" : {
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
"version" : "0.1.0"
"revision" : "831f8ddfc72f7a48d0c2c03ac9c864eee1f8f6b3",
"version" : "0.4.0"
}
},
{
"identity" : "xcodegen",
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
"revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
"version" : "2.45.4"
}
},
{
@@ -438,8 +447,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
"version" : "9.17.6"
"revision" : "01bb77000bc8c23a09ea2058f4954612f03cb705",
"version" : "9.10.1"
}
},
{
"identity" : "xctest-dynamic-overlay",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad",
"version" : "1.9.0"
}
},
{
@@ -447,8 +465,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xtool-core",
"state" : {
"revision" : "154d7213c12e3f21d50793f50ec7bfb89cfd3918",
"version" : "1.5.1"
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
"version" : "1.4.0"
}
},
{
@@ -456,8 +474,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams",
"state" : {
"revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279",
"version" : "6.2.2"
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
"version" : "5.4.0"
}
},
{
"identity" : "zsign",
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/zsign",
"state" : {
"revision" : "6c4a9f52dd8bf374aa938ef9c17d5f261f2c333a",
"version" : "1.7.0"
}
}
],
+23 -83
View File
@@ -9,14 +9,12 @@ let xtoolVersion: String? = {
let gitCommit = info.currentCommit
let gitTag = info.currentTag
let gitRef = gitTag ?? "commit \(gitCommit)"
return gitRef
return "\(gitRef)\(info.hasUncommittedChanges ? " (dirty)" : "")"
} else {
return nil
}
}()
let hasUncommittedChanges = Context.gitInformation?.hasUncommittedChanges ?? false
let cSettings: [CSetting] = [
.define("_GNU_SOURCE", .when(platforms: [.linux])),
]
@@ -32,8 +30,8 @@ let swiftSettings: [SwiftSetting] = {
let package = Package(
name: "xtool",
platforms: [
.iOS(.v17),
.macOS(.v14),
.iOS(.v16),
.macOS(.v13),
],
products: [
.library(
@@ -50,23 +48,23 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.1")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/xtool-org/swift-rcodesign", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.4.0")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.5.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/xtool-org/xadi", .upToNextMinor(from: "0.4.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"),
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-crypto", from: "5.0.0"),
.package(url: "https://github.com/apple/swift-crypto", from: "4.5.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
.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-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/apple/swift-nio", from: "2.77.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"),
.package(url: "https://github.com/swiftlang/swift-subprocess", .upToNextMinor(from: "0.5.0")),
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
.package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
@@ -74,17 +72,14 @@ 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/jpsim/Yams", from: "6.0.0"),
.package(url: "https://github.com/attaswift/BigInt", from: "5.5.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/saagarjha/unxip", from: "3.2.0"),
// NB: this should only be imported from XcodeProjects
.package(url: "https://github.com/tuist/XcodeProj.git", from: "9.17.5"),
// TODO: just depend on tuist/XcodeProj instead
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
],
targets: [
.target(
@@ -92,9 +87,7 @@ let package = Package(
dependencies: [
.product(name: "OpenSSL", package: "xtool-core")
],
cSettings: cSettings + [
.define("XTOOL_HAS_UNCOMMITTED_CHANGES", to: hasUncommittedChanges ? "1" : "0"),
] + (
cSettings: cSettings + (
xtoolVersion
.map { [.define("XTOOL_VERSION", to: "\"\($0)\"")] }
?? []
@@ -112,9 +105,6 @@ 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",
@@ -124,39 +114,22 @@ 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])),
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "Dependencies", package: "swift-dependencies"),
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
.product(name: "RCodesign", package: "swift-rcodesign"),
.product(name: "Zupersign", package: "zsign"),
.product(name: "SignerSupport", package: "xtool-core"),
.product(name: "ProtoCodable", package: "xtool-core"),
.product(name: "Superutils", package: "xtool-core"),
.product(name: "Crypto", package: "swift-crypto"),
.product(name: "CryptoExtras", package: "swift-crypto"),
.product(name: "_CryptoExtras", package: "swift-crypto"),
.product(name: "X509", package: "swift-certificates"),
.product(name: "BigInt", package: "BigInt"),
.product(name: "HTTPTypes", package: "swift-http-types"),
@@ -186,31 +159,6 @@ 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,
),
@@ -219,31 +167,23 @@ let package = Package(
dependencies: [
"SwiftyMobileDevice",
"XKit",
"XCLIUtils",
"PackLib",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SystemPackage", package: "swift-system"),
.product(name: "Dependencies", package: "swift-dependencies"),
.product(name: "NIOPosix", package: "swift-nio"),
.product(name: "Version", package: "Version"),
.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: "XcodeProjectFormat", package: "xcode-project-format"),
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
],
swiftSettings: swiftSettings,
),
+1 -3
View File
@@ -57,9 +57,7 @@ DEVICE SUBCOMMANDS:
### Library
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.
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.
```swift
// package dependency:
-5
View File
@@ -1,5 +0,0 @@
module CLZMA [system] {
header "shim.h"
link "lzma"
export *
}
-3
View File
@@ -1,3 +0,0 @@
#pragma once
#include <lzma.h>
-3
View File
@@ -1,4 +1 @@
#include <stdbool.h>
const char * _Nonnull xtl_version(void);
bool xtl_has_uncommitted_changes(void);
-13
View File
@@ -1,5 +1,4 @@
#include "version.h"
#include <stddef.h>
const char *xtl_version(void) {
#ifdef XTOOL_VERSION
@@ -8,15 +7,3 @@ 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
}
+31 -130
View File
@@ -1,75 +1,37 @@
import Foundation
import Subprocess
import XUtils
import Superutils
public struct BuildSettings: Sendable {
private static let customBinDir =
// this is the same option used by SwiftPM itself for dev builds
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { FilePath($0) }
public var packagePath: String
private static let envURL = URL(fileURLWithPath: "/usr/bin/env")
public let packagePath: String
public let configuration: BuildConfiguration
public let triple: String
public let buildSystem: BuildSystem
public let customOptions: [String]
public var sdkOptions: [String]
public var sdkEnvironment: [Environment.Key: String?]
private var configOptions: [String] {
return [
"--configuration", configuration.rawValue,
"--build-system", buildSystem.pmName,
"--package-path", packagePath,
]
}
private var resolvedBaseOptions: [String] {
configOptions + sdkOptions + customOptions
}
public let sdkOptions: [String]
public let options: [String]
public init(
configuration: BuildConfiguration,
triple: String,
buildSystem: BuildSystem? = nil,
packagePath: String = ".",
options: [String] = []
) async throws {
self.packagePath = packagePath
self.configuration = configuration
self.customOptions = options
self.options = options
self.triple = triple
self.buildSystem = if let buildSystem { buildSystem } else { try await .default() }
self.sdkEnvironment = [
// xcrun passes an SDKROOT that messes with our sdk configuration
"SDKROOT": nil,
]
switch self.buildSystem {
case .swiftPM:
// on macOS we don't explicitly install a Swift SDK but
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
// just works. See:
// https://github.com/swiftlang/swift-package-manager/pull/6828
self.sdkOptions = ["--swift-sdk", triple]
case .swiftBuild:
self.sdkOptions = ["--triple", triple]
#if !os(macOS)
let darwinSDK = try DarwinSDK.current()
.orThrow(StringError("No Darwin SDK configured. Please run `xtool setup`."))
self.sdkOptions += [
"--toolset", "\(darwinSDK.bundle.path)/toolset-swb.json",
]
self.sdkEnvironment.merge([
"XCODE_EXTRA_PLATFORM_FOLDERS": "\(darwinSDK.bundle.path)/Developer/Platforms",
// SWB looks for dsymutil in the PATH. Other stuff (lld, libtool) is handled by toolset-swb.json.
"PATH": "\(darwinSDK.bundle.path)/toolset/bin:\(ProcessInfo.processInfo.environment["PATH"] ?? "")",
]) { $1 }
#endif
}
// on macOS we don't explicitly install a Swift SDK but
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
// just works. See:
// https://github.com/swiftlang/swift-package-manager/pull/6828
self.sdkOptions = ["--swift-sdk", triple]
}
#if os(macOS)
@@ -79,43 +41,18 @@ public struct BuildSettings: Sendable {
arguments: .init(arguments),
output: .string(limit: .max)
).checkSuccess()
return result.standardOutput.trimmingCharacters(in: .whitespacesAndNewlines)
return result.standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
}
private static let _swiftURL = Task {
private static let swiftURL = Task {
try await FilePath(xcrun(["-f", "swift"]))
}
public static func swiftURL() async throws -> FilePath {
try await _swiftURL.value
}
private static let _swiftcURL = Task {
try await FilePath(xcrun(["-f", "swiftc"]))
}
public static func swiftcURL() async throws -> FilePath {
try await _swiftcURL.value
}
#else
public static func swiftURL() async throws -> FilePath {
try await FilePath(ToolRegistry.locate("swift")).orThrow(StringError("Got bad path for swift executable"))
}
public static func swiftcURL() async throws -> FilePath {
try await FilePath(ToolRegistry.locate("swiftc")).orThrow(StringError("Got bad path for swiftc executable"))
}
#endif
public func withPackagePath(_ path: String) -> Self {
var copy = self
copy.packagePath = path
return copy
}
public func swiftPMInvocation(
forTool tool: String,
arguments: [String],
packagePathOverride: String? = nil
) async throws -> Subprocess.Configuration {
let executable: Executable
let baseArguments: [String]
@@ -128,71 +65,35 @@ public struct BuildSettings: Sendable {
// to add SDKROOT=.../MacOSX.sdk to our invocations. We avoid this by
// 1) invoking the real swift executable (located with `xcrun -f`) and
// 2) explicitly removing SDKROOT from the env, as it may be inherited
// through a parent process (e.g. `swift run xtool`).
executable = .path(try await Self.swiftURL())
// through the `swift run pack` invocation.
executable = .path(try await Self.swiftURL.value)
#else
executable = .name("swift")
#endif
baseArguments = [tool]
}
let extraArguments: [String] = [
"--package-path", packagePathOverride ?? packagePath,
"--configuration", configuration.rawValue,
]
var rawEnv = ProcessInfo.processInfo.environment
rawEnv.removeValue(forKey: "SDKROOT")
let env = Dictionary(uniqueKeysWithValues: rawEnv.map {
(Environment.Key(rawValue: $0)!, $1)
})
return Configuration(
executable: executable,
arguments: .init(baseArguments + resolvedBaseOptions + arguments),
environment: .inherit.updating(sdkEnvironment),
executable,
arguments: .init(baseArguments + extraArguments + sdkOptions + options + arguments),
environment: .custom(env),
platformOptions: .withGracefulShutDown,
)
}
// loosely based on
// https://github.com/swiftlang/sourcekit-lsp/blob/c55899a/Sources/BuildServerIntegration/ExternalBuildServerAdapter.swift#L92
private var baseBuildServerArguments: [String] {
return [
"experimental-build-server",
"--disable-automatic-resolution",
"--scratch-path", ".build/index-build",
// this requires Swift 6.4 but we need 6.4 on Linux anyway, for the platform toolset fixes
"--experimental-skip-acquiring-lock",
]
}
public var buildServerArguments: [String] {
["package"] + baseBuildServerArguments + resolvedBaseOptions
}
public func buildServerInvocation() async throws -> Subprocess.Configuration {
try await swiftPMInvocation(forTool: "package", arguments: baseBuildServerArguments)
}
}
public enum BuildConfiguration: String, CaseIterable, Sendable {
case debug
case release
var swiftBuildValue: String {
switch self {
case .debug: "Debug"
case .release: "Release"
}
}
}
public enum BuildSystem: Sendable {
case swiftPM
case swiftBuild
public static func `default`() async throws -> Self {
if try await SwiftVersion.current.supportsSwiftBuild {
return .swiftBuild
} else {
return .swiftPM
}
}
var pmName: String {
switch self {
case .swiftPM: "native"
case .swiftBuild: "swiftbuild"
}
}
}
+6 -15
View File
@@ -98,23 +98,14 @@ public struct DarwinSDK {
}
private static func addHostClangResourceDir(to sdk: URL) async throws {
struct SwiftTargetInfo: Decodable {
struct Paths: Decodable {
let runtimeResourcePath: String
}
let paths: Paths
}
let clangURL = try await ToolRegistry.locate("clang")
let process = try await Subprocess.run(
.path(try await BuildSettings.swiftcURL()),
arguments: ["-print-target-info"],
output: .data(limit: .max)
.path(FilePath(clangURL.path)),
arguments: ["-print-resource-dir"],
output: .string(limit: .max)
).checkSuccess()
let targetInfo = try JSONDecoder().decode(
SwiftTargetInfo.self,
from: process.standardOutput
)
let hostClangResources = URL(filePath: targetInfo.paths.runtimeResourcePath).appending(path: "clang")
let output = process.standardOutput ?? ""
let hostClangResources = URL(filePath: output.trimmingCharacters(in: .whitespacesAndNewlines))
let hostInclude = hostClangResources.appending(path: "include")
let sdkInclude = sdk.appending(path: "Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
try await FileManager.default.copyItem(at: hostInclude, to: sdkInclude, preserveOwner: false)
-3
View File
@@ -22,9 +22,6 @@ public struct PackSchemaBase: Codable, Sendable {
public var extensions: [Extension]?
/// Skip auto-creating the LSP support file if it's missing.
public var skipLSP: Bool?
public struct Extension: Codable, Sendable {
public var product: String
public var bundleID: String?
+17 -53
View File
@@ -17,13 +17,6 @@ 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
@@ -62,24 +55,23 @@ public struct Packer: Sendable {
try Data().write(to: sources.appendingPathComponent("stub.c", isDirectory: false))
}
let buildConfig = try await buildSettings
.withPackagePath(packageDir.path)
.swiftPMInvocation(
forTool: "build",
arguments: [
"--scratch-path", ".build",
// resolving can cause SwiftPM to overwrite the root package deps
// with just the deps needed for the builder package (which is to
// say, any "dev dependencies" of the root package may be removed.)
// fortunately we've already resolved the root package by this point
// in order to dump the plan, so we can skip resolution here to skirt
// the issue.
"--disable-automatic-resolution",
],
)
let buildConfig = try await buildSettings.swiftPMInvocation(
forTool: "build",
arguments: [
"--package-path", packageDir.path,
"--scratch-path", ".build",
// resolving can cause SwiftPM to overwrite the root package deps
// with just the deps needed for the builder package (which is to
// say, any "dev dependencies" of the root package may be removed.)
// fortunately we've already resolved the root package by this point
// in order to dump the plan, so we can skip resolution here to skirt
// the issue.
"--disable-automatic-resolution",
]
)
try await Subprocess.run(
buildConfig,
output: .currentStandardOutput,
output: .currentStandardError,
error: .currentStandardError,
)
.checkSuccess()
@@ -92,16 +84,8 @@ public struct Packer: Sendable {
let outputURL = output.url
let binPath: String
switch buildSettings.buildSystem {
case .swiftPM:
binPath = "\(buildSettings.triple)/\(buildSettings.configuration.rawValue)"
case .swiftBuild:
let platformName = buildSettings.triple.contains("simulator") ? "iphonesimulator" : "iphoneos"
binPath = "out/Products/\(buildSettings.configuration.swiftBuildValue)-\(platformName)"
}
let binDir = URL(
fileURLWithPath: ".build/\(binPath)",
fileURLWithPath: ".build/\(buildSettings.triple)/\(buildSettings.configuration.rawValue)",
isDirectory: true
)
@@ -200,7 +184,7 @@ public struct Packer: Sendable {
if product.type == .application {
info["UIRequiredDeviceCapabilities"] = ["arm64"]
info["LSRequiresIPhoneOS"] = true
info["CFBundleSupportedPlatforms"] = Packer.cfBundleSupportedPlatforms(for: buildSettings.triple)
info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
}
if let iconPath = product.iconPath {
@@ -217,26 +201,6 @@ 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 {
+2 -6
View File
@@ -137,10 +137,6 @@ 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))
}
@@ -248,9 +244,10 @@ public struct Planner: Sendable {
}
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
let dumpConfig = try await buildSettings.withPackagePath(path).swiftPMInvocation(
let dumpConfig = try await buildSettings.swiftPMInvocation(
forTool: "package",
arguments: arguments,
packagePathOverride: path
)
return try await Subprocess.run(
dumpConfig,
@@ -412,7 +409,6 @@ 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]?
-92
View File
@@ -1,92 +0,0 @@
import Subprocess
import XUtils
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 {
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])
}
}
extension SwiftVersion {
private static let cached = Task<Self, Error> {
let outputString: String?
do {
outputString = try await Subprocess.run(
.path(try await BuildSettings.swiftURL()),
arguments: ["--version"],
output: .string(limit: .max)
)
.checkSuccess()
.standardOutput
} catch {
throw StringError("Failed to obtain Swift version")
}
let output = outputString ?? ""
guard let version = Self(output) else {
throw StringError("Could not parse Swift version: '\(output)'")
}
return version
}
public static var current: Self {
get async throws {
try await cached.value
}
}
}
+126 -254
View File
@@ -1,5 +1,10 @@
#if os(macOS)
import Foundation
import XcodeProjects
import PathKit
import Version
import ProjectSpec
import XcodeGenKit
import XcodeProj
public struct XcodePacker {
public var plan: Plan
@@ -9,284 +14,151 @@ public struct XcodePacker {
}
// swiftlint:disable:next function_body_length
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)
public func createProject() async throws -> URL {
let xtoolDir: Path = "xtool"
let fromProjectToRoot = "../.."
let projectDir: Path = xtoolDir + ".xtool-tmp"
try? xtoolDir.delete()
try projectDir.mkpath()
let emptyText = Data("// leave this file empty".utf8)
let products = plan.allProducts
let targetIDs = products.map {
XCSchema.ObjectID("xtool:\($0.product)")
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 sourcePhase = XCSchema.BuildPhase.sources(.init(objectID: nil, name: nil))
let frameworksPhase = XCSchema.BuildPhase.frameworks(.init(objectID: nil, name: nil))
var groups: [XCSchema.Reference] = []
var productFiles: [XCSchema.Reference] = []
var targets: [XCSchema.Target] = []
let emptyText = Data("""
// leave this file empty
""".utf8)
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"))
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"
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 encodedPlist.write(to: productDir.appendingPathComponent("Info.plist"))
try infoPath.write(encodedPlist)
var buildSettings: [String: XCSchema.BuildSetting] = [
var buildSettings: [String: BuildSetting] = [
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
"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"]),
"TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
]
if product.type == .appExtension {
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = .string("YES")
buildSettings["LD_RUNPATH_SEARCH_PATHS"] = .array([
"$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks",
])
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
}
if let entitlementsPath = product.entitlementsPath {
let path = (entitlementsPath as NSString).isAbsolutePath
? entitlementsPath
: (fromProjectToRoot as NSString).appendingPathComponent(entitlementsPath)
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string(path)
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
}
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
),
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), [])
let additionalDependencies: [Dependency] = if product.type == .application {
plan.extensions.map {
Dependency(
type: .target,
reference: $0.targetName
)
}
: []
targets.append(.native(XCSchema.CommonTargetProperties(
} else {
[]
}
return Target(
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 schema = XCSchema.Project(
objectID: nil,
rootGroupDebugID: nil,
configurationListDebugID: nil,
topLevelReferences: groups + [
.group(XCSchema.Group(
objectID: nil,
name: "Products",
path: "",
includeInIndex: nil,
children: productFiles,
))
],
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: [],
)
let projectURL = projectDir.appending(path: "\(plan.app.product).xcodeproj")
let project = XcodeProject(project: schema, url: projectURL)
try project.write()
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
}
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)
}
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)
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",
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
),
properties: buildFileProperties(),
)],
))
],
dependencies: [
Dependency(
type: .package(products: [product.product]),
reference: "RootPackage"
),
] + additionalDependencies,
info: Plist(
path: try infoPath.relativePath(from: projectDir).string,
attributes: [:]
)
)
}
}
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,
),
let project = Project(
name: plan.app.targetName,
targets: targets,
packages: [
"RootPackage": .local(
path: fromProjectToRoot.string,
group: nil,
excludeFromProject: false
),
],
options: SpecOptions(
localPackagesGroup: ""
)
)
// TODO: Handle plan.resources of type .root
// TODO: Handle plan.iconPath
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)
}
try xcodeProject.write(path: Path(xcodeproj.lastComponent))
}
do {
let current = Path.current
Path.current = xcworkspace.parent()
defer { Path.current = current }
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 xcworkspace.url
}
}
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
-512
View File
@@ -1,512 +0,0 @@
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
}
}
-167
View File
@@ -1,167 +0,0 @@
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
}
-8
View File
@@ -1,8 +0,0 @@
/// 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
}
}
-69
View File
@@ -1,69 +0,0 @@
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 }
}
}
@@ -1,223 +0,0 @@
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)
}
}
@@ -1,266 +0,0 @@
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: "/")
}
}
@@ -1,23 +0,0 @@
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) }
}
}
-65
View File
@@ -1,65 +0,0 @@
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 }
}
}
-19
View File
@@ -1,19 +0,0 @@
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" : "")
}
}
-44
View File
@@ -1,44 +0,0 @@
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 }
}
}
@@ -8,7 +8,6 @@
import Foundation
/// Replaces all of the app's groups with the given ones
public final class DeveloperServicesAssignAppGroupRequest: DeveloperServicesPlatformRequest {
public struct Response: Decodable, Sendable {}
@@ -17,14 +16,14 @@ public final class DeveloperServicesAssignAppGroupRequest: DeveloperServicesPlat
public let platform: DeveloperServicesPlatform
public let teamID: DeveloperServicesTeam.ID
public let appIDID: String
public let groupIDs: [DeveloperServicesAppGroup.ID]
public let groupID: DeveloperServicesAppGroup.ID
var subAction: String { return "assignApplicationGroupToAppId" }
var subParameters: [String: Any] {
return [
"teamId": teamID.rawValue,
"appIdId": appIDID,
"applicationGroups": groupIDs.map(\.rawValue)
"applicationGroups": groupID.rawValue
]
}
@@ -32,12 +31,12 @@ public final class DeveloperServicesAssignAppGroupRequest: DeveloperServicesPlat
platform: DeveloperServicesPlatform,
teamID: DeveloperServicesTeam.ID,
appIDID: String,
groupIDs: [DeveloperServicesAppGroup.ID]
groupID: DeveloperServicesAppGroup.ID
) {
self.platform = platform
self.teamID = teamID
self.appIDID = appIDID
self.groupIDs = groupIDs
self.groupID = groupID
}
}
@@ -8,7 +8,6 @@
import Foundation
import DeveloperAPI
import XUtils
public struct DeveloperServicesAssignAppGroupsOperation: DeveloperServicesOperation {
@@ -34,23 +33,36 @@ public struct DeveloperServicesAssignAppGroupsOperation: DeveloperServicesOperat
self.client = DeveloperServicesClient(authData: authData)
}
private func getOrCreateAppGroup(
private func upsertAppGroup(
_ groupID: DeveloperServicesAppGroup.GroupID,
existingGroups: [String: DeveloperServicesAppGroup]
) async throws -> DeveloperServicesAppGroup {
) async throws -> DeveloperServicesAppGroup.GroupID {
let sanitized = ProvisioningIdentifiers.sanitize(groupID: groupID)
let group: DeveloperServicesAppGroup
if let existingGroup = existingGroups[sanitized] {
return existingGroup
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)
}
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
_ = try await client.send(
DeveloperServicesAssignAppGroupRequest(
platform: .iOS,
teamID: xcodeAuthData.teamID,
appIDID: appID.id,
groupID: group.id
)
)
return try await client.send(request)
return group.groupID
}
public func perform() async throws -> [DeveloperServicesAppGroup.GroupID] {
@@ -59,20 +71,14 @@ public struct DeveloperServicesAssignAppGroupsOperation: DeveloperServicesOperat
))
let sanitized = existing.map { (ProvisioningIdentifiers.sanitize(groupID: $0.groupID), $0) }
let dict = Dictionary(sanitized, uniquingKeysWith: { $1 })
let groups = try await groupIDs.concurrentMap { groupID in
try await getOrCreateAppGroup(groupID, existingGroups: dict)
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) }
}
_ = try await client.send(
DeveloperServicesAssignAppGroupRequest(
platform: .iOS,
teamID: xcodeAuthData.teamID,
appIDID: appID.id,
groupIDs: groups.map(\.id)
)
)
return groups.map(\.groupID)
}
}
@@ -8,29 +8,22 @@
import Foundation
import DeveloperAPI
import Dependencies
public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
@Dependency(\.signer) private var signer
public enum Error: LocalizedError, CustomStringConvertible {
public enum Error: LocalizedError {
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):
"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.
"""
return url.path.withCString {
String.localizedStringWithFormat(
NSLocalizedString(
"add_app_operation.error.invalid_app", value: "Invalid app: %s", comment: ""
), $0
)
}
}
}
}
@@ -179,7 +172,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 signer.analyze(executable: executableURL),
if let entitlementsData = try? await context.signer.analyze(executable: executableURL),
let decodedEntitlements = try? PropertyListDecoder().decode(Entitlements.self, from: entitlementsData) {
entitlements = decodedEntitlements
@@ -187,10 +180,6 @@ 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 {
@@ -73,23 +73,9 @@ extension DataProtectionEntitlement: EntitlementWithCapability {
extension AppGroupEntitlement: EntitlementWithCapability {
var capability: DeveloperServicesCapability {
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))]
)
]
)
// FIXME: Enable app groups on free accounts
// but we need to always assign only one group
DeveloperServicesCapability(.appGroups, isFree: false)
}
}
@@ -100,9 +100,8 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
return try await self.replaceCertificates(certificates, requireConfirmation: true)
}
guard let certificate = certificates.first(where: {
$0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true
}) else {
let knownSerialNumber = signingInfo.certificate.serialNumber()
guard let certificate = certificates.first(where: { $0.attributes?.serialNumber == knownSerialNumber }) else {
// we need to revoke existing certs, otherwise it doesn't always let us make a new one
return try await self.replaceCertificates(certificates, requireConfirmation: true)
}
@@ -54,6 +54,7 @@ public struct DeveloperServicesClient: Sendable {
}
}
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.httpClient) var httpClient
@@ -75,6 +76,8 @@ public struct DeveloperServicesClient: Sendable {
throw Error.malformedRequest
}
let deviceInfo = try deviceInfoProvider.fetch()
var httpRequest = HTTPRequest(method: .post, url: url)
let acceptedLanguages = Locale.preferredLanguages.joined(separator: ", ")
@@ -85,6 +88,8 @@ public struct DeveloperServicesClient: Sendable {
request.methodOverride.map { httpRequest.headerFields[.init("X-HTTP-Method-Override")!] = $0 }
httpRequest.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
httpRequest.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
httpRequest.headerFields[.init("X-Apple-I-Identity-Id")!] = loginToken.adsid
httpRequest.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
@@ -98,6 +103,8 @@ public struct DeveloperServicesClient: Sendable {
let (_, data) = try await httpClient.makeRequest(httpRequest, body: body)
// String(data: data, encoding: .utf8).map { print("\(url): \($0)") }
let decoded: R.Response = try request.apiVersion.decode(response: data)
return try await request.parse(decoded)
@@ -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,6 +105,7 @@ public struct XcodeAuthData: Sendable {
}
public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
@Dependency(\.deviceInfoProvider) private var deviceInfoProvider
@Dependency(\.anisetteDataProvider) private var anisetteDataProvider
public var authData: XcodeAuthData
@@ -129,7 +130,7 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
) async throws -> (HTTPResponse, HTTPBody?) {
var request = request
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
let deviceInfo = try deviceInfoProvider.fetch()
// General
request.headerFields[.acceptLanguage] = Locale.preferredLanguages.joined(separator: ", ")
@@ -141,12 +142,17 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
request.headerFields[.userAgent] = "Xcode"
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
// MobileMe identity
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
// GrandSlam authentication
request.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
request.headerFields[.init("X-Apple-I-Identity-Id")!] = authData.loginToken.adsid
request.headerFields[.init("X-Apple-GS-Token")!] = authData.loginToken.token
// Anisette
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
for (key, value) in anisetteData.dictionary {
request.headerFields[.init(key)!] = value
}
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import OpenAPIRuntime
import HTTPTypes
@@ -24,7 +23,7 @@ struct LoggingMiddleware: ClientMiddleware {
) != nil
else { return (response, body) }
d.out.print("\n\(operationID) response status -> \(response.status)")
print("\n\(operationID) response status -> \(response.status)")
if let unwrapped = body {
let data = try await Data(collecting: unwrapped, upTo: .max)
@@ -32,7 +31,7 @@ struct LoggingMiddleware: ClientMiddleware {
body = .init(data)
let text = String(decoding: data, as: UTF8.self)
d.out.print("\(operationID) response body -> \(text)")
print("\(operationID) response body -> \(text)")
}
return (response, body)
@@ -49,53 +49,37 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
throw Errors.tooManyMatchingBundleIDs
}
// 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
}
try Task.checkCancellation()
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?.name == profileName }
_ = try await matchingProfiles.concurrentMap {
try await context.developerAPIClient.profilesDeleteInstance(path: .init(id: $0.id)).noContent
}
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
}
let serialNumber = signingInfo.certificate.serialNumber()
let certs = try await context.developerAPIClient.certificatesGetCollection(
query: .init(
filter_lbrack_serialNumber_rbrack_: [serialNumber]
)
)
.ok.body.json.data
let allDevices = try await context.developerAPIClient.devicesGetCollection()
.ok.body.json.data
.filter { $0.attributes?.deviceClass?.value1?.supportsIOSApps == true }
let response = try await context.developerAPIClient.profilesCreateInstance(
body: .json(
.init(
data: .init(
_type: .profiles,
attributes: .init(
name: profileName,
name: "XTL profile \(bundleID.id)",
profileType: .init(.iosAppDevelopment)
),
relationships: .init(
@@ -4,7 +4,7 @@ import ConcurrencyExtras
import Dependencies
public protocol RawADIProvider: Sendable {
func clientInfo() async throws -> ClientInfoWithUserAgent
func clientInfo() async throws -> String
func startProvisioning(
spim: Data,
@@ -18,9 +18,13 @@ public protocol RawADIProvider: Sendable {
) async throws -> (machineID: Data, otp: Data)
}
public struct ClientInfoWithUserAgent: Sendable {
public let clientInfo: String
public let akdUserAgent: String
extension RawADIProvider {
public func clientInfo() async throws -> String {
// Looks like Apple detects attempts to use a macOS client string on Windows :/
"""
<PC> <Windows;6.2(0,0);9200> <com.apple.AuthKitWin/1 (com.apple.iCloud/7.21)>
"""
}
}
private struct UnimplementedRawADIProvider: RawADIProvider {
@@ -40,16 +44,17 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
let closure: (UUID, inout UInt64, Data) async throws -> (Data, Data) = unimplemented()
return try await closure(userID, &routingInfo, provisioningInfo)
}
func clientInfo() async throws -> ClientInfoWithUserAgent {
let closure: () async throws -> ClientInfoWithUserAgent = unimplemented()
return try await closure()
}
}
private enum RawADIProviderDependencyKey: DependencyKey {
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
static let liveValue: RawADIProvider = OmnisetteADIProvider()
static let liveValue: RawADIProvider = {
#if canImport(XADI)
return XADIProvider()
#else
return OmnisetteADIProvider()
#endif
}()
}
extension DependencyValues {
@@ -85,12 +90,15 @@ public struct ADIDataProvider: AnisetteDataProvider {
private let localUserUID: UUID
private let localUserID: String
private let _clientInfo = LockIsolated<ClientInfoWithUserAgent?>(nil)
private let _clientInfo = LockIsolated<String?>(nil)
public init() {
public init(provisioningData: ProvisioningData? = nil) {
@Dependency(\.keyValueStorage) var storage
if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
if let provisioningData {
self.localUserUID = provisioningData.localUserUID
try? storage.setData(provisioningData.adiPb, forKey: Self.provisioningKey)
try? storage.setString("\(provisioningData.routingInfo)", forKey: Self.routingInfoKey)
} else if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
let localUserUID = UUID(uuidString: localUserUIDString) {
self.localUserUID = localUserUID
} else {
@@ -102,15 +110,9 @@ public struct ADIDataProvider: AnisetteDataProvider {
self.localUserID = SHA256.hash(data: Data(localUserUID.uuidString.utf8))
.map { String(format: "%02X", $0) }
.joined()
if (try? storage.string(forKey: Self.providerIDKey)) != Self.providerID {
self.resetProvisioning()
try? storage.setString(Self.providerID, forKey: Self.providerIDKey)
}
}
private static let localUserUIDKey = "XTLLocalUserUID"
private static let providerIDKey = "XTLADIProviderID"
private static let provisioningKey = "XTLProvisioningInfo"
private static let routingInfoKey = "XTLRoutingInfo"
@@ -150,7 +152,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
return encoder
}()
private func clientInfo() async throws -> ClientInfoWithUserAgent {
private func clientInfo() async throws -> String {
if let clientInfo = _clientInfo.value { return clientInfo }
let clientInfo = try await rawProvider.clientInfo()
_clientInfo.setValue(clientInfo)
@@ -174,11 +176,14 @@ public struct ADIDataProvider: AnisetteDataProvider {
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
for (key, value) in try await deviceInfo().dictionary {
request.headerFields[.init(key)!] = value
}
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = try await clientInfo()
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = self.localUserUID.uuidString
// request.headers[DeviceInfo.clientInfoKey] = self.deviceInfo.clientInfo.clientString
// self.deviceInfo.dictionary.forEach { request.headers[$0] = $1 }
let (_, response) = try await self.httpClient.makeRequest(request, body: body, ephemeral: true)
let (_, response) = try await self.httpClient.makeRequest(request, body: body)
// print(String(data: response, encoding: .utf8) ?? "<no utf8 data>")
return try GrandSlamOperationDecoder<Response>.decode(data: response)
}
@@ -231,7 +236,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
machineID: mid.base64EncodedString(),
localUserID: self.localUserID,
oneTimePassword: otp.base64EncodedString(),
deviceInfo: try await deviceInfo(),
deviceID: self.localUserUID.uuidString
)
}
@@ -240,12 +245,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
try? storage.setString(nil, forKey: Self.routingInfoKey)
}
private static var providerID: String? {
"mac-omnisette"
}
public var providerID: String? { Self.providerID }
public func provisioningData() -> ProvisioningData? {
guard let provisioningInfo = try? storage.data(forKey: Self.provisioningKey),
let routingInfoString = try? storage.string(forKey: Self.routingInfoKey),
@@ -279,34 +278,8 @@ 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 {
public struct ADIError: Error {
public var code: Int
public var description: String {
switch code {
case -45061:
return """
You were logged out. Please log in again with `xtool auth`.
If you see this repeatedly, please file an issue at https://github.com/xtool-org/xtool/issues/new/choose
"""
default:
return """
Apple Anisette library returned error \(code). Please try logging in again with `xtool auth`.
If this problem persists, file an issue at https://github.com/xtool-org/xtool/issues/new/choose
"""
}
}
}
@@ -10,14 +10,14 @@ import Foundation
public struct AnisetteData {
private static let clientTimeFormat = Date.ISO8601FormatStyle(
dateSeparator: .dash,
dateTimeSeparator: .standard,
timeSeparator: .colon,
timeZoneSeparator: .omitted,
includingFractionalSeconds: false,
timeZone: .gmt
)
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
}()
/// `X-Apple-I-Locale`
static let iLocaleKey = "X-Apple-I-Locale"
@@ -49,9 +49,10 @@ public struct AnisetteData {
static let oneTimePasswordKey = "X-Apple-I-MD"
public let oneTimePassword: String
public let deviceInfo: DeviceInfo
static let deviceIDKey = "X-Mme-Device-Id"
public var deviceID: String?
public var dictionary: [String: String] {
var dictionary: [String: String] {
// GSA doesn't like "en_US@rg=..."; it has to be just "en_US".
let localeIdentifier = if let language = locale.language.languageCode?.identifier,
let region = locale.region?.identifier {
@@ -59,16 +60,19 @@ public struct AnisetteData {
} else {
"en_US"
}
return [
var dictionary = [
Self.localeKey: localeIdentifier,
Self.timeZoneKey: timeZone.abbreviation() ?? "UTC",
Self.clientTimeKey: clientTime.formatted(Self.clientTimeFormat),
Self.clientTimeKey: Self.dateFormatter.string(from: clientTime),
Self.routingInfoKey: "\(routingInfo)",
Self.machineIDKey: machineID,
Self.localUserIDKey: localUserID,
Self.oneTimePasswordKey: oneTimePassword,
]
.merging(deviceInfo.dictionary) { _, b in b }
if let deviceID {
dictionary[Self.deviceIDKey] = deviceID
}
return dictionary
}
}
@@ -10,20 +10,10 @@ import Foundation
import Dependencies
public protocol AnisetteDataProvider: Sendable {
/// Stored alongside login data. If the provider reports a new ID, we log out.
///
/// This is useful when switching Anisette provider implementations if the old
/// implementation's provisioning data won't work with the new implementation.
///
/// The default implementation returns `nil`.
var providerID: String? { get }
// This is a suggestion and not a requirement.
func resetProvisioning() async
func provisioningData() -> ProvisioningData?
func deviceInfo() async throws -> DeviceInfo
func fetchAnisetteData() async throws -> AnisetteData
}
@@ -34,7 +24,6 @@ public struct ProvisioningData: Hashable, Codable, Sendable {
}
extension AnisetteDataProvider {
public var providerID: String? { nil }
public func provisioningData() -> ProvisioningData? { nil }
public func resetProvisioning() async {}
}
@@ -56,9 +45,4 @@ private struct UnimplementedAnisetteDataProvider: AnisetteDataProvider {
let closure: () async throws -> AnisetteData = unimplemented()
return try await closure()
}
func deviceInfo() async throws -> DeviceInfo {
let closure: () async throws -> DeviceInfo = unimplemented()
return try await closure()
}
}
@@ -0,0 +1,102 @@
//
// DeviceInfo+Fetching.swift
// XKit
//
// Created by Kabir Oberai on 18/06/20.
// Copyright © 2020 Kabir Oberai. All rights reserved.
//
import Foundation
#if os(macOS)
extension DeviceInfo {
private static func fetchDeviceID() -> String? {
var waitTime = timespec(tv_sec: 0, tv_nsec: 0) // wait indefinitely
let bytes = [UInt8](unsafeUninitializedCapacity: MemoryLayout<uuid_t>.size) { buf, count in
// force unwrapping is safe because uuid_t has a non-zero size
count = (gethostuuid(buf.baseAddress!, &waitTime) == 0) ? buf.count : 0
}
guard !bytes.isEmpty else { return nil }
return bytes.withUnsafeBufferPointer {
UUID(uuid: UnsafeRawBufferPointer($0).load(as: uuid_t.self)).uuidString
}
}
private static func hardwareProperty(forKey key: String) -> Data? {
let entry = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options")
guard entry != 0 else { return nil }
defer { IOObjectRelease(entry) }
return IORegistryEntryCreateCFProperty(
entry, key as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? Data
}
private static func fetchROMAddress() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:ROM")?
.map { String(format: "%02hhx", $0) }
.joined()
}
private static func fetchMLBSerialNumber() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:MLB")?
.map { String(format: isprint(Int32($0)) != 0 ? "%c" : "%02hhx", $0) }
.joined()
}
private static func fetchSerialNumber() -> String? {
let service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
guard service != 0 else { return nil }
defer { IOObjectRelease(service) }
return IORegistryEntryCreateCFProperty(
service, "IOPlatformSerialNumber" as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? String
}
private static func fetchHardwareModel() -> String? {
var modelSize = 0
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0,
modelSize > 0 else { return nil }
return String(unsafeUninitializedCapacity: modelSize) { buf in
var len = modelSize
guard sysctlbyname("hw.model", buf.baseAddress, &len, nil, 0) == 0,
len == modelSize else { return 0 }
return len - 1 // exclude NUL
}
}
public static func current() -> DeviceInfo? {
let romAddress = fetchROMAddress() ?? ""
let mlbSerialNumber = fetchMLBSerialNumber() ?? ""
guard let deviceID = fetchDeviceID(),
let serialNumber = fetchSerialNumber(),
let modelID = fetchHardwareModel()
else { return nil }
return DeviceInfo(
deviceID: deviceID,
romAddress: romAddress,
mlbSerialNumber: mlbSerialNumber,
serialNumber: serialNumber,
modelID: modelID
)
}
}
#else
extension DeviceInfo {
public static func current() -> DeviceInfo? {
return DeviceInfo(
deviceID: "99B5D9D4-B068-5CEE-A799-5EBB5B0894A6",
romAddress: "94f6a300e9a0",
mlbSerialNumber: "C02520301W0GF2D1U",
serialNumber: "C02PQKRJG8WP",
modelID: "Mac16,1"
)
}
}
#endif
// FIXME: Figure out DeviceInfo.current() outside macOS
// (see above)
@@ -1,21 +1,116 @@
//
// DeviceInfo.swift
// XKit
//
// Created by Kabir Oberai on 19/11/19.
// Copyright © 2019 Kabir Oberai. All rights reserved.
//
import Foundation
import Dependencies
public struct DeviceInfo: Codable, Sendable {
public static let xcodeVersionKey = "X-Xcode-Version"
/// `X-Xcode-Version`
static let xcodeVersionKey = "X-Xcode-Version"
/// Not included in `dictionary`
public static let xcodeVersion = "26.5 (17F42)"
public static let deviceIDKey = "X-Mme-Device-Id"
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 let deviceID: String
public static let clientInfoKey = "X-MMe-Client-Info"
public let clientInfo: String
/// `X-Apple-I-ROM`
static let romAddressKey = "X-Apple-I-ROM"
public let romAddress: String
public let akdUserAgent: String
/// `X-Apple-I-MLB`
static let mlbSerialNumberKey = "X-Apple-I-MLB"
/// main logic board serial number
public let mlbSerialNumber: String
public var dictionary: [String: String] {
/// `X-Apple-I-SRL-NO`
static let serialNumberKey = "X-Apple-I-SRL-NO"
public let serialNumber: String
public let modelID: String
/// `X-MMe-Client-Info`
static let clientInfoKey = "X-MMe-Client-Info"
public var clientInfo: ClientInfo { .init(modelID: modelID) }
public init(
deviceID: String,
romAddress: String,
mlbSerialNumber: String,
serialNumber: String,
modelID: String
) {
self.deviceID = deviceID
self.romAddress = romAddress
self.mlbSerialNumber = mlbSerialNumber
self.serialNumber = serialNumber
self.modelID = modelID
}
var dictionary: [String: String] {
[
Self.clientInfoKey: clientInfo,
Self.deviceIDKey: deviceID,
Self.romAddressKey: romAddress,
Self.mlbSerialNumberKey: mlbSerialNumber,
Self.serialNumberKey: serialNumber
]
}
}
extension DeviceInfo {
public enum FetchError: Error {
case couldNotFetch
}
fileprivate static func fetch() throws -> Self {
guard let deviceInfo = DeviceInfo.current() else {
throw FetchError.couldNotFetch
}
return deviceInfo
}
}
public struct DeviceInfoProvider: DependencyKey, Sendable {
public var fetch: @Sendable () throws -> DeviceInfo
public init(fetch: @escaping @Sendable () throws -> DeviceInfo) {
self.fetch = fetch
}
private static let current = Result { try DeviceInfo.fetch() }
public static let testValue = DeviceInfoProvider(fetch: unimplemented())
public static let liveValue = DeviceInfoProvider { try current.get() }
}
extension DependencyValues {
public var deviceInfoProvider: DeviceInfoProvider {
get { self[DeviceInfoProvider.self] }
set { self[DeviceInfoProvider.self] = newValue }
}
}
@@ -0,0 +1,256 @@
//
// 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,9 +6,10 @@ struct OmnisetteADIProvider: RawADIProvider {
// should implement v3 of https://github.com/SideStore/omnisette-server
// list: https://servers.sidestore.io/servers.json
// e.g. https://ani.sidestore.io
private let url: URL
init(
url: URL = URL(string: "https://mac-ani.jkcoxson.com")!
url: URL = URL(string: "https://ani.sidestore.io")! // URL(string: "http://localhost:6969")!
) {
self.url = url
}
@@ -27,19 +28,15 @@ struct OmnisetteADIProvider: RawADIProvider {
return encoder
}()
func clientInfo() async throws -> ClientInfoWithUserAgent {
func clientInfo() async throws -> String {
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 ClientInfoWithUserAgent(
clientInfo: clientInfo.clientInfo,
akdUserAgent: clientInfo.userAgent,
)
return clientInfo.clientInfo
}
func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
@@ -0,0 +1,196 @@
#if canImport(XADI)
import Foundation
import XADI
import Dependencies
import Subprocess
public actor XADIProvider: RawADIProvider {
@MainActor private static var loadTask: Task<Void, Error>?
@Dependency(\.httpClient) private var httpClient
@Dependency(\.persistentDirectory) private var persistentDirectory
private var directory: URL { persistentDirectory.appendingPathComponent("Anisette") }
public init() {}
private func _loadADI(id: UUID) async throws {
let dir = self.directory
let libDir = dir.appending(path: "libs")
if !libDir.dirExists {
let tmp = dir.appending(path: "tmp")
try? FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)
let applemusic = tmp.appending(path: "applemusic.apk")
if !applemusic.exists {
print("[Downloading libraries] ...", terminator: "")
fflush(stdoutSafe)
let url = URL(string: "https://apps.mzstatic.com/content/android-apple-music-apk/applemusic.apk")!
defer { print("") }
let data = try await httpClient.makeRequest(HTTPRequest(url: url)) { progress in
guard let progress else { return }
let progString = "\(Int(progress * 100))%".padding(toLength: 4, leading: true)
print("\r[Downloading libraries] \(progString)", terminator: "")
fflush(stdoutSafe)
}.body
try data.write(to: applemusic)
}
#if arch(arm64)
let arch = "arm64-v8a"
#elseif arch(x86_64)
let arch = "x86_64"
#else
#error("Unsupported architecture")
#endif
let archDir = "lib/\(arch)"
// TODO: Use ZIPFoundation
try await Subprocess.run(
.name("unzip"),
arguments: [
"-q",
applemusic.path,
"\(archDir)/libCoreADI.so",
"\(archDir)/libstoreservicescore.so",
"-d", tmp.path
],
output: .discarded
).checkSuccess()
try FileManager.default.moveItem(
at: tmp.appending(path: archDir),
to: libDir
)
try? FileManager.default.removeItem(at: tmp)
}
xadi_Load(strdup(libDir.path()))
let rawID = id.uuidString.replacingOccurrences(of: "-", with: "").prefix(16).lowercased()
try check(xadi_SetAndroidID(rawID, UInt32(rawID.utf8.count)))
let adi = dir.appending(path: "adi")
try? FileManager.default.createDirectory(at: adi, withIntermediateDirectories: true)
try check(xadi_SetProvisioningPath(adi.path()))
}
@MainActor private func loadADI(id: UUID) async throws {
if let loadTask = Self.loadTask {
try await loadTask.value
return
}
let loadTask = Task { try await _loadADI(id: id) }
Self.loadTask = loadTask
try await loadTask.value
}
public func clientInfo() async throws -> String {
"""
<MacBookPro13,2> <macOS;13.1;22C65> <com.apple.AuthKit/1 (com.apple.dt.Xcode/3594.4.19)>
"""
}
public func startProvisioning(spim: Data, userID: UUID) async throws -> (any RawADIProvisioningSession, Data) {
try await loadADI(id: userID)
var sessionID: UInt32 = 0
var cpimBytes: UnsafeMutableRawPointer?
var cpimLen: UInt32 = 0
try check(spim.withUnsafeBytes { spimBytes in
xadi_ProvisioningStart(
UInt64(bitPattern: -2),
spimBytes.baseAddress!, UInt32(spimBytes.count),
&cpimBytes, &cpimLen,
&sessionID
)
})
let data = Data(UnsafeRawBufferPointer(start: cpimBytes, count: Int(cpimLen)))
_ = cpimBytes.map { xadi_Dispose($0) }
return (
ADISession(
sessionID: sessionID,
adiDirectory: directory.appending(path: "adi")
),
data
)
}
private struct ADISession: RawADIProvisioningSession {
let sessionID: UInt32
let adiDirectory: URL
func endProvisioning(routingInfo: UInt64, ptm: Data, tk: Data) async throws -> Data {
try check(ptm.withUnsafeBytes { ptmBuf in
tk.withUnsafeBytes { tkBuf in
xadi_ProvisioningEnd(
sessionID,
ptmBuf.baseAddress!, UInt32(ptmBuf.count),
tkBuf.baseAddress!, UInt32(tkBuf.count)
)
}
})
let file = adiDirectory.appending(path: "adi.pb")
// adi saves the file as 0o034 (group wx, public r) by default
// which is a... strange choice that prevents us from reading
// or writing by default. Since we're the owner, we can easily
// change this though.
try FileManager.default.setAttributes(
// rw for owner
[.posixPermissions: 0o600],
ofItemAtPath: file.path
)
return try Data(contentsOf: file)
}
}
public func requestOTP(
userID: UUID,
routingInfo: inout UInt64,
provisioningInfo: Data
) async throws -> (machineID: Data, otp: Data) {
try await loadADI(id: userID)
var midBytes: UnsafeMutableRawPointer?
var midLen: UInt32 = 0
var otpBytes: UnsafeMutableRawPointer?
var otpLen: UInt32 = 0
let adiDirectory = directory.appending(path: "adi")
try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)
let adiFile = adiDirectory.appending(path: "adi.pb")
try provisioningInfo.write(to: adiFile)
try check(xadi_OTPRequest(
UInt64(bitPattern: -2),
&midBytes, &midLen,
&otpBytes, &otpLen
))
let mid = Data(UnsafeRawBufferPointer(start: midBytes, count: Int(midLen)))
let otp = Data(UnsafeRawBufferPointer(start: otpBytes, count: Int(otpLen)))
_ = midBytes.map { xadi_Dispose($0) }
_ = otpBytes.map { xadi_Dispose($0) }
return (machineID: mid, otp: otp)
}
}
private func check(_ adiStatus: Int32) throws {
guard adiStatus == 0 else {
throw ADIError(code: Int(adiStatus))
}
}
extension StringProtocol {
fileprivate func padding(
toLength minLength: Int,
withPad pad: Character = " ",
leading: Bool = false
) -> String {
let justPadding = String(repeating: pad, count: Swift.max(minLength - count, 0))
return leading ? justPadding + self : self + justPadding
}
}
#endif
@@ -8,7 +8,7 @@
import Foundation
import Crypto
import CryptoExtras
import _CryptoExtras
import BigInt
struct SRPClient {
+12 -9
View File
@@ -15,34 +15,37 @@ 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 content = request.content(anisetteData: anisetteData)
var httpRequest = HTTPRequest(method: content.httpMethod, url: url)
let method = request.method(deviceInfo: deviceInfo, anisetteData: anisetteData)
var httpRequest = HTTPRequest(method: method.httpMethod, url: url)
httpRequest.headerFields[.contentType] = "text/x-xml-plist"
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = anisetteData.deviceInfo.clientInfo
let body: Data? = switch content {
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
let body: Data? = switch method {
case .get:
nil
case .data(let body, _, .xml):
case .post(let body):
try PropertyListSerialization.data(
fromPropertyList: body, format: .xml, options: 0
)
case .data(let body, _, .json):
try JSONSerialization.data(withJSONObject: body)
}
request.configure(request: &httpRequest, anisetteData: anisetteData)
request.configure(request: &httpRequest, deviceInfo: deviceInfo, anisetteData: anisetteData)
// GrandSlam doesn't seem to like reused (keep-alive) connections so create a
// new one for each request. cf https://github.com/rileytestut/AltSign/pull/52
let resp = try await httpClient.makeRequest(httpRequest, body: body, ephemeral: true)
let resp = try await httpClient.withEphemeralClient {
try await $0.makeRequest(httpRequest, body: body)
}
return try R.Decoder.decode(data: resp.body)
}
@@ -21,28 +21,34 @@ actor GrandSlamLookupManager {
private let decoder = PropertyListDecoder()
private var endpoints: GrandSlamEndpoints?
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.httpClient) var httpClient
init() {}
private func performLookup() async throws -> GrandSlamEndpoints {
let deviceInfo = try await anisetteDataProvider.deviceInfo()
let deviceInfo = try deviceInfoProvider.fetch()
/* {
"X-Apple-I-Locale" = "en_IN";
"X-Apple-I-TimeZone" = "Asia/Kolkata";
"X-Apple-I-TimeZone-Offset" = 19800;
"X-MMe-Client-Info" = "<MacBookPro11,5> <Mac OS X;10.14.6;18G103> <com.apple.AuthKit/1 (com.apple.akd/1.0)>";
"X-MMe-Country" = IN;
"X-Mme-Device-Id" = "[REDACTED]";
} */
var request = HTTPRequest(url: Self.lookupURL)
request.headerFields = [
.userAgent: deviceInfo.akdUserAgent,
.userAgent: deviceInfo.clientInfo.userAgent,
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
.init(AnisetteData.iLocaleKey)!: Locale.current.identifier,
.init(AnisetteData.timeZoneKey)!: TimeZone.current.identifier,
.init("X-Apple-I-TimeZone-Offset")!: "\(TimeZone.current.secondsFromGMT())"
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
for (key, value) in deviceInfo.dictionary {
request.headerFields[.init(key)!] = value
}
let (_, body) = try await httpClient.makeRequest(request, ephemeral: true)
let (_, body) = try await httpClient.makeRequest(request)
return try self.decoder.decode(Response.self, from: body).urls
}
@@ -6,7 +6,6 @@
// Copyright © 2019 Kabir Oberai. All rights reserved.
//
import XUtils
import Foundation
public protocol TwoFactorAuthDelegate: AnyObject, Sendable {
@@ -27,20 +26,12 @@ struct GrandSlamTwoFactorAuthenticateOperation {
private func performSMSAuth() async throws {
// TODO: parse phone number list from o=complete req?
let phoneNumberID = 1
do {
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
} catch let error as HTTPResponseError where error.status.code == 403 {
d.out.print("""
warning: Could not send verification code via SMS. Falling back to trusted device authentication...
""")
try await performTrustedDeviceAuth()
return
}
let phoneNumberID = "1"
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
try await validateCode(phoneNumberID: phoneNumberID)
}
private func validateCode(phoneNumberID: Int? = nil) async throws {
private func validateCode(phoneNumberID: String? = nil) async throws {
guard let code = await self.delegate.fetchCode() else { throw Error.userCancelled }
let request: any GrandSlamRequest = if let phoneNumberID {
GrandSlamValidateSMSRequest(
@@ -60,14 +51,7 @@ struct GrandSlamTwoFactorAuthenticateOperation {
private func performTrustedDeviceAuth() async throws {
let request = GrandSlamTrustedDeviceRequest(loginData: loginData)
do {
try await client.send(request)
} catch let error as HTTPResponseError where error.status.code == 403 {
d.out.print("""
warning: Could not send verification code. Generate one manually.
See https://github.com/xtool-org/xtool/discussions/368
""")
}
try await client.send(request)
try await validateCode()
}
@@ -35,22 +35,16 @@ struct GrandSlamSMSAuthRequest: GrandSlamTwoFactorRequest {
static func decode(data: Data) throws {}
}
static let endpoint: GrandSlamEndpoint = .url(URL(string: "https://gsa.apple.com/auth/verify/phone")!)
static let endpoint: GrandSlamEndpoint = .url(URL(string: "https://gsa.apple.com/auth/verify/phone/put?mode=sms")!)
let loginData: GrandSlamLoginData
let phoneNumberID: Int
let phoneNumberID: String
var extraHeaders: [String: String] {
[
"Content-Type": "application/json",
"Accept": "application/json",
]
}
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
.put([
"phoneNumber": ["id": phoneNumberID],
"mode": "sms",
], type: .json)
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.post([
"serverInfo": [
"phoneNumber.id": phoneNumberID
],
])
}
}
@@ -29,25 +29,20 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
}
static let endpoint: GrandSlamEndpoint = .url(URL(
string: "https://gsa.apple.com/auth/verify/phone/securitycode"
string: "https://gsa.apple.com/auth/verify/phone/securitycode?referrer=/auth/verify/phone/put"
)!)
let loginData: GrandSlamLoginData
let phoneNumberID: Int
let phoneNumberID: String
let verificationCode: String
var extraHeaders: [String: String] {
[
"Content-Type": "application/json",
"Accept": "application/json",
]
}
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.post([
"securityCode": ["code": verificationCode],
"phoneNumber": ["id": phoneNumberID],
"mode": "sms",
], type: .json)
"securityCode.code": verificationCode,
"serverInfo": [
"mode": "sms",
"phoneNumber.id": phoneNumberID
]
])
}
}

Some files were not shown because too many files have changed in this diff Show More