Compare commits

..

1 Commits

111 changed files with 1284 additions and 2682 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_27.0.0.app
-1
View File
@@ -2,7 +2,6 @@ on:
push:
branches:
- main
- pre/**
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
-1
View File
@@ -2,7 +2,6 @@ on:
push:
branches:
- main
- pre/**
pull_request:
concurrency:
group: integration-${{ github.workflow }}-${{ github.ref }}
+1 -6
View File
@@ -84,12 +84,7 @@ jobs:
- name: Create and publish release
run: |
TAG="${{ github.ref_name }}"
FLAGS=(--draft)
# e.g. 2.0.0-beta.1
if [[ "$TAG" == *-* ]]; then
FLAGS+=(--prerelease --latest=false)
fi
gh release create "$TAG" "${FLAGS[@]}" --title "v$TAG"
gh release create "$TAG" --draft --title "v$TAG"
gh release upload "$TAG" output/**/*.{AppImage,AppImage.zsync,app.zip,app.dSYM.zip}
docker:
uses: docker/github-builder/.github/workflows/build.yml@v1
-1
View File
@@ -2,7 +2,6 @@ on:
push:
branches:
- main
- pre/**
pull_request:
paths:
- '.github/workflows/swiftlint.yml'
-1
View File
@@ -13,4 +13,3 @@ DerivedData/
/openapi
/.tmp
/xtool
+7 -9
View File
@@ -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.
+1 -1
View File
@@ -1,7 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
ARG SWIFT_VERSION=6.4.2
ARG SWIFT_VERSION=6.4.0
FROM swift:${SWIFT_VERSION}-jammy AS build-base
+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
@@ -68,7 +68,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
Download **Xcode 27.1** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
Download **Xcode 27** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
> Note:
>
@@ -131,7 +131,7 @@ Choice (0-1): 0
Path to Xcode.xip:
```
Enter the path (for example `~/Downloads/Xcode_27.1.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Enter the path (for example `~/Downloads/Xcode_27.0.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Confirm that it worked:
@@ -1,26 +1,4 @@
import ExampleSupport
import SwiftUI
@main struct DemoApp: App {
public var body: some Scene {
WindowGroup {
ContentView()
}
}
}
private struct ContentView: View {
@State var counter = 0
var body: some View {
VStack {
Button("Counter = \(counter)") {
counter += 1
}
}
.padding()
.task {
Example.pass()
}
}
}
@main struct DemoApp: ExampleApp {}
+1 -10
View File
@@ -1,5 +1,5 @@
{
"originHash" : "87792a9d5953dfe62ed2edf7c4f142774813bd3ea31882cbf6659b62fb2827ab",
"originHash" : "4a80ae2e9e4c4e1e4e29c32e93dc624202a42a942e44d358035684ec5e0746f7",
"pins" : [
{
"identity" : "combine-schedulers",
@@ -10,15 +10,6 @@
"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",
-3
View File
@@ -17,9 +17,6 @@ let package = Package(
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(
+59 -59
View File
@@ -1,13 +1,13 @@
{
"originHash" : "2ccd077fc130f0f1b1279d87aa61d1fc243964d7ad49489a12021577c54df9de",
"originHash" : "7ae7f57a6038e121dec04557563bc2a3412c9e46e473d9c84f3e3ac82be608f9",
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
"revision" : "dd9206de0717d658daec6a064992894fdab8ae17",
"version" : "4.7.3"
"revision" : "db806756c989760b35108146381535aec231092b",
"version" : "4.7.0"
}
},
{
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
"version" : "1.36.2"
"revision" : "f95c908967e98c68c5ce3fd61a7974e7e869e303",
"version" : "1.36.1"
}
},
{
@@ -105,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
"version" : "1.1.7"
"revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c",
"version" : "1.1.5"
}
},
{
@@ -141,8 +141,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
"version" : "1.7.3"
"revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
"version" : "1.6.0"
}
},
{
@@ -150,8 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
"version" : "1.4.3"
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
"version" : "1.4.1"
}
},
{
@@ -159,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-configuration.git",
"state" : {
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
"version" : "1.2.2"
"revision" : "3533f65d3e36dcdffc91ce34ef4d3c9c1887fd4b",
"version" : "1.2.1"
}
},
{
@@ -168,17 +168,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" : "a9d1d5ab8951ada40cafff8c8e2b551dfde4f390",
"version" : "5.0.0"
}
},
{
@@ -195,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
"version" : "1.7.2"
"revision" : "cc504a45f6ce73ce6067837d7ac19fa67b229a56",
"version" : "1.5.0"
}
},
{
@@ -240,8 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
"state" : {
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
"version" : "2.1.2"
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
"version" : "2.1.1"
}
},
{
@@ -249,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
"version" : "1.16.1"
"revision" : "9c6fb14227f55d8f711ce3847dc2f419fb0ecacb",
"version" : "1.15.1"
}
},
{
@@ -258,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
"version" : "2.104.0"
"revision" : "21de5f08c1a166a6dd293d0e587ad977bf8dac5d",
"version" : "2.103.0"
}
},
{
@@ -321,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
"version" : "1.14.2"
"revision" : "39d49cf22abab58a07f02bb76808b5d2839b294a",
"version" : "1.13.1"
}
},
{
@@ -330,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
"version" : "1.13.1"
"revision" : "9e53df53e043b53046a371b31aaf0a1e26eef946",
"version" : "1.12.1"
}
},
{
@@ -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" : "08796d36c99ad2318929bfa1d1e40f82194b65cc",
"version" : "1.3.1"
}
},
{
@@ -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" : "7f9326b0326ff86e3646295ea6e891f68c471c5e",
"version" : "2.12.0"
}
},
{
@@ -375,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-subprocess",
"state" : {
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
"version" : "1.0.2"
"revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
"version" : "1.0.0"
}
},
{
@@ -424,6 +406,15 @@
"version" : "2.16.2"
}
},
{
"identity" : "xadi",
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xadi",
"state" : {
"revision" : "3db108d3cafe719a4b2e9d13a9c8c52770e20aa7",
"version" : "0.4.2"
}
},
{
"identity" : "xcode-project-format",
"kind" : "remoteSourceControl",
@@ -438,8 +429,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
"version" : "9.17.6"
"revision" : "aeea2e97376cd69fbdd1c7e68664b79a1a641dde",
"version" : "9.17.5"
}
},
{
@@ -447,8 +438,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xtool-core",
"state" : {
"revision" : "154d7213c12e3f21d50793f50ec7bfb89cfd3918",
"version" : "1.5.1"
"revision" : "f867f9c2aea16ac78ca14d0d2f948b47db0732b4",
"version" : "1.5.0"
}
},
{
@@ -456,8 +447,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" : "f6158be9e62a5ce2a53d72b1a6d880880da956c8",
"version" : "1.9.0"
}
}
],
+14 -30
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])),
]
@@ -50,9 +48,10 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.1")),
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.0")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/xtool-org/swift-rcodesign", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.9.0")),
.package(url: "https://github.com/xtool-org/xadi", .upToNextMinor(from: "0.4.2")),
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
@@ -62,7 +61,10 @@ let package = Package(
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-collections", from: "1.7.1"),
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
// v1.7.0 has a crash on old OSes: https://github.com/apple/swift-collections/issues/733.
// pin 1.6.0 until 1.7.1 is released.
.package(url: "https://github.com/apple/swift-collections", exact: "1.6.0"),
.package(url: "https://github.com/apple/xcode-project-format.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
@@ -74,13 +76,12 @@ 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/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
@@ -92,9 +93,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 +111,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",
@@ -130,10 +126,12 @@ let package = Package(
"DeveloperAPI",
"CXKit",
"XUtils",
.product(name: "XADI", package: "xadi", condition: .when(platforms: [.linux, .macOS])),
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "Dependencies", package: "swift-dependencies"),
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
.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"),
@@ -167,20 +165,7 @@ 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,
),
.target(
name: "XCLIUtils",
dependencies: [
"XUtils",
.product(name: "Dependencies", package: "swift-dependencies"),
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
],
swiftSettings: swiftSettings,
),
@@ -189,11 +174,10 @@ 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: "libunxip", package: "unxip"),
],
cSettings: cSettings,
+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:
-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
}
-7
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
+5 -5
View File
@@ -220,16 +220,16 @@ public struct XcodePacker {
importedProducts: [],
)
let project = XcodeProject(project: schema)
let projectURL = projectDir.appending(path: "\(plan.app.product).xcodeproj")
let project = XcodeProject(project: schema, url: projectURL)
try project.write()
try project.write(to: projectURL)
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()
])
let workspaceURL = xtoolDir.appending(path: "\(plan.app.product).xcworkspace")
try workspace.write(to: workspaceURL)
return workspaceURL
}
-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,7 +90,7 @@ 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() {
@Dependency(\.keyValueStorage) var storage
@@ -150,7 +155,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 +179,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 +239,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
machineID: mid.base64EncodedString(),
localUserID: self.localUserID,
oneTimePassword: otp.base64EncodedString(),
deviceInfo: try await deviceInfo(),
deviceID: self.localUserUID.uuidString
)
}
@@ -241,7 +249,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
}
private static var providerID: String? {
"mac-omnisette"
"2"
}
public var providerID: String? { Self.providerID }
@@ -279,15 +287,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
)
}
public func deviceInfo() async throws -> DeviceInfo {
let clientInfo = try await clientInfo()
return DeviceInfo(
deviceID: localUserUID.uuidString,
clientInfo: clientInfo.clientInfo,
akdUserAgent: clientInfo.akdUserAgent,
)
}
}
public struct ADIError: Error, CustomStringConvertible {
@@ -10,14 +10,14 @@ import Foundation
public struct AnisetteData {
private static let 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
}
}
@@ -22,8 +22,6 @@ public protocol AnisetteDataProvider: Sendable {
func resetProvisioning() async
func provisioningData() -> ProvisioningData?
func deviceInfo() async throws -> DeviceInfo
func fetchAnisetteData() async throws -> AnisetteData
}
@@ -56,9 +54,4 @@ private struct UnimplementedAnisetteDataProvider: AnisetteDataProvider {
let closure: () async throws -> AnisetteData = unimplemented()
return try await closure()
}
func deviceInfo() async throws -> DeviceInfo {
let closure: () async throws -> DeviceInfo = unimplemented()
return try await closure()
}
}
@@ -0,0 +1,102 @@
//
// DeviceInfo+Fetching.swift
// XKit
//
// Created by Kabir Oberai on 18/06/20.
// Copyright © 2020 Kabir Oberai. All rights reserved.
//
import Foundation
#if os(macOS)
extension DeviceInfo {
private static func fetchDeviceID() -> String? {
var waitTime = timespec(tv_sec: 0, tv_nsec: 0) // wait indefinitely
let bytes = [UInt8](unsafeUninitializedCapacity: MemoryLayout<uuid_t>.size) { buf, count in
// force unwrapping is safe because uuid_t has a non-zero size
count = (gethostuuid(buf.baseAddress!, &waitTime) == 0) ? buf.count : 0
}
guard !bytes.isEmpty else { return nil }
return bytes.withUnsafeBufferPointer {
UUID(uuid: UnsafeRawBufferPointer($0).load(as: uuid_t.self)).uuidString
}
}
private static func hardwareProperty(forKey key: String) -> Data? {
let entry = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options")
guard entry != 0 else { return nil }
defer { IOObjectRelease(entry) }
return IORegistryEntryCreateCFProperty(
entry, key as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? Data
}
private static func fetchROMAddress() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:ROM")?
.map { String(format: "%02hhx", $0) }
.joined()
}
private static func fetchMLBSerialNumber() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:MLB")?
.map { String(format: isprint(Int32($0)) != 0 ? "%c" : "%02hhx", $0) }
.joined()
}
private static func fetchSerialNumber() -> String? {
let service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
guard service != 0 else { return nil }
defer { IOObjectRelease(service) }
return IORegistryEntryCreateCFProperty(
service, "IOPlatformSerialNumber" as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? String
}
private static func fetchHardwareModel() -> String? {
var modelSize = 0
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0,
modelSize > 0 else { return nil }
return String(unsafeUninitializedCapacity: modelSize) { buf in
var len = modelSize
guard sysctlbyname("hw.model", buf.baseAddress, &len, nil, 0) == 0,
len == modelSize else { return 0 }
return len - 1 // exclude NUL
}
}
public static func current() -> DeviceInfo? {
let romAddress = fetchROMAddress() ?? ""
let mlbSerialNumber = fetchMLBSerialNumber() ?? ""
guard let deviceID = fetchDeviceID(),
let serialNumber = fetchSerialNumber(),
let modelID = fetchHardwareModel()
else { return nil }
return DeviceInfo(
deviceID: deviceID,
romAddress: romAddress,
mlbSerialNumber: mlbSerialNumber,
serialNumber: serialNumber,
modelID: modelID
)
}
}
#else
extension DeviceInfo {
public static func current() -> DeviceInfo? {
return DeviceInfo(
deviceID: "99B5D9D4-B068-5CEE-A799-5EBB5B0894A6",
romAddress: "94f6a300e9a0",
mlbSerialNumber: "C02520301W0GF2D1U",
serialNumber: "C02PQKRJG8WP",
modelID: "Mac16,1"
)
}
}
#endif
// FIXME: Figure out DeviceInfo.current() outside macOS
// (see above)
@@ -1,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 {
"""
<Pixel 7> <Android;14;UQ1A.240205.002> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
"""
}
var userAgent: String {
"AuthKit/1 (Macintosh; OS X 27.0) (com.apple.dt.Xcode/26.5)"
}
public init(modelID: String) {
self.modelID = modelID
}
}
/// `X-Mme-Device-Id`
static let deviceIDKey = "X-Mme-Device-Id"
public let deviceID: String
public static let clientInfoKey = "X-MMe-Client-Info"
public let clientInfo: String
/// `X-Apple-I-ROM`
static let romAddressKey = "X-Apple-I-ROM"
public let romAddress: String
public 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 }
}
}
@@ -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
+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
]
])
}
}
@@ -69,12 +69,12 @@ extension GrandSlamOperationRequest {
static var endpoint: GrandSlamEndpoint { .lookup(\.gsService) }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
request.headerFields[.accept] = "*/*"
request.headerFields[.userAgent] = anisetteData.deviceInfo.akdUserAgent
request.headerFields[.userAgent] = deviceInfo.clientInfo.userAgent
}
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
var clientData: [String: Any] = [
"bootstrap": true,
"icscrec": true,
@@ -83,6 +83,7 @@ extension GrandSlamOperationRequest {
"svct": "iCloud",
"loc": Locale.current.identifier
]
clientData.merge(deviceInfo.dictionary) { _, b in b }
clientData.merge(anisetteData.dictionary) { _, b in b }
var request: [String: Any] = [
@@ -7,29 +7,15 @@
//
import Foundation
import HTTPTypes
enum GrandSlamRequestContent {
enum ContentType {
case xml
case json
}
enum GrandSlamMethod {
case get
case data([String: Any], method: HTTPRequest.Method, type: ContentType = .xml)
static func post(_ body: [String: Any], type: ContentType = .xml) -> Self {
.data(body, method: .post, type: type)
}
static func put(_ body: [String: Any], type: ContentType = .xml) -> Self {
.data(body, method: .put, type: type)
}
case post([String: Any])
var httpMethod: HTTPRequest.Method {
switch self {
case .get: return .get
case .data(_, let method, _): return method
case .post: return .post
}
}
}
@@ -44,6 +30,6 @@ protocol GrandSlamRequest: Sendable {
static var endpoint: GrandSlamEndpoint { get }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData)
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData)
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod
}
@@ -17,10 +17,9 @@ extension GrandSlamTwoFactorRequest {
var extraHeaders: [String: String] { [:] }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
request.headerFields[.accept] = "application/x-buddyml"
request.headerFields[.contentType] = "application/x-plist"
request.headerFields[.userAgent] = anisetteData.deviceInfo.akdUserAgent
request.headerFields[.init("X-Apple-App-Info")!] = "com.apple.gs.xcode.auth"
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
request.headerFields[.init("X-Apple-Identity-Token")!] = loginData.identityToken
@@ -28,7 +27,7 @@ extension GrandSlamTwoFactorRequest {
extraHeaders.forEach { request.headerFields[.init($0)!] = $1 }
}
func content(anisetteData: AnisetteData) -> GrandSlamRequestContent {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.get
}
@@ -35,13 +35,11 @@ private struct Client: HTTPClientProtocol {
}
private static let tlsConfiguration: TLSConfiguration = {
let appleRoots = appleRootCertificates.map { pem in
// if ssl cert parsing fails we're screwed so we might as well force try
// swiftlint:disable:next force_try
try! NIOSSLCertificate(bytes: Array(pem.utf8), format: .pem)
}
// if ssl cert parsing fails we're screwed so we might as well force try
// swiftlint:disable:next force_try
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
tlsConfiguration.additionalTrustRoots = [.certificates(appleRoots)]
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
tlsConfiguration.certificateVerification = .none
}
@@ -138,17 +136,6 @@ private final class WebSocketSessionWrapper: WebSocketSession {
}
}
// MARK: - Apple Root Certificates
// https://www.apple.com/certificateauthority/
private let appleRootCertificates: [String] = [
appleRootPEM,
appleRootG2PEM,
appleRootG3PEM,
]
// https://www.apple.com/appleca/AppleIncRootCertificate.cer
private let appleRootPEM = """
-----BEGIN CERTIFICATE-----
MIIEuzCCA6OgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJVUzET
@@ -179,59 +166,4 @@ IQ7aunMZT7XZNn/Bh1XZp5m5MkL72NVxnn6hUrcbvZNCJBIqxw8dtk2cXmPIS4AX
UKqK1drk/NAJBzewdXUh
-----END CERTIFICATE-----
"""
// https://www.apple.com/certificateauthority/AppleRootCA-G2.cer
private let appleRootG2PEM = """
-----BEGIN CERTIFICATE-----
MIIFkjCCA3qgAwIBAgIIAeDltYNno+AwDQYJKoZIhvcNAQEMBQAwZzEbMBkGA1UE
AwwSQXBwbGUgUm9vdCBDQSAtIEcyMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0
aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMw
HhcNMTQwNDMwMTgxMDA5WhcNMzkwNDMwMTgxMDA5WjBnMRswGQYDVQQDDBJBcHBs
ZSBSb290IENBIC0gRzIxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0
aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzCCAiIwDQYJ
KoZIhvcNAQEBBQADggIPADCCAgoCggIBANgREkhI2imKScUcx+xuM23+TfvgHN6s
XuI2pyT5f1BrTM65MFQn5bPW7SXmMLYFN14UIhHF6Kob0vuy0gmVOKTvKkmMXT5x
ZgM4+xb1hYjkWpIMBDLyyED7Ul+f9sDx47pFoFDVEovy3d6RhiPw9bZyLgHaC/Yu
OQhfGaFjQQscp5TBhsRTL3b2CtcM0YM/GlMZ81fVJ3/8E7j4ko380yhDPLVoACVd
J2LT3VXdRCCQgzWTxb+4Gftr49wIQuavbfqeQMpOhYV4SbHXw8EwOTKrfl+q04tv
ny0aIWhwZ7Oj8ZhBbZF8+NfbqOdfIRqMM78xdLe40fTgIvS/cjTf94FNcX1RoeKz
8NMoFnNvzcytN31O661A4T+B/fc9Cj6i8b0xlilZ3MIZgIxbdMYs0xBTJh0UT8TU
gWY8h2czJxQI6bR3hDRSj4n4aJgXv8O7qhOTH11UL6jHfPsNFL4VPSQ08prcdUFm
IrQB1guvkJ4M6mL4m1k8COKWNORj3rw31OsMiANDC1CvoDTdUE0V+1ok2Az6DGOe
HwOx4e7hqkP0ZmUoNwIx7wHHHtHMn23KVDpA287PT0aLSmWaasZobNfMmRtHsHLD
d4/E92GcdB/O/WuhwpyUgquUoue9G7q5cDmVF8Up8zlYNPXEpMZ7YLlmQ1A/bmH8
DvmGqmAMQ0uVAgMBAAGjQjBAMB0GA1UdDgQWBBTEmRNsGAPCe8CjoA1/coB6HHcm
jTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwF
AAOCAgEAUabz4vS4PZO/Lc4Pu1vhVRROTtHlznldgX/+tvCHM/jvlOV+3Gp5pxy+
8JS3ptEwnMgNCnWefZKVfhidfsJxaXwU6s+DDuQUQp50DhDNqxq6EWGBeNjxtUVA
eKuowM77fWM3aPbn+6/Gw0vsHzYmE1SGlHKy6gLti23kDKaQwFd1z4xCfVzmMX3z
ybKSaUYOiPjjLUKyOKimGY3xn83uamW8GrAlvacp/fQ+onVJv57byfenHmOZ4VxG
/5IFjPoeIPmGlFYl5bRXOJ3riGQUIUkhOb9iZqmxospvPyFgxYnURTbImHy99v6Z
SYA7LNKmp4gDBDEZt7Y6YUX6yfIjyGNzv1aJMbDZfGKnexWoiIqrOEDCzBL/FePw
N983csvMmOa/orz6JopxVtfnJBtIRD6e/J/JzBrsQzwBvDR4yGn1xuZW7AYJNpDr
FEobXsmII9oDMJELuDY++ee1KG++P+w8j2Ud5cAeh6Squpj9kuNsJnfdBrRkBof0
Tta6SqoWqPQFZ2aWuuJVecMsXUmPgEkrihLHdoBR37q9ZV0+N0djMenl9MU/S60E
inpxLK8JQzcPqOMyT/RFtm2XNuyE9QoB6he7hY1Ck3DDUOUUi78/w0EP3SIEIwiK
um1xRKtzCTrJ+VKACd+66eYWyi4uTLLT3OUEVLLUNIAytbwPF+E=
-----END CERTIFICATE-----
"""
// https://www.apple.com/certificateauthority/AppleRootCA-G3.cer
private let appleRootG3PEM = """
-----BEGIN CERTIFICATE-----
MIICQzCCAcmgAwIBAgIILcX8iNLFS5UwCgYIKoZIzj0EAwMwZzEbMBkGA1UEAwwS
QXBwbGUgUm9vdCBDQSAtIEczMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0aW9u
IEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcN
MTQwNDMwMTgxOTA2WhcNMzkwNDMwMTgxOTA2WjBnMRswGQYDVQQDDBJBcHBsZSBS
b290IENBIC0gRzMxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9y
aXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzB2MBAGByqGSM49
AgEGBSuBBAAiA2IABJjpLz1AcqTtkyJygRMc3RCV8cWjTnHcFBbZDuWmBSp3ZHtf
TjjTuxxEtX/1H7YyYl3J6YRbTzBPEVoA/VhYDKX1DyxNB0cTddqXl5dvMVztK517
IDvYuVTZXpmkOlEKMaNCMEAwHQYDVR0OBBYEFLuw3qFYM4iapIqZ3r6966/ayySr
MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gA
MGUCMQCD6cHEFl4aXTQY2e3v9GwOAEZLuN+yRhHFD/3meoyhpmvOwgPUnPWTxnS4
at+qIxUCMG1mihDK1A3UT82NQz60imOlM27jbdoXt2QfyFMm+YhidDkLF1vLUagM
6BgD56KyKA==
-----END CERTIFICATE-----
"""
#endif
@@ -46,21 +46,8 @@ extension HTTPClientProtocol {
_ request: HTTPRequest,
body: Data? = nil,
requireHTTPSuccess: Bool = true,
ephemeral: Bool = false,
onProgress: @isolated(any) (Double?) -> Void = { _ in }
) async throws -> (response: HTTPResponse, body: Data) {
if ephemeral {
return try await self.withEphemeralClient { client in
try await client.makeRequest(
request,
body: body,
requireHTTPSuccess: requireHTTPSuccess,
ephemeral: false,
onProgress: onProgress
)
}
}
await onProgress(0)
let (response, responseBody) = try await send(request, body: body.map { HTTPBody($0) })
guard !requireHTTPSuccess || ![.clientError, .serverError].contains(response.status.kind) else {
@@ -7,7 +7,6 @@
//
import Foundation
import XUtils
import SwiftyMobileDevice
public final class ProfileManager {
@@ -54,16 +53,16 @@ public final class ProfileManager {
for (bundleID, profiles) in toInstall {
guard profiles.count == 1 else {
d.out.print("Unexpected # of profiles for \(bundleID): \(profiles.count). Skipping.")
print("Unexpected # of profiles for \(bundleID): \(profiles.count). Skipping.")
continue
}
let profile = profiles[0]
let installedProfiles = installed[bundleID] ?? []
for installedProfile in installedProfiles {
d.out.print("Removing \(installedProfile.1.uuid) for \(bundleID)")
print("Removing \(installedProfile.1.uuid) for \(bundleID)")
try client.removeProfile(withUUID: installedProfile.1.uuid)
}
d.out.print("Installing profile with UUID \(profile.1.uuid)")
print("Installing profile with UUID \(profile.1.uuid)")
try client.install(profile: profile.0.data())
}
}
@@ -294,7 +294,7 @@ public actor IntegratedInstaller {
app: URL,
targetDevice: SigningContext.TargetDevice? = nil,
) async throws -> String {
let context = SigningContext(
let context = try SigningContext(
auth: auth,
targetDevice: targetDevice,
)
@@ -0,0 +1,48 @@
//
// Superconfig.swift
//
//
// Created by Kabir Oberai on 02/05/21.
//
import Foundation
public struct Superconfig: Codable, Sendable {
// Stuff that needs to come from the installer
public let udid: String
public let pairingKeys: Data
public let deviceInfo: DeviceInfo
// Stuff that can also be fetched in-app
public let preferredTeamID: String
public let preferredSigningInfo: SigningInfo?
public let appleID: String
public let provisioningData: ProvisioningData?
public let token: DeveloperServicesLoginToken
public init(
udid: String,
pairingKeys: Data,
deviceInfo: DeviceInfo,
preferredTeamID: String,
preferredSigningInfo: SigningInfo?,
appleID: String,
provisioningData: ProvisioningData?,
token: DeveloperServicesLoginToken
) {
self.udid = udid
self.pairingKeys = pairingKeys
self.deviceInfo = deviceInfo
self.preferredTeamID = preferredTeamID
self.preferredSigningInfo = preferredSigningInfo
self.appleID = appleID
self.provisioningData = provisioningData
self.token = token
}
public static let filename = "Superconfig.plist"
public static let encoder = PropertyListEncoder()
public func save(inAppDir appDir: URL) throws {
try Self.encoder.encode(self).write(to: appDir.appendingPathComponent(Self.filename))
}
}
+4 -15
View File
@@ -57,23 +57,12 @@ public struct Certificate: Codable, Sendable {
}
public func serialNumber() -> String {
// big endian, hex-encoded. Leading zero bytes are dropped, but not leading zero
// nibbles: Apple formats serials like "03AB…", not "3AB…" (#305).
raw.serialNumber.bytes
.drop { $0 == 0 }
// big endian, hex-encoded
let content = raw.serialNumber.bytes.lazy
.map { String(format: "%02hhX", $0) }
.joined()
}
/// Whether `serialNumber` (hex-encoded, e.g. by the App Store Connect API)
/// is this certificate's serial number.
///
/// Compares numerically, so case and leading zeros don't matter.
public func hasSerialNumber(_ serialNumber: String) -> Bool {
func normalized(_ hex: String) -> Substring {
hex.uppercased().drop { $0 == "0" }
}
return normalized(serialNumber) == normalized(self.serialNumber())
.drop { $0 == "0" }
return String(content)
}
public func wasIssuedBefore(_ other: Certificate) -> Bool {
@@ -29,7 +29,6 @@ extension EntitlementContainer {
WiFiAwareEntitlement.self,
HomeKitEntitlement.self,
HealthKitEntitlement.self,
AppleSignInEntitlement.self,
]
}
@@ -100,21 +99,6 @@ public struct AssociatedDomainsEntitlement: Entitlement, RawRepresentable {
}
}
public struct AppleSignInEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.applesignin"
public var rawValue: [String]
public init(rawValue: [String]) { self.rawValue = rawValue }
public init(from decoder: Decoder) throws {
rawValue = try decoder.singleValueContainer().decode([String].self)
}
public func encode(to encoder: Encoder) throws {
var container = encoder.singleValueContainer()
try container.encode(rawValue)
}
}
public enum APSEnvironmentEntitlement: String, Entitlement {
public static let identifier = "aps-environment"
+5 -8
View File
@@ -1,17 +1,17 @@
import Foundation
import Dependencies
/// Provisions and codesigns.
public struct AutoSigner {
@Dependency(\.signer) private var signer
public enum Error: LocalizedError {
case noSigners
case errorReading(String)
case errorWriting(String)
public var errorDescription: String? {
switch self {
case .noSigners:
return NSLocalizedString("signer.error.no_signers", value: "No signers found", comment: "")
case .errorReading(let file):
return "\(file)".withCString {
String.localizedStringWithFormat(
@@ -82,16 +82,13 @@ public struct AutoSigner {
try info.mobileprovision.data().write(to: profURL)
}
let encoder = PropertyListEncoder()
encoder.outputFormat = .xml
let entitlements = try provisioningDict.mapValues { try encoder.encode($0.entitlements) }
let entitlements = provisioningDict.mapValues(\.entitlements)
status(NSLocalizedString("signer.signing", value: "Signing", comment: ""))
try await signer.sign(
try await context.signer.sign(
app: app,
identity: .real(signingInfo.certificate, signingInfo.privateKey),
entitlementMapping: entitlements,
deep: true,
progress: progress
)
progress(1)
-57
View File
@@ -1,57 +0,0 @@
import Foundation
import RCodesign
public actor RCodesignSigner: Signer {
public enum Error: LocalizedError {
case badFilePath
public var errorDescription: String? {
switch self {
case .badFilePath:
return NSLocalizedString(
"signer_impl.error.bad_file_path", value: "A bad file path was provided", comment: ""
)
}
}
}
public init() {}
public func sign(
app: URL,
identity: SignerIdentity,
entitlementMapping: [URL: Data],
deep: Bool,
progress: @escaping @Sendable (Double?) -> Void
) throws {
progress(nil)
guard app.isFileURL else { throw Error.badFilePath }
let root = app.standardizedFileURL.pathComponents
var entitlements: [String: Data] = [:]
for (bundle, value) in entitlementMapping {
let components = bundle.standardizedFileURL.pathComponents
guard bundle.isFileURL, components.starts(with: root) else { throw Error.badFilePath }
// RCodesign scopes entitlements by bundle-relative path: "" for the
// app itself and e.g. "PlugIns/Widget.appex" for an extension. Compare
// path components so a sibling such as App.app-copy cannot match App.app.
let path = components.dropFirst(root.count).joined(separator: "/")
guard entitlements[path] == nil else { throw Error.badFilePath }
entitlements[path] = value
}
let signingIdentity: RCodesign.Identity
switch identity {
case .real(let certificate, let privateKey):
signingIdentity = .certificate(certificateDER: try certificate.data(), privateKeyPEM: privateKey.data)
case .adhoc:
signingIdentity = .adHoc
}
try RCodesign.sign(at: app, identity: signingIdentity, options: .init(entitlements: entitlements, shallow: !deep))
}
public func analyze(executable: URL) throws -> Data? {
try RCodesign.entitlements(at: executable)
}
}
-50
View File
@@ -1,50 +0,0 @@
import Foundation
import Dependencies
public enum SignerIdentity: Sendable {
case real(Certificate, PrivateKey)
case adhoc
}
public protocol Signer: Sendable {
// entitlementMapping is [bundle url] -> [plist data]
func sign(
app: URL,
identity: SignerIdentity,
entitlementMapping: [URL: Data],
deep: Bool,
progress: @escaping @Sendable (Double?) -> Void
) async throws
func analyze(executable: URL) async throws -> Data?
}
private enum SignerDependencyKey: DependencyKey {
static var liveValue: any Signer { RCodesignSigner() }
static var testValue: any Signer { UnimplementedSigner() }
}
extension DependencyValues {
public var signer: any Signer {
get { self[SignerDependencyKey.self] }
set { self[SignerDependencyKey.self] = newValue }
}
}
private struct UnimplementedSigner: Signer {
func sign(
app: URL,
identity: SignerIdentity,
entitlementMapping: [URL: Data],
deep: Bool,
progress: @escaping @Sendable (Double?) -> Void
) async throws {
reportIssue("Unimplemented: Signer.sign")
throw UnimplementedFailure(description: "Signer.sign")
}
func analyze(executable: URL) async throws -> Data? {
reportIssue("Unimplemented: Signer.analyze")
throw UnimplementedFailure(description: "Signer.analyze")
}
}
+178
View File
@@ -0,0 +1,178 @@
import Foundation
import CXKit
import SignerSupport
import ConcurrencyExtras
/// a wrapper around `signer_t`
public actor Signer {
public enum Error: LocalizedError {
case notFound
case badFilePath
case signer(String?)
public var errorDescription: String? {
switch self {
case .notFound:
return NSLocalizedString(
"signer_impl.error.not_found", value: "No signer implementation found", comment: ""
)
case .badFilePath:
return NSLocalizedString(
"signer_impl.error.bad_file_path", value: "A bad file path was provided", comment: ""
)
case .signer(let error?):
return error
case .signer(nil):
return NSLocalizedString(
"signer_impl.error.unknown", value: "An unknown signing error occurred", comment: ""
)
}
}
}
public enum Identity {
case real(Certificate, PrivateKey)
case adhoc
}
private let signer: UnsafePointer<signer_t>
public var name: String {
String(cString: signer.pointee.name)
}
private init(signer: UncheckedSendable<UnsafePointer<signer_t>>) {
self.signer = signer.value
}
public static func all() -> some Collection<Signer> {
var list = get_signers()
var arr: [Signer] = []
while let curr = list {
arr.append(Signer(signer: UncheckedSendable(curr)))
list = curr.pointee.next
}
return arr
}
public static func first() throws -> Signer {
try all().first.orThrow(Error.notFound)
}
private func _sign(
app: URL,
identity: Identity,
entitlementMapping: [URL: Entitlements],
progress: @escaping (Double?) -> Void
) throws {
let encoder = PropertyListEncoder()
encoder.outputFormat = .xml
let entsArray: [entitlements_data_t] = try entitlementMapping.map { url, ents in
try url.withUnsafeFileSystemRepresentation { bundlePath in
guard let bundlePath = bundlePath else { throw Error.badFilePath }
return try encoder.encode(ents).withUnsafeBytes { bytes in
let copy = UnsafeMutableBufferPointer<UInt8>.allocate(capacity: bytes.count)
bytes.copyBytes(to: copy)
// an XML plist should always be non-empty so force unwrapping baseAddress is safe
return entitlements_data_t(
bundle_path: strdup(bundlePath),
data: copy.baseAddress!,
len: copy.count
)
}
}
}
defer {
entsArray.forEach {
free(UnsafeMutablePointer(mutating: $0.bundle_path))
$0.data.deallocate()
}
}
let sendableProgress = UncheckedSendable(progress)
let sendableEntsArray = UncheckedSendable(entsArray)
let certificateData: Data
let privateKeyData: Data
let lengthOverride: Int?
switch identity {
case .real(let certificate, let privateKey):
certificateData = try certificate.data()
privateKeyData = privateKey.data
lengthOverride = nil
case .adhoc:
// we can't use empty data here because withUnsafeBytes
// might return a bufferpointer with a nil base address,
// but signer.h expects non-null values. The real fix is
// updating xtool-core/SignerSupport/signer.h to annotate
// the pointers as nullable, but alas that requires effort.
certificateData = Data([0])
privateKeyData = Data([0])
lengthOverride = 0
}
try certificateData.withUnsafeBytes { cert in
try privateKeyData.withUnsafeBytes { priv in
var exception: UnsafeMutablePointer<Int8>?
defer { exception.map { free($0) } }
let progress = sendableProgress.value
let entsArray = sendableEntsArray.value
guard let certBase = cert.baseAddress,
let privBase = priv.baseAddress
else { throw Error.signer(nil) }
let box = Unmanaged.passRetained(progress as AnyObject)
defer { box.release() }
guard signer.pointee.sign(
app.path,
certBase, lengthOverride ?? cert.count,
privBase, lengthOverride ?? priv.count,
entsArray, entsArray.count,
{
(Unmanaged<AnyObject>
.fromOpaque($0)
.takeUnretainedValue()
// swiftlint:disable:next force_cast
as! (Double?) -> Void
)($1 == -1 ? nil : $1)
},
box.toOpaque(),
&exception
) == 0 else {
throw Error.signer(exception.map { String(cString: $0) })
}
}
}
}
public func sign(
app: URL,
identity: Identity,
entitlementMapping: [URL: Entitlements],
progress: @escaping (Double?) -> Void
) async throws {
// TODO: #131: update Zupersign to handle multiple entitlements files
// this is a temp hack to just pass along the root app entitlements
let entitlementMapping = entitlementMapping.filter { $0.key.path == app.path }
try self._sign(
app: app,
identity: identity,
entitlementMapping: entitlementMapping,
progress: progress
)
}
public func analyze(executable: URL) throws -> Data {
try executable.withUnsafeFileSystemRepresentation { (path: UnsafePointer<Int8>?) -> Data in
guard let path = path else { throw Error.badFilePath }
var exception: UnsafeMutablePointer<Int8>?
defer { exception.map { free($0) } }
var count = 0
guard let bytes = signer.pointee.analyze(path, &count, &exception)
else { throw Error.signer(exception.map { String(cString: $0) })}
return Data(bytesNoCopy: bytes, count: count, deallocator: .free)
}
}
}
+5 -2
View File
@@ -18,6 +18,7 @@ public struct SigningContext: Sendable {
public var auth: DeveloperAPIAuthData
public var targetDevice: TargetDevice?
public var signer: Signer
public var developerAPIClient: DeveloperAPIClient {
DeveloperAPIClient(auth: auth)
@@ -25,10 +26,12 @@ public struct SigningContext: Sendable {
public init(
auth: DeveloperAPIAuthData,
targetDevice: TargetDevice? = nil
) {
targetDevice: TargetDevice? = nil,
signer: Signer? = nil
) throws {
self.auth = auth
self.targetDevice = targetDevice
self.signer = try signer ?? .first()
}
}
@@ -9,7 +9,6 @@
import Foundation
import ConcurrencyExtras
import Dependencies
import XUtils
public enum KeyValueStorageError: Error {
case stringConversionFailure
+11 -15
View File
@@ -1,5 +1,3 @@
import XUtils
import XCLIUtils
import Foundation
import XKit
import ArgumentParser
@@ -29,7 +27,7 @@ struct AuthOperation {
func run() async throws {
if let token = try? AuthToken.saved(), !logoutFromExisting {
if !quiet {
d.out.print("Logged in.\n\(token)")
print("Logged in.\n\(token)")
}
return
}
@@ -54,7 +52,7 @@ struct AuthOperation {
}
try token.save()
d.out.print("Logged in.\n\(token)")
print("Logged in.\n\(token)")
}
private func logInWithKey() async throws -> AuthToken {
@@ -78,12 +76,10 @@ struct AuthOperation {
}
private func logInWithPassword() async throws -> AuthToken {
d.out.print("""
print("""
Heads up:
This works by emulating a virtual Mac to interact with Apple services.
We use a third-party service to create a randomized device ID token
(Anisette Data) but your credentials are only ever sent to Apple.
Still, consider using a secondary Apple ID since this is a private API.
This works by emulating a Pixel phone/Windows PC to interact with Apple services;
consider using a secondary Apple ID. Credentials are only ever sent to Apple.
""")
let username = try await Console.promptRequired("Apple ID: ", existing: username)
@@ -98,7 +94,7 @@ struct AuthOperation {
throw Console.Error("Password cannot be empty.")
}
d.out.print("Logging in...")
print("Logging in...")
let authDelegate = XToolAuthDelegate()
let manager = DeveloperServicesLoginManager()
@@ -177,15 +173,15 @@ struct AuthLogoutCommand: AsyncParsableCommand {
func run() async throws {
if (try? AuthToken.saved()) != nil {
try AuthToken.clear()
d.out.print("Logged out")
print("Logged out")
} else {
d.out.print("Already logged out")
print("Already logged out")
}
if reset2FA {
@Dependency(\.anisetteDataProvider) var anisetteProvider
await anisetteProvider.resetProvisioning()
d.out.print("Forgot device")
print("Forgot device")
}
}
}
@@ -198,9 +194,9 @@ struct AuthStatusCommand: AsyncParsableCommand {
func run() async throws {
if let token = try? AuthToken.saved() {
d.out.print("Logged in.\n\(token)")
print("Logged in.\n\(token)")
} else {
d.out.print("Logged out")
print("Logged out")
}
}
}
-2
View File
@@ -1,5 +1,3 @@
import XCLIUtils
import XUtils
import Foundation
import XKit
import Dependencies
+1 -3
View File
@@ -1,5 +1,3 @@
import XUtils
import XCLIUtils
import Foundation
import XKit
import ArgumentParser
@@ -19,7 +17,7 @@ struct ConnectionOptions: ParsableArguments {
extension ConnectionOptions.WithoutSearchMode {
func client(searchMode search: ClientDevice.SearchMode) async throws -> ClientDevice {
d.out.print("Waiting for device to be connected...")
print("Waiting for device to be connected...")
let stream = try await ClientDevice.search(mode: search)
for await devices in stream {
@@ -1,15 +1,47 @@
import Foundation
import XKit
import XUtils
import Dependencies
import NIOPosix
import NIOCore
package enum Console {
package static func prompt(_ message: String) async throws -> String {
d.out.print(message, terminator: "", flush: true)
guard let line = try await d.input.readLine() else { throw Console.Error("Input ended before a response was received.") }
return line
enum Console {
private static func withStdio<T>(
_ body: (
_ stdin: NIOAsyncChannelInboundStream<ByteBuffer>,
_ stdout: NIOAsyncChannelOutboundWriter<ByteBuffer>
) async throws -> T
) async throws -> T {
try await NIOPipeBootstrap(group: .singletonMultiThreadedEventLoopGroup)
.takingOwnershipOfDescriptors(
input: FileDescriptor.standardInput.duplicate().rawValue,
output: FileDescriptor.standardOutput.duplicate().rawValue
)
.flatMapThrowing { try NIOAsyncChannel(wrappingChannelSynchronously: $0) }
.get()
.executeThenClose { try await body($0, $1) }
}
package static func promptRequired(_ message: String, existing: String?) async throws -> String {
static func prompt(_ message: String) async throws -> String {
try await withStdio { stdin, stdout in
try await stdout.write(ByteBuffer(bytes: message.utf8))
fflush(stdoutSafe)
var data = Data()
for try await chunk in stdin {
let view = chunk.readableBytesView
if let endIndex = view.firstIndex(of: UInt8(ascii: "\n")) {
data += view[..<endIndex]
break
} else {
data += view
}
}
return String(decoding: data, as: UTF8.self)
}
}
static func promptRequired(_ message: String, existing: String?) async throws -> String {
let value: String
if let existing {
value = existing
@@ -22,12 +54,12 @@ package enum Console {
return value
}
package static func getPassword(_ message: String) async throws -> String {
static func getPassword(_ message: String) async throws -> String {
if !message.isEmpty {
d.out.print(message, terminator: "")
print(message, terminator: "")
}
let password = try await withoutEcho { try await prompt("") }
d.out.print()
print()
return password
}
@@ -58,7 +90,7 @@ package enum Console {
#endif
}
package static func chooseNumber(in range: Range<Int>) async throws -> Int {
static func chooseNumber(in range: Range<Int>) async throws -> Int {
let message = "Choice (\(range.lowerBound)-\(range.upperBound - 1)): "
while true {
if let choice = try await Int(prompt(message)), range.contains(choice) {
@@ -67,7 +99,7 @@ package enum Console {
}
}
package static func choose<T>(
static func choose<T>(
from elements: [T],
onNoElement: () throws -> T,
multiPrompt: @autoclosure () -> String,
@@ -79,9 +111,9 @@ package enum Console {
case 1:
return elements[0]
default:
d.out.print(multiPrompt())
print(multiPrompt())
try elements.enumerated().forEach { index, element in
try d.out.print("\(index): \(formatter(element))")
try print("\(index): \(formatter(element))")
}
let choice = try await chooseNumber(in: elements.indices)
return elements[choice]
@@ -91,7 +123,7 @@ package enum Console {
private static let yesSet: Set<String> = ["yes", "y"]
private static let noSet: Set<String> = ["no", "n"]
package static func confirm(_ message: String) async throws -> Bool {
static func confirm(_ message: String) async throws -> Bool {
while true {
let resp = try await prompt("\(message) (yes/no): ").lowercased()
if yesSet.contains(resp) {
@@ -102,9 +134,9 @@ package enum Console {
}
}
package struct Error: Swift.Error, CustomStringConvertible {
package let description: String
package init(_ description: String) {
struct Error: Swift.Error, CustomStringConvertible {
let description: String
init(_ description: String) {
self.description = description
}
}
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import ArgumentParser
import XKit
@@ -25,64 +24,66 @@ struct DSCertificatesListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let certificates = try await DeveloperAPIPages(\.links.next) {
let certificates = try await DeveloperAPIPages {
try await client.certificatesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for certificate in certificates {
d.out.print("- id: \(certificate.id)")
print("- id: \(certificate.id)")
guard let attributes = certificate.attributes else {
continue
}
if let name = attributes.name {
d.out.print(" name: \(name)")
print(" name: \(name)")
}
if let certificateType = attributes.certificateType {
d.out.print(" type: \(certificateType.rawValue)")
print(" type: \(certificateType.rawValue)")
}
if let displayName = attributes.displayName {
d.out.print(" display name: \(displayName)")
print(" display name: \(displayName)")
}
if let serialNumber = attributes.serialNumber {
d.out.print(" serial number: \(serialNumber)")
print(" serial number: \(serialNumber)")
}
if let platform = attributes.platform {
d.out.print(" platform: \(platform.rawValue)")
print(" platform: \(platform.rawValue)")
}
if let expirationDate = attributes.expirationDate {
d.out.print(" expiry: \(expirationDate.formatted(.dateTime))")
print(" expiry: \(expirationDate.formatted(.dateTime))")
}
if let contentString = attributes.certificateContent {
guard let content = Data(base64Encoded: contentString) else {
d.out.print(" content: error: bad base64")
print(" content: error: bad base64")
continue
}
do {
let certificate = try Certificate(data: content)
d.out.print(" content:")
print(" content:")
switch Result(catching: { try certificate.developerIdentity() }) {
case .success(let id):
d.out.print(" common name: \(id)")
print(" common name: \(id)")
case .failure(let error):
d.out.print(" common name: error: \(error)")
print(" common name: error: \(error)")
}
switch Result(catching: { try certificate.teamID() }) {
case .success(let teamID):
d.out.print(" team id: \(teamID)")
print(" team id: \(teamID)")
case .failure(let error):
d.out.print(" team id: error: \(error)")
print(" team id: error: \(error)")
}
} catch {
d.out.print(" content: error: \(error)")
print(" content: error: \(error)")
}
}
}
@@ -1,21 +1,51 @@
import XUtils
import Foundation
import XKit
import ArgumentParser
import Dependencies
struct DSAnisetteCommand: AsyncParsableCommand {
private final class Provider: RawADIProvider, RawADIProvisioningSession {
func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
print("spim: \(spim.base64EncodedString())")
return (self, Data(base64Encoded: try await Console.prompt("cpim: "))!)
}
func endProvisioning(
routingInfo: UInt64,
ptm: Data,
tk: Data
) async throws -> Data {
print("""
rinfo: \(routingInfo)
ptm: \(ptm.base64EncodedString())
tk: \(tk.base64EncodedString())
""")
return Data(base64Encoded: try await Console.prompt("pinfo: "))!
}
func requestOTP(
userID: UUID,
routingInfo: inout UInt64,
provisioningInfo: Data
) -> (machineID: Data, otp: Data) {
print("otp; pinfo: \(provisioningInfo)")
return (Data(), Data())
}
}
static let configuration = CommandConfiguration(
commandName: "anisette",
abstract: "Test out Anisette data"
)
func run() async throws {
@Dependency(\.anisetteDataProvider) var provider
let res = try await provider.fetchAnisetteData()
for (key, value) in res.dictionary.sorted(by: { $0.key < $1.key }) {
d.out.print("\(key): \(value)")
let provider = withDependencies {
$0.rawADIProvider = Provider()
} operation: {
ADIDataProvider()
}
let res = try await provider.fetchAnisetteData()
print(res)
}
}
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import ArgumentParser
import XKit
@@ -24,44 +23,46 @@ struct DSDevicesListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let devices = try await DeveloperAPIPages(\.links.next) {
let devices = try await DeveloperAPIPages {
try await client.devicesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for device in devices {
d.out.print("- id: \(device.id)")
print("- id: \(device.id)")
guard let attributes = device.attributes else {
continue
}
if let name = attributes.name {
d.out.print(" name: \(name)")
print(" name: \(name)")
}
if let platform = attributes.platform {
d.out.print(" platform: \(platform.rawValue)")
print(" platform: \(platform.rawValue)")
}
if let udid = attributes.udid {
d.out.print(" udid: \(udid)")
print(" udid: \(udid)")
}
if let deviceClass = attributes.deviceClass {
d.out.print(" device class: \(deviceClass.rawValue)")
print(" device class: \(deviceClass.rawValue)")
}
if let status = attributes.status {
d.out.print(" status: \(status.rawValue)")
print(" status: \(status.rawValue)")
}
if let model = attributes.model {
d.out.print(" model: \(model)")
print(" model: \(model)")
}
if let addedDate = attributes.addedDate {
d.out.print(" added date: \(addedDate.formatted(.dateTime))")
print(" added date: \(addedDate.formatted(.dateTime))")
}
}
}
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import ArgumentParser
import XKit
@@ -24,28 +23,30 @@ struct DSIdentifiersListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let bundleIDs = try await DeveloperAPIPages(\.links.next) {
let bundleIDs = try await DeveloperAPIPages {
try await client.bundleIdsGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for bundleID in bundleIDs {
d.out.print("- id: \(bundleID.id)")
print("- id: \(bundleID.id)")
guard let attributes = bundleID.attributes else {
continue
}
if let name = attributes.name {
d.out.print(" name: \(name)")
print(" name: \(name)")
}
if let identifier = attributes.identifier {
d.out.print(" identifier: \(identifier)")
print(" identifier: \(identifier)")
}
if let platform = attributes.platform {
d.out.print(" platform: \(platform.rawValue)")
print(" platform: \(platform.rawValue)")
}
if let seedId = attributes.seedId {
d.out.print(" seedId: \(seedId)")
print(" seedId: \(seedId)")
}
}
}
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import ArgumentParser
import XKit
@@ -27,71 +26,73 @@ struct DSProfilesListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let profiles = try await DeveloperAPIPages(\.links.next) {
let profiles = try await DeveloperAPIPages {
try await client.profilesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for profile in profiles {
d.out.print("- id: \(profile.id)")
print("- id: \(profile.id)")
guard let attributes = profile.attributes else {
continue
}
if let name = attributes.name {
d.out.print(" name: \(name)")
print(" name: \(name)")
}
if let platform = attributes.platform {
d.out.print(" platform: \(platform.rawValue)")
print(" platform: \(platform.rawValue)")
}
if let profileType = attributes.profileType {
d.out.print(" profile type: \(profileType.rawValue)")
print(" profile type: \(profileType.rawValue)")
}
if let profileState = attributes.profileState {
d.out.print(" profile state: \(profileState.rawValue)")
print(" profile state: \(profileState.rawValue)")
}
if let uuid = attributes.uuid {
d.out.print(" uuid: \(uuid)")
print(" uuid: \(uuid)")
}
if let createdDate = attributes.createdDate {
d.out.print(" created date: \(createdDate.formatted(.dateTime))")
print(" created date: \(createdDate.formatted(.dateTime))")
}
if let expirationDate = attributes.expirationDate {
d.out.print(" expiration date: \(expirationDate.formatted(.dateTime))")
print(" expiration date: \(expirationDate.formatted(.dateTime))")
}
if let contentString = attributes.profileContent {
guard let contentData = Data(base64Encoded: contentString) else {
d.out.print(" content: error: bad base64")
print(" content: error: bad base64")
continue
}
do {
let profile = try Mobileprovision(data: contentData)
let digest = try profile.digest()
d.out.print(" team identifiers:")
print(" team identifiers:")
for teamID in digest.teamIdentifiers {
d.out.print(" - \(teamID.rawValue)")
print(" - \(teamID.rawValue)")
}
d.out.print(" certificates:")
print(" certificates:")
for certificate in digest.certificates {
d.out.print(" - \(certificate.serialNumber())")
print(" - \(certificate.serialNumber())")
}
d.out.print(" devices:")
print(" devices:")
for device in digest.devices {
d.out.print(" - \(device)")
print(" - \(device)")
}
let entitlements = try? String(decoding: Self.encoder.encode(digest.entitlements), as: UTF8.self)
d.out.print(" entitlements: \(entitlements ?? "<error>")")
print(" entitlements: \(entitlements ?? "<error>")")
} catch {
d.out.print(" content: error: \(error)")
print(" content: error: \(error)")
}
}
}
@@ -1,5 +1,3 @@
import XCLIUtils
import XUtils
import Foundation
import ArgumentParser
import XKit
@@ -29,7 +27,7 @@ struct DSTeamsListCommand: AsyncParsableCommand {
}
let client = DeveloperServicesClient(authData: authData)
let teams: [DeveloperServicesTeam] = try await client.send(DeveloperServicesListTeamsRequest())
d.out.print(
print(
teams.map {
"\($0.name) [\($0.status)]: \($0.id.rawValue)" +
$0.memberships.map { "\n- \($0.name) (\($0.platform))" }.joined()
-2
View File
@@ -1,5 +1,3 @@
import XCLIUtils
import XUtils
import ArgumentParser
import Foundation
import XKit
+19 -19
View File
@@ -1,4 +1,3 @@
import XCLIUtils
import Foundation
import ArgumentParser
import PackLib
@@ -39,7 +38,7 @@ struct PackOperation {
try await EnsureSDKOperation(quiet: true).run()
d.out.print("Planning...")
print("Planning...")
let schema: PackSchema
let configPath = URL(fileURLWithPath: "xtool.yml")
@@ -47,7 +46,7 @@ struct PackOperation {
schema = try await PackSchema(url: configPath)
} else {
schema = .default
d.out.print("""
print("""
warning: Could not locate configuration file '\(configPath.path)'. Using default \
configuration with 'com.example' organization ID.
""")
@@ -81,21 +80,22 @@ struct PackOperation {
.allProducts
.compactMap { p in p.entitlementsPath.map { (p, $0) } }
if !productsWithEntitlements.isEmpty {
let mapping = try await withThrowingTaskGroup(of: (URL, Data).self) { group in
let mapping = try await withThrowingTaskGroup(of: (URL, Entitlements).self) { group in
for (product, path) in productsWithEntitlements {
group.addTask {
let entitlements = try await Data(reading: URL(fileURLWithPath: path))
let data = try await Data(reading: URL(fileURLWithPath: path))
let decoder = PropertyListDecoder()
let entitlements = try decoder.decode(Entitlements.self, from: data)
return (product.directory(inApp: bundle), entitlements)
}
}
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
}
d.out.print("Applying entitlements...")
try await d.signer.sign(
print("Applying entitlements...")
try await Signer.first().sign(
app: bundle,
identity: .adhoc,
entitlementMapping: mapping,
deep: true,
progress: { _ in }
)
}
@@ -112,7 +112,7 @@ struct DevXcodeCommand: AsyncParsableCommand {
func run() async throws {
let result = try await PackOperation(xcode: true).run()
d.out.print("Wrote to \(result.path)")
print("Wrote to \(result.path)")
}
}
@@ -167,12 +167,12 @@ struct DevBuildCommand: AsyncParsableCommand {
delegate: installDelegate
)
do {
defer { d.out.print() }
defer { print() }
try await installer.signInPlace(app: url)
} catch let error as CancellationError {
throw error
} catch {
d.out.print("Error: \(error)")
print("Error: \(error)")
throw ExitCode.failure
}
}
@@ -187,19 +187,19 @@ struct DevBuildCommand: AsyncParsableCommand {
let ipaURL = try await compressor.compress(directory: payloadDir) { progress in
if let progress {
let percent = Int(progress * 100)
d.out.print("\rPackaging... \(percent)%", terminator: "")
print("\rPackaging... \(percent)%", terminator: "")
} else {
d.out.print("\rPackaging...", terminator: "")
print("\rPackaging...", terminator: "")
}
}
d.out.print()
print()
try? FileManager.default.removeItem(at: finalURL)
try FileManager.default.moveItem(at: ipaURL, to: finalURL)
} else {
finalURL = url
}
d.out.print("Wrote to \(finalURL.path)")
print("Wrote to \(finalURL.path)")
}
}
@@ -251,7 +251,7 @@ struct DevRunCommand: AsyncParsableCommand {
let token = try AuthToken.saved()
let client = try await connectionOptions.client()
d.out.print("Installing to device: \(client.deviceName) (udid: \(client.udid))")
print("Installing to device: \(client.deviceName) (udid: \(client.udid))")
let installDelegate = XToolInstallerDelegate()
let installer = IntegratedInstaller(
@@ -259,7 +259,7 @@ struct DevRunCommand: AsyncParsableCommand {
delegate: installDelegate
)
defer { d.out.print() }
defer { print() }
do {
try await installer.install(
@@ -271,7 +271,7 @@ struct DevRunCommand: AsyncParsableCommand {
} catch let error as CancellationError {
throw error
} catch {
d.out.print("\nError: \(error)")
print("\nError: \(error)")
throw ExitCode.failure
}
}
@@ -309,7 +309,7 @@ struct SimInstallOperation {
output: .discarded
)
.checkSuccess()
d.out.print("Installed to simulator")
print("Installed to simulator")
}
}
#endif
+2 -3
View File
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import XKit
import ArgumentParser
@@ -32,10 +31,10 @@ struct DevicesCommand: AsyncParsableCommand {
guard wait else { break }
if shouldPrint {
shouldPrint = false
d.out.print("Waiting for devices to be connected...")
print("Waiting for devices to be connected...")
}
}
d.out.print(foundDevices.map { "\($0.deviceName) [\($0.connectionType)]: \($0.udid)" }.joined(separator: "\n"))
print(foundDevices.map { "\($0.deviceName) [\($0.connectionType)]: \($0.udid)" }.joined(separator: "\n"))
}
}
+3 -4
View File
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import XKit
import SwiftyMobileDevice
@@ -21,7 +20,7 @@ struct InstallCommand: AsyncParsableCommand {
let client = try await connectionOptions.client()
d.out.print("Installing to device: \(client.deviceName) (udid: \(client.udid))")
print("Installing to device: \(client.deviceName) (udid: \(client.udid))")
let installDelegate = XToolInstallerDelegate()
let installer = IntegratedInstaller(
@@ -36,11 +35,11 @@ struct InstallCommand: AsyncParsableCommand {
lookupMode: .only(client.connectionType),
configureDevice: false,
)
d.out.print("\nSuccessfully installed!")
print("\nSuccessfully installed!")
} catch let error as CancellationError {
throw error
} catch {
d.out.print("\nError: \(error)")
print("\nError: \(error)")
throw ExitCode.failure
}
}
+2 -3
View File
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import PackLib
@@ -35,7 +34,7 @@ enum LSPConfig {
do {
try await ensure(using: schema, quiet: quiet, currentDirectory: directory)
} catch {
d.out.print("warning: failed to validate LSP configuration: \(error)")
print("warning: failed to validate LSP configuration: \(error)")
}
}
@@ -81,7 +80,7 @@ enum LSPConfig {
}
if !quiet {
d.out.print("""
print("""
[LSP] Created \(primary.0) for enhanced IDE support. You may
need to restart your editor for the change to take effect.
You can disable this with `skipLSP: true` in xtool.yml.
+1 -3
View File
@@ -1,5 +1,3 @@
import XCLIUtils
import XUtils
import Foundation
import XKit
import SwiftyMobileDevice
@@ -35,7 +33,7 @@ struct LaunchCommand: AsyncParsableCommand {
throw Console.Error("Could not find an installed app with bundle ID '\(bundleID)'")
}
d.out.print("Launching \(executable.lastPathComponent)...")
print("Launching \(executable.lastPathComponent)...")
let debugserver = try DebugserverClient(device: client.device, label: "xtool")
guard try debugserver.launch(executable: executable, arguments: args) == "OK" else {
+5 -7
View File
@@ -1,5 +1,3 @@
import XUtils
import XCLIUtils
import ArgumentParser
import Foundation
import PackLib
@@ -63,7 +61,7 @@ struct NewCommand: AsyncParsableCommand {
throw Console.Error("Cannot create \(name): a file already exists at that path.")
}
d.out.print("Creating package: \(name)")
print("Creating package: \(name)")
let moduleName = name.replacingOccurrences(of: "-", with: "_")
@@ -164,7 +162,7 @@ struct NewCommand: AsyncParsableCommand {
at: url.deletingLastPathComponent(),
withIntermediateDirectories: true
)
d.out.print("Creating \(path)")
print("Creating \(path)")
try "\(contents)\n".write(to: url, atomically: true, encoding: .utf8)
}
@@ -174,8 +172,8 @@ struct NewCommand: AsyncParsableCommand {
currentDirectory: baseURL,
)
d.out.print("\nFinished generating project \(name). Next steps:")
d.out.print("- Enter the directory with `cd \(name)`")
d.out.print("- Build and run with `xtool dev`")
print("\nFinished generating project \(name). Next steps:")
print("- Enter the directory with `cd \(name)`")
print("- Build and run with `xtool dev`")
}
}
+88 -118
View File
@@ -1,4 +1,3 @@
import XCLIUtils
import Foundation
import Dependencies
import libunxip
@@ -77,12 +76,18 @@ struct SDKBuilder {
let mode: Mode
// bump this when the sdk builder logic changes
static let sdkEpoch = 4
static let sdkEpoch = 3
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
static let darwinToolsVersion = "1.1.0"
// tag from https://github.com/xtool-org/OpenAppleMacros
static let oamVersion = "1.4.1"
static let oamVersion = "1.3.0"
static let oamLibraries: [String] = [
"FoundationModelsMacros",
"PreviewsMacros",
"SwiftUIMacros",
]
static var currentSDKVersion: String {
"""
@@ -136,13 +141,13 @@ struct SDKBuilder {
let iPhoneSimSDK = try sdk(platform: "iPhoneSimulator", prefix: "iPhoneSimulator")
let macOSSDK = try sdk(platform: "MacOSX", prefix: "MacOSX")
d.out.print("""
print("""
- \(iPhoneOSSDK)
- \(iPhoneSimSDK)
- \(macOSSDK)
""")
d.out.print("[Writing metadata]")
print("[Writing metadata]")
try """
{
"schemaVersion": "1.0",
@@ -200,11 +205,6 @@ struct SDKBuilder {
},
"librarian": {
"path": "llvm-lib"
},
"swiftCompiler": {
"extraCLIOptions": [
"-Xfrontend", "-enable-cross-import-overlays"
]
}
}
""".write(
@@ -233,68 +233,32 @@ struct SDKBuilder {
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
}
private func fetchTarball(
url: URL,
destination directory: URL,
displayName: String,
envOverride: String? = nil,
) async throws {
// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")
try FileManager.default.createDirectory(
at: directory,
at: toolsetDir,
withIntermediateDirectories: false
)
if let envOverride, let path = ProcessInfo.processInfo.environment[envOverride] {
let source = URL(fileURLWithPath: path)
if source.dirExists {
d.out.print("[Copying \(displayName)] \(source.path)")
try await Subprocess.run(
.name("cp"),
arguments: ["-RL", "\(source.path)/.", "."],
workingDirectory: FilePath(directory),
output: .discarded,
error: .discarded,
)
.checkSuccess()
// later steps write into the copy
try await Subprocess.run(
.name("chmod"),
arguments: ["-R", "u+w", "."],
workingDirectory: FilePath(directory),
output: .discarded,
error: .discarded,
)
.checkSuccess()
return
}
d.out.print("[Extracting \(displayName)] \(source.path)")
try await Subprocess.run(
.name("tar"),
arguments: ["xzf", source.path],
workingDirectory: FilePath(directory),
output: .discarded,
error: .discarded,
)
.checkSuccess()
return
}
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
""")!
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else {
throw Console.Error("Could not fetch tarball at \(url)")
}
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
let length: Int64? = switch body.length {
case .known(let known): known
case .unknown: nil
}
defer { d.out.print() }
defer { print() }
try await Subprocess.run(
.name("tar"),
arguments: ["xzf", "-"],
workingDirectory: FilePath(directory),
workingDirectory: FilePath(toolsetDir),
input: .inputWriter,
output: .discarded,
error: .discarded,
@@ -309,27 +273,13 @@ struct SDKBuilder {
guard let length else { continue }
let progress = Int(Double(totalWritten) / Double(length) * 100)
d.out.print("\r[Downloading \(displayName)] \(progress)%", terminator: "", flush: true)
print("\r[Downloading toolset] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
}
try await execution.standardInputWriter.finish()
}
.checkSuccess()
}
// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
""")!
try await fetchTarball(
url: url,
destination: toolsetDir,
displayName: "toolset",
envOverride: "XTL_TOOLSET_TARBALL",
)
// swift-build assumes we have an Apple-flavored librarian for Apple platforms
// (https://github.com/swiftlang/swift-build/blob/b2433e74e/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift#L1735)
@@ -436,41 +386,43 @@ struct SDKBuilder {
}
private func installMacros(in output: URL) async throws {
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue).tar.gz
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue)
""")!
let macrosDir = output.appendingPathComponent("OpenAppleMacros")
try await fetchTarball(
url: url,
destination: macrosDir,
displayName: "OpenAppleMacros",
envOverride: "XTL_OAM_TARBALL",
)
struct MacrosInfo: Decodable {
var plugins: [String]
}
let macrosInfo = try JSONDecoder().decode(
MacrosInfo.self,
from: Data(contentsOf: macrosDir.appendingPathComponent("info.json"))
)
try FileManager.default.moveItem(
at: macrosDir.appendingPathComponent("OpenAppleMacrosServer"),
to: output.appendingPathComponent("OpenAppleMacrosServer")
)
try FileManager.default.removeItem(at: macrosDir)
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
let pluginsDir = output.appendingPathComponent("OpenAppleMacrosPlugins")
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: false)
// create a lib*.so file for each macro 'library' that we support.
// the files are stubs (empty) because we just need them to convince swiftc that
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
// server.
for library in macrosInfo.plugins {
let target = pluginsDir.appendingPathComponent("lib\(library).so")
try Data().write(to: target)
let length: Int64? = switch body.length {
case .known(let known): known
case .unknown: nil
}
let outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
do {
let handle = try FileDescriptor.open(
FilePath(outputPath),
.writeOnly,
options: .create,
permissions: [.ownerReadWriteExecute, .groupReadExecute, .otherReadExecute]
)
defer { try? handle.close() }
var written: Int64 = 0
for try await chunk in body {
try handle.writeAll(chunk)
written += Int64(chunk.count)
if let length {
let progress = Int(Double(written) / Double(length) * 100)
print("\r[Downloading OpenAppleMacros] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
}
}
print()
}
private static let expectedXcodeChildren = ["Info.plist", "version.plist", "Developer"]
@@ -525,7 +477,7 @@ struct SDKBuilder {
let sourceContentsDir = source.appendingPathComponent("Contents")
let expectedContentsDir = expectedAppDir.appendingPathComponent("Contents")
try FileManager.default.createDirectory(at: expectedContentsDir, withIntermediateDirectories: true)
d.out.print("[Copying Xcode.app] This might take a minute...")
print("[Copying Xcode.app] This might take a minute...")
for child in Self.expectedXcodeChildren {
let expectedFile = expectedContentsDir.appendingPathComponent(child)
let sourceFile = sourceContentsDir.appendingPathComponent(child)
@@ -559,11 +511,13 @@ struct SDKBuilder {
count += 1
if let wanted {
let progress = Int(Double(count) / Double(wanted) * 100)
d.out.print("\r[Installing SDKs] \(progress)%", terminator: "", flush: true)
print("\r[Installing SDKs] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
if count % 100 == 0 {
if wanted == nil {
d.out.print("\r[Installing SDKs] Installed \(count) files", terminator: "", flush: true)
print("\r[Installing SDKs] Installed \(count) files", terminator: "")
fflush(stdoutSafe)
}
await Task.yield()
}
@@ -587,16 +541,16 @@ struct SDKBuilder {
if wanted != nil {
// otherwise the last log might say 99%
d.out.print("\r[Installing SDKs] 100%", terminator: "")
print("\r[Installing SDKs] 100%", terminator: "")
}
d.out.print()
print()
if let cleanupStageDir {
d.out.print("[Cleaning up]")
print("[Cleaning up]")
try FileManager.default.removeItem(at: cleanupStageDir)
}
d.out.print("[Finalizing SDKs]")
print("[Finalizing SDKs]")
for platform in ["iPhoneOS", "MacOSX", "iPhoneSimulator"] {
let lib = "../../../../../Library"
@@ -652,12 +606,27 @@ struct SDKBuilder {
let hostDir = platformDir.appendingPathComponent("Developer/usr/lib/swift/host")
let pluginsDir = hostDir.appendingPathComponent("plugins")
try FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createSymbolicLink(
atPath: pluginsDir.path,
withDestinationPath: "../../../../../../../../OpenAppleMacrosPlugins"
)
if platform == "iPhoneSimulator" {
// The iPhoneSimulator platform doesn't contain plugins; Xcode seems to be hardcoded
// to look at the ones from iPhoneOS.platform. We can symlink the iPhoneOS ones too.
try? FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createSymbolicLink(
atPath: pluginsDir.path,
withDestinationPath: "../../../../../../iPhoneOS.platform/Developer/usr/lib/swift/host/plugins"
)
} else {
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: true)
// create a lib*.so file for each macro 'library' that we support.
// the files are stubs (empty) because we just need them to convince swiftc that
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
// server.
for library in Self.oamLibraries {
let target = pluginsDir.appendingPathComponent("lib\(library).so")
try Data().write(to: target)
}
}
}
// we copy over the host's clang resorurce dir during install, because intrinsics can differ
@@ -747,7 +716,8 @@ struct SDKBuilder {
for try await chunk in observer {
read += chunk.count
let progress = Int(Double(read) / Double(length) * 100)
d.out.print("\r[Extracting XIP] \(progress)%", terminator: "", flush: true)
print("\r[Extracting XIP] \(progress)%", terminator: "")
fflush(stdoutSafe)
if read == length { break }
}
}()
@@ -783,7 +753,7 @@ struct SDKBuilder {
}
_ = try await readTask
d.out.print()
print()
return wanted
}
+17 -18
View File
@@ -1,4 +1,3 @@
import XCLIUtils
import Foundation
import XKit
import ArgumentParser
@@ -52,7 +51,7 @@ struct DevSDKBuildCommand: AsyncParsableCommand {
let output = URL(fileURLWithPath: outputDir, isDirectory: true).appending(path: "darwin.xtoolsdk")
let builder = SDKBuilder(input: input, output: output, arch: builderArch, mode: .buildSlim)
try await builder.buildSDK()
d.out.print("Built SDK at \(output.path). You can install it with `xtool sdk install`.")
print("Built SDK at \(output.path). You can install it with `xtool sdk install`.")
}
}
@@ -123,7 +122,7 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
throw Console.Error("Cannot remove SDK: no Darwin SDK installed")
}
try sdk.remove()
d.out.print("Uninstalled SDK")
print("Uninstalled SDK")
}
}
@@ -135,12 +134,12 @@ struct DevSDKStatusCommand: AsyncParsableCommand {
func run() async throws {
if let sdk = try DarwinSDK.current() {
d.out.print("Darwin SDK is installed")
d.out.print(" Path: \(sdk.bundle.path)")
d.out.print(" Flavor: \(sdk.flavor)")
d.out.print(" Version: \(sdk.version)")
print("Darwin SDK is installed")
print(" Path: \(sdk.bundle.path)")
print(" Flavor: \(sdk.flavor)")
print(" Version: \(sdk.version)")
} else {
d.out.print("Not installed")
print("Not installed")
}
}
}
@@ -157,14 +156,14 @@ struct EnsureSDKOperation {
func run() async throws {
#if os(macOS)
if !quiet {
d.out.print("Skipping Darwin SDK setup since we're on macOS.")
print("Skipping Darwin SDK setup since we're on macOS.")
}
#else
let sdk = try DarwinSDK.current()
switch sdk.map({ ($0.isUpToDate(), $0.flavor) }) {
case (true, _)?: // swiftlint:disable:this optional_enum_case_matching
if !quiet {
d.out.print("Darwin SDK is up to date.")
print("Darwin SDK is up to date.")
}
case (false, .slim)?: // swiftlint:disable:this optional_enum_case_matching
throw Console.Error("""
@@ -175,10 +174,10 @@ struct EnsureSDKOperation {
xtool sdk install [--slim]
""")
case (false, .normal)?: // swiftlint:disable:this optional_enum_case_matching
d.out.print("Darwin SDK is out of date. Rebuilding...")
print("Darwin SDK is out of date. Rebuilding...")
try await UpdateSDKOperation().run()
case (false, .legacy)?: // swiftlint:disable:this optional_enum_case_matching
d.out.print("""
print("""
Darwin SDK is incompatible: built with an older version of xtool.
Requesting re-install. This is a one-time rebuild; after this,
@@ -187,7 +186,7 @@ struct EnsureSDKOperation {
""")
try await generateSDK()
case nil:
d.out.print("Now generating the Darwin SDK.\n")
print("Now generating the Darwin SDK.\n")
try await generateSDK()
}
@@ -218,13 +217,13 @@ struct InstallSDKOperation {
func run() async throws {
#if os(macOS)
d.out.print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
#else
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle()
if path.hasSuffix(".xtoolsdk") {
d.out.print("Installing prebuilt SDK...")
print("Installing prebuilt SDK...")
try await FileManager.default.copyItem(at: URL(filePath: path), to: temporaryBundle.url, preserveOwner: false)
} else {
// validate input before removing existing SDK
@@ -237,7 +236,7 @@ struct InstallSDKOperation {
}
if let sdk = try DarwinSDK.current() {
d.out.print("Removing existing SDK...")
print("Removing existing SDK...")
try sdk.remove()
}
@@ -249,7 +248,7 @@ struct InstallSDKOperation {
struct UpdateSDKOperation {
func run() async throws {
#if os(macOS)
d.out.print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
#else
guard let existing = try DarwinSDK.current() else {
throw Console.Error("Could not locate existing SDK; cannot perform update.")
@@ -281,7 +280,7 @@ struct UpdateSDKOperation {
try existing.remove()
try await temporaryBundle.install()
d.out.print("Updated SDK")
print("Updated SDK")
#endif
}
}
+2 -3
View File
@@ -1,4 +1,3 @@
import XUtils
import Foundation
import XKit
import SwiftyMobileDevice
@@ -25,9 +24,9 @@ struct UninstallCommand: AsyncParsableCommand {
progress: { _ in }
)
} catch {
d.out.print("Failed: \(error)")
print("Failed: \(error)")
return
}
d.out.print("Success!")
print("Success!")
}
}
+1 -5
View File
@@ -1,9 +1,5 @@
import CXKit
import XCLIUtils
extension XTool {
public static let version = CommandVersion(
version: String(cString: xtl_version()),
hasUncommittedChanges: xtl_has_uncommitted_changes(),
)
public static let version = String(cString: xtl_version())
}
+3 -7
View File
@@ -1,9 +1,7 @@
import XCLIUtils
import Foundation
import XKit
import ArgumentParser
import XUtils
import Dependencies
public enum XTool {
public static func run(arguments: [String]? = nil) async throws {
@@ -58,8 +56,6 @@ extension ParsableCommand where Self: SendableMetatype {
for await _ in canStart {}
guard !Task.isCancelled else { return }
do {
@Dependency(\.shutdownRegistry) var shutdownRegistry
defer { await shutdownRegistry.shutdown() }
var command = try self.parseAsRoot(arguments)
if var asyncCommand = command as? AsyncParsableCommand {
try await asyncCommand.run()
@@ -67,12 +63,12 @@ extension ParsableCommand where Self: SendableMetatype {
try command.run()
}
} catch where error is CancellationError || Task.isCancelled {
d.out.print("Cancelled.", stream: .stderr)
print("Cancelled.")
self.exit()
} catch {
if ProcessInfo.processInfo.environment["XTL_DEBUG_ERRORS"] != nil {
d.out.print("ERROR DETAILS:")
d.out.print(String(reflecting: error))
print("ERROR DETAILS:")
print(String(reflecting: error))
}
self.exit(withError: error)
}
@@ -1,9 +1,6 @@
import XCLIUtils
import Foundation
import XKit
import ConcurrencyExtras
import Dependencies
import XUtils
final class XToolAuthDelegate: TwoFactorAuthDelegate {
func fetchCode() async -> String? {
@@ -12,8 +9,7 @@ final class XToolAuthDelegate: TwoFactorAuthDelegate {
}
actor XToolInstallerDelegate: IntegratedInstallerDelegate {
private nonisolated let _output = Dependency(\.out)
private nonisolated var output: CommandOutput { _output.wrappedValue }
init() {}
private let updateTask = LockIsolated<Task<Void, Never>?>(nil)
@@ -27,7 +23,8 @@ actor XToolInstallerDelegate: IntegratedInstallerDelegate {
case nil:
text = "Continuing..."
}
output.print("\n\(text)", terminator: "", flush: true)
print("\n\(text)", terminator: "")
fflush(stdoutSafe)
}
var prevStage: String?
@@ -55,15 +52,19 @@ actor XToolInstallerDelegate: IntegratedInstallerDelegate {
if stage != prevStage {
if let progString = progString {
output.print("\n[\(stage)] \(progString)", terminator: "", flush: true)
print("\n[\(stage)] \(progString)", terminator: "")
fflush(stdoutSafe)
} else {
output.print("\n[\(stage)] ...", terminator: "", flush: true)
print("\n[\(stage)] ...", terminator: "")
fflush(stdoutSafe)
}
} else if progString != prevProgress {
if let progString = progString {
output.print("\r[\(stage)] \(progString)", terminator: "", flush: true)
print("\r[\(stage)] \(progString)", terminator: "")
fflush(stdoutSafe)
} else {
output.print("\r[\(stage)]", terminator: "", flush: true)
print("\r[\(stage)]", terminator: "")
fflush(stdoutSafe)
}
}
}
@@ -78,8 +79,8 @@ actor XToolInstallerDelegate: IntegratedInstallerDelegate {
}
func confirmRevocation(of certificates: [DeveloperServicesCertificate]) async -> Bool {
output.print("\nThe following certificates must be revoked:")
output.print(
print("\nThe following certificates must be revoked:")
print(
certificates.map {
"- \($0.attributes!.name!) (expires \($0.attributes!.expirationDate!.formatted(date: .abbreviated, time: .shortened)))"
}.joined(separator: "\n")
-79
View File
@@ -1,79 +0,0 @@
// swiftlint:disable prefer_dependency_print
import Dependencies
import Foundation
import CXKit
public struct CommandOutput: DependencyKey, Sendable {
public enum Stream: String, Codable, Sendable {
case stdout
case stderr
}
public var write: @Sendable (_ data: Data, _ stream: Stream, _ flush: Bool) -> Void
public init(write: @escaping @Sendable (Data, Stream, Bool) -> Void) {
self.write = write
}
public func print(
_ message: String = "",
terminator: String = "\n",
stream: Stream = .stdout,
flush: Bool = false
) {
write(Data((message + terminator).utf8), stream, flush)
}
@_disfavoredOverload
public func print(
_ items: Any...,
separator: String = " ",
terminator: String = "\n",
stream: Stream = .stdout,
flush: Bool = false
) {
print(
items.map { String(describing: $0) }.joined(separator: separator),
terminator: terminator,
stream: stream,
flush: flush
)
}
public static var liveValue: Self {
let outputLock = NSLock()
return Self { data, stream, flush in
let descriptor: FileDescriptor = stream == .stdout ? .standardOutput : .standardError
// Keep concurrent messages together, including across partial writes.
outputLock.withLock {
try? data.withUnsafeBytes { try descriptor.writeAllWaiting($0) }
if flush { fflush(get_stdout()) }
}
}
}
public static var testValue: Self { Self(write: unimplemented("CommandOutput.write")) }
}
extension CommandOutput {
/// Create a `FileDescriptor` for writing to the given `CommandOutput` stream.
public func makeDescriptor(for stream: Stream) throws -> FileDescriptor {
let (readFD, writeFD) = try FileDescriptor.pipe()
let input = try DispatchInput(fileDesciptor: readFD)
// no need to keep a handle to the task, it'll terminate when writeFD is closed
Task {
while let next = try? await input.read() {
self.write(next, stream, false)
}
}
return writeFD
}
}
extension DependencyValues {
public var out: CommandOutput {
get { self[CommandOutput.self] }
set { self[CommandOutput.self] = newValue }
}
}
-132
View File
@@ -1,132 +0,0 @@
import Foundation
import ConcurrencyExtras
/// A bi-directional channel for streaming data from producer -> consumer.
///
/// Supports backpressure via `onRequest`.
public struct DataChannel: Sendable {
enum Phase {
case active
case closed(Error?)
}
public enum Errors: Error {
case concurrentRead
}
public struct Limit: Sendable {
public var limit: @Sendable (Data) throws -> Int
public init(limit: @escaping @Sendable (Data) throws -> Int) {
self.limit = limit
}
public static var unlimited: Limit {
Limit { _ in .max }
}
public static func bytes(_ count: Int) -> Limit {
Limit { _ in count }
}
public static var newline: Limit {
Limit { buffer in
if let newlineIndex = buffer.firstIndex(of: UInt8(ascii: "\n")) {
return buffer.distance(from: buffer.startIndex, to: newlineIndex) + 1
} else {
return .max
}
}
}
}
private struct State {
var waiter: (@Sendable () -> Void)?
var phase: Phase = .active
var buffer = Data()
var request: (@Sendable () -> Void)?
}
private let state = LockIsolated(State())
public init() {}
public func onRequest(_ request: @escaping @Sendable () -> Void) {
self.state.withValue { $0.request = request }
}
public func write(_ data: Data) {
let waiter: (@Sendable () -> Void)? = self.state.withValue { state in
guard case .active = state.phase else { return nil }
state.buffer.append(contentsOf: data)
return state.waiter.take()
}
waiter?()
}
public func finish(error: Error?) {
let waiter: (@Sendable () -> Void)? = self.state.withValue { state in
guard case .active = state.phase else { return nil }
state.phase = .closed(error)
return state.waiter.take()
}
waiter?()
}
private enum Outcome<T: Sendable>: Sendable {
case result(Result<T?, Error>)
case callRequest((@Sendable () -> Void)?)
}
nonisolated(nonsending) public func read<T: Sendable>(drain: @Sendable (inout Data) throws -> T) async throws -> T? {
while true {
try Task.checkCancellation()
let result: Result<T?, Error>? = await withTaskCancellationHandler {
await withCheckedContinuation { continuation in
let outcome: Outcome<T> = state.withValue { state in
guard !Task.isCancelled else {
return .result(.failure(CancellationError()))
}
if !state.buffer.isEmpty {
return .result(Result { try drain(&state.buffer) })
}
switch state.phase {
case .active:
guard state.waiter == nil else {
return .result(.failure(Errors.concurrentRead))
}
state.waiter = { continuation.resume(returning: nil) }
return .callRequest(state.request)
case .closed(nil):
return .result(.success(nil))
case .closed(let error?):
return .result(.failure(error))
}
}
switch outcome {
case .result(let result):
continuation.resume(returning: result)
case .callRequest(let request):
request?()
}
}
} onCancel: {
self.state.withValue { $0.waiter.take()?() }
}
if let result {
return try result.get()
}
}
}
nonisolated(nonsending) public func read(upTo limit: Limit = .unlimited) async throws -> Data? {
try await self.read { buffer in
let count = min(try limit.limit(buffer), buffer.count)
guard count > 0 else { return Data() }
let result = buffer.prefix(count)
buffer.removeFirst(count)
return result
}
}
}
-10
View File
@@ -1,10 +0,0 @@
import Dependencies
/// The current `DependencyValues`.
///
/// Prefer adding `@Dependency` fields to your type when possible, as
/// they remember the value assigned during initialization.
public var d: DependencyValues {
@Dependency(\.self) var values
return values
}
-141
View File
@@ -1,141 +0,0 @@
import Foundation
import ConcurrencyExtras
public final class DispatchInput: Sendable {
private struct State {
var hasClosed = false
var isReading = false
}
public static let defaultChunkSize: Int = 64 * 1024
let queue = DispatchQueue(label: "xtool.dispatch-reader")
let channel: DispatchIO
let chunkSize: Int
private let closeSignal: Task<Void, Never>
private let dataChannel = DataChannel()
private let state = LockIsolated(State())
public init(fileDesciptor: FileDescriptor, chunkSize: Int = DispatchInput.defaultChunkSize) throws {
let closeSignal = Task { _ = try? await Task.never() }
self.closeSignal = closeSignal
self.chunkSize = chunkSize
enum InitState {
case pending
case done(onClose: @Sendable (Int32) -> Void)
case failed(Int32)
}
let initState = LockIsolated<InitState>(.pending)
self.channel = DispatchIO(
type: .stream,
fileDescriptor: fileDesciptor.rawValue,
queue: queue,
) { err in
initState.withValue { state in
switch state {
case .pending:
state = .failed(err)
case .done(let onClose):
onClose(err)
case .failed: // wat
break
}
}
}
channel.setLimit(lowWater: 1)
try initState.withValue { state in
switch state {
case .pending:
state = .done { [weak self] err in
self?.didClose(code: err)
closeSignal.cancel()
}
case .done: // wat
break
case .failed(let err):
throw Errno(rawValue: err)
}
}
dataChannel.onRequest { [weak self] in
self?.onRequest()
}
}
nonisolated(nonsending) public func read(upTo limit: DataChannel.Limit = .unlimited) async throws -> Data? {
try await dataChannel.read(upTo: limit)
}
private func onRequest() {
let didMarkStarted = state.withValue { state in
guard !state.isReading else { return false }
state.isReading = true
return true
}
guard didMarkStarted else { return }
channel.read(
offset: 0,
length: chunkSize,
queue: queue,
) { [weak self] done, data, error in
guard let self else { return }
let data = data.map { Data($0) }
self.onRead(
done: done,
data: data,
error: error,
)
}
}
private func onRead(
done: Bool,
data: Data?,
error: Int32,
) {
if done {
state.withValue { $0.isReading = false }
}
let data = data.map { Data($0) }
if let data, !data.isEmpty {
dataChannel.write(data)
}
if error != 0 {
requestClose(error: Errno(rawValue: error))
} else if done, data?.isEmpty == true {
requestClose(error: nil)
}
}
nonisolated(nonsending) public func close() async {
requestClose(error: nil)
await closeSignal.value
}
private func requestClose(error: Error?) {
guard markClosedIfNeeded() else { return }
channel.close(flags: .stop)
dataChannel.finish(error: error)
}
private func didClose(code: Int32) {
guard markClosedIfNeeded() else { return }
dataChannel.finish(error: code == 0 ? nil : Errno(rawValue: code))
}
private func markClosedIfNeeded() -> Bool {
state.withValue { state in
let hadClosed = state.hasClosed
state.hasClosed = true
return !hadClosed
}
}
deinit {
guard !state.withValue(\.hasClosed) else { return }
channel.close(flags: .stop)
dataChannel.finish(error: nil)
}
}
+1 -1
View File
@@ -43,7 +43,7 @@ extension FileManager {
do {
try result.checkSuccess()
} catch {
d.out.print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError)")
print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError)")
throw error
}
return
-66
View File
@@ -1,66 +0,0 @@
extension Sequence where Element: Sendable {
/// Like `map`, but runs transformations concurrently.
///
/// - Parameter maxConcurrency: The maximum number of transforms to run concurrently.
/// If `nil`, we choose a reasonable default value. Use `.max` to run all at once.
///
/// - Parameter transform: The transformation to apply to each element.
///
/// - Returns: Transformed elements in the same order as the original sequence.
public nonisolated(nonsending) func concurrentMap<T: Sendable, E: Error>(
maxConcurrency: Int? = nil,
_ transform: @escaping @Sendable @isolated(any) (Element) async throws(E) -> T,
) async throws(E) -> [T] {
try await _concurrentMap(
maxConcurrency: maxConcurrency ?? 10,
transform,
willWaitForNext: nil,
)
}
nonisolated(nonsending) func _concurrentMap<T: Sendable, E: Error>(
maxConcurrency: Int,
_ transform: @escaping @Sendable @isolated(any) (Element) async throws(E) -> T,
willWaitForNext: (() -> Void)?, // hook for testing
) async throws(E) -> [T] {
precondition(maxConcurrency > 0, "maxConcurrency must be > 0")
return try await withTaskGroup(of: (Int, Result<T, E>).self) { group -> Result<[T], E> in
var results: [T?] = []
results.reserveCapacity(self.underestimatedCount)
var iterator = makeIterator()
var exhausted = false
var inFlight = 0
while true {
while !exhausted && inFlight < maxConcurrency {
guard let element = iterator.next() else {
exhausted = true
break
}
let index = results.count
results.append(nil)
group.addTask {
let result = await Result { () async throws(E) in
try await transform(element)
}
return (index, result)
}
inFlight += 1
}
willWaitForNext?()
guard let (index, result) = await group.next() else { break }
inFlight -= 1
switch result {
case .success(let value):
results[index] = value
case .failure(let error):
group.cancelAll()
return .failure(error)
}
}
// we can't use `as! [T]` because it breaks nested optionals (Foo??)
return .success(results.map { $0! })
}
.get()
}
}
-17
View File
@@ -54,21 +54,4 @@ extension Environment {
)
}
}
extension OutputProtocol where Self == FileDescriptorOutput {
/// Writes subprocess output to `d.out`'s stdout
public static func xtoolOutput() throws -> Self {
try makeXToolOutput(for: .stdout)
}
/// Writes subprocess output to `d.out`'s stderr
public static func xtoolError() throws -> Self {
try makeXToolOutput(for: .stderr)
}
private static func makeXToolOutput(for stream: CommandOutput.Stream) throws -> Self {
let fd = try d.out.makeDescriptor(for: stream)
return .fileDescriptor(fd, closeAfterSpawningProcess: true)
}
}
#endif
+2 -29
View File
@@ -28,34 +28,7 @@ extension FilePath {
#endif
extension FileDescriptor {
/// Writes every byte, waiting for capacity if the descriptor is nonblocking.
package func writeAllWaiting(_ bytes: UnsafeRawBufferPointer) throws {
var offset = 0
while offset < bytes.count {
do {
// Swift System retries EINTR; retain the offset when a write is partial.
let count = try write(UnsafeRawBufferPointer(rebasing: bytes[offset...]))
guard count > 0 else { throw Errno.ioError }
offset += count
} catch let error as Errno where error == .resourceTemporarilyUnavailable || error == .wouldBlock {
var descriptor = pollfd(fd: rawValue, events: Int16(POLLOUT), revents: 0)
while true {
try Task.checkCancellation()
// periodically wake up to check for cancellation
let result = poll(&descriptor, 1, 100)
if result > 0 { break }
if result == -1 {
let error = Errno(rawValue: errno)
guard error != .interrupted else { continue }
throw error
}
}
// Retry write to report terminal errors (including POLLERR/POLLNVAL).
}
}
}
public enum LockMode {
enum LockMode {
case shared
case exclusive
@@ -67,7 +40,7 @@ extension FileDescriptor {
}
}
public func tryLock(mode: LockMode) throws -> Bool {
func tryLock(mode: LockMode) throws -> Bool {
if flock(rawValue, mode.raw | LOCK_NB) == 0 {
return true
}
+18 -1
View File
@@ -71,7 +71,24 @@ private struct TemporaryDirectoryRoot {
}
private init() {
let url = XToolCache.directory
let url: URL
let env = ProcessInfo.processInfo.environment
if let tmpdir = env["XTL_TMPDIR"] ?? env["TMPDIR"] {
url = URL(fileURLWithPath: tmpdir).appendingPathComponent("sh.xtool")
} else {
#if os(Linux)
// On Linux, /tmp is commonly a tmpfs mount while ~/.swiftpm lives on ext4.
// Foundation's FileManager.copyItem uses sendfile(2) internally, which returns
// EINVAL when copying between different filesystem types (e.g. tmpfs → ext4).
// This causes `swift sdk install` to fail on distros like Linux Mint (#181).
// Using a cache dir on the home filesystem avoids the cross-fs copy entirely.
let xdgCache = env["XDG_CACHE_HOME"].map { URL(fileURLWithPath: $0) }
?? FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".cache")
url = xdgCache.appendingPathComponent("xtool")
#else
url = FileManager.default.temporaryDirectory.appendingPathComponent("sh.xtool")
#endif
}
Self.pruneOrphans(in: url)
-22
View File
@@ -1,22 +0,0 @@
import Foundation
package enum XToolCache {
package static var directory: URL {
let env = ProcessInfo.processInfo.environment
if let tmpdir = env["XTL_TMPDIR"], !tmpdir.isEmpty {
return URL(fileURLWithPath: tmpdir).appendingPathComponent("sh.xtool")
}
#if os(Linux)
let xdgCache: URL
if let xdgCachePath = env["XDG_CACHE_HOME"],
(xdgCachePath as NSString).isAbsolutePath {
xdgCache = URL(filePath: xdgCachePath)
} else {
xdgCache = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".cache")
}
return xdgCache.appending(component: "xtool")
#else
return URL.cachesDirectory.appending(component: "sh.xtool")
#endif
}
}
+1 -2
View File
@@ -2,10 +2,9 @@ import Foundation
private import XcodeProj
extension XCSchema.Project {
public func pbxprojRepresentation(name: String, projectDirPath: String = "") throws -> Data {
public func pbxprojRepresentation(name: String) throws -> Data {
let xcprojData = try self.jsonRepresentation()
let pbxproj = try PBXProj(xcprojData: xcprojData, projectName: name)
try pbxproj.rootProject()?.projectDirPath = projectDirPath
// dataRepresentation should never return nil
return try pbxproj.dataRepresentation() ?? Data()
}
+8 -43
View File
@@ -1,5 +1,4 @@
import Foundation
private import XcodeProj
@_exported import XcodeProjectFormat
// This library is a lightweight layer on top of the XcodeProjectFormat
@@ -17,31 +16,13 @@ public struct XcodeProject: Equatable, Sendable {
public var project: XCSchema.Project
public var format: Format
/// The .xcodeproj bundle's location, including for projects constructed in memory.
public var url: URL
/// For pbxproj projects, an explicit source root.
public var projectDirPath = ""
public var sourceRoot: URL {
if projectDirPath.isEmpty {
url.deletingLastPathComponent()
} else {
URL(
filePath: projectDirPath,
directoryHint: .isDirectory,
relativeTo: url.deletingLastPathComponent(),
).standardizedFileURL
}
}
public init(
project: XCSchema.Project,
url: URL,
format: Format = .pbxproj,
) {
self.project = project
self.format = format
self.url = url.standardizedFileURL.resolvingSymlinksInPath()
}
/// Reads the project from the given `.xcodeproj` path.
@@ -49,8 +30,6 @@ public struct XcodeProject: Equatable, Sendable {
guard url.pathExtension == "xcodeproj" else {
throw Errors.notAnXcodeproj(url.path)
}
let url = url.standardizedFileURL.resolvingSymlinksInPath()
self.url = url
let xcprojURL = url.appending(path: "project.xcproj")
lazy var pbxprojURL = url.appending(path: "project.pbxproj")
if FileManager.default.fileExists(atPath: xcprojURL.path) {
@@ -59,9 +38,7 @@ public struct XcodeProject: Equatable, Sendable {
self.format = .xcproj
} else if FileManager.default.fileExists(atPath: pbxprojURL.path) {
let data = try Data(contentsOf: pbxprojURL)
let pbxproj = try PBXProj(data: data)
self.project = try XCSchema.Project(jsonRepresentation: pbxproj.xcprojData())
self.projectDirPath = try pbxproj.rootProject()?.projectDirPath ?? ""
self.project = try XCSchema.Project(pbxprojRepresentation: data)
self.format = .pbxproj
} else {
throw Errors.missingProjectFile(url.path)
@@ -75,39 +52,27 @@ public struct XcodeProject: Equatable, Sendable {
return copy
}
/// Returns a copy at a new bundle location.
public func withURL(_ url: URL) -> Self {
var copy = self
copy.url = url.standardizedFileURL.resolvingSymlinksInPath()
return copy
}
/// Writes the project to its current `.xcodeproj` URL.
public func write() throws {
/// Writes the project to the given `.xcodeproj` path.
public func write(to url: URL) throws {
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
switch format {
case .pbxproj:
try project.pbxprojRepresentation(
name: url.deletingPathExtension().lastPathComponent,
projectDirPath: projectDirPath,
).write(to: url.appendingPathComponent("project.pbxproj"))
try project
.pbxprojRepresentation(name: url.deletingPathExtension().lastPathComponent)
.write(to: url.appendingPathComponent("project.pbxproj"))
case .xcproj:
guard projectDirPath.isEmpty else {
throw Errors.xcprojWithExplicitSourceRoot
}
try project
.jsonRepresentation()
.write(to: url.appendingPathComponent("project.xcproj"))
}
let workspaceURL = url.appendingPathComponent("project.xcworkspace")
try XcodeWorkspace(children: [.file(.current)], url: workspaceURL).write()
try XcodeWorkspace(children: [.file(.current)])
.write(to: url.appendingPathComponent("project.xcworkspace"))
}
public enum Errors: Error {
case notAnXcodeproj(String)
case missingProjectFile(String)
case xcprojWithExplicitSourceRoot
}
}
@@ -4,15 +4,14 @@ private import XcodeProj
extension XcodeWorkspace {
public init(url: URL) throws {
let workspace = try XCWorkspace(pathString: url.path)
self.init(workspace.data, url: url)
self.init(workspace.data)
}
public func dataRepresentation() throws -> Data {
try xcWorkspaceData.dataRepresentation() ?? Data()
}
/// Writes the workspace to its current URL.
public func write() throws {
public func write(to url: URL) throws {
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
try self.dataRepresentation()
.write(to: url.appendingPathComponent("contents.xcworkspacedata"))
@@ -22,8 +21,8 @@ extension XcodeWorkspace {
// MARK: - Conversion
extension XcodeWorkspace {
fileprivate init(_ xcWorkspaceData: XCWorkspaceData, url: URL) {
self.init(children: xcWorkspaceData.children.map { .init(from: $0) }, url: url)
fileprivate init(_ xcWorkspaceData: XCWorkspaceData) {
self.init(children: xcWorkspaceData.children.map { .init(from: $0) })
}
fileprivate var xcWorkspaceData: XCWorkspaceData {

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