Merge pull request #24 from Tinder/maxwelle/enterprise-support

Adds enterprise support

Author: tinder-maxwellelliott

.bazelrc

@@ -1,3 +1,5 @@
+common --enable_bzlmod
+
 build --incompatible_disallow_empty_glob
 build --apple_platform_type=macos
 build --incompatible_strict_action_env
@@ -8,4 +10,4 @@ build --crosstool_top=@local_config_apple_cc//:toolchain
 build --host_crosstool_top=@local_config_apple_cc//:toolchain
 test --test_output=errors
 test --test_summary=detailed
-common --enable_bzlmod
+test:record_snapshots --spawn_strategy=local

.bazelversion

@@ -0,0 +1 @@
+7.3.1

MODULE.bazel

@@ -8,6 +8,5 @@ bazel_dep(name = "swift_argument_parser", version = "1.3.0", repo_name = "com_gi
 non_module_dependencies = use_extension("//:extensions.bzl", "non_module_dependencies")
 use_repo(
     non_module_dependencies,
-    "com_github_kitura_blueecc",
     "com_github_kylef_pathkit",
 )

MODULE.bazel.lock

@@ -0,0 +1,7 @@
+.PHONY: record_snapshots
+record_snapshots:
+	bazel test //Tests/... \
+		--config=record_snapshots \
+		--test_env=BUILD_WORKSPACE_DIRECTORY=$$(pwd) \
+		--test_env=SNAPSHOT_DIRECTORY="$$(pwd)/Tests/SignHereLibraryTests" \
+		--test_env=RERECORD_SNAPSHOTS=TRUE

Makefile

@@ -26,7 +26,6 @@ swift_library(
     deps = [
         "//Sources/CoreLibrary",
         "@com_github_apple_swift_argument_parser//:ArgumentParser",
-        "@com_github_kitura_blueecc//:BlueECC",
     ],
 )
 

Sources/SignHereLibrary/BUILD

@@ -126,6 +126,7 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
         case certificateSigningRequestSubject = "certificateSigningRequestSubject"
         case profileName = "profileName"
         case autoRegenerate = "autoRegenerate"
+        case enterprise = "enterprise"
     }
 
     @Option(help: "The key identifier of the private key (https://developer.apple.com/documentation/appstoreconnectapi/generating_tokens_for_api_requests)")
@@ -189,6 +190,9 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
     @Flag(help: "Defines if the profile should be regenerated in case it already exists (optional)")
     internal var autoRegenerate = false
 
+    @Flag(help: "Controls if the enterprise API should be used.")
+    internal var enterprise: Bool = false
+
     private let files: Files
     private let log: Log
     private let shell: Shell
@@ -206,10 +210,7 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
         shell = shellImp
         uuid = UUIDImp()
         iTunesConnectService = iTunesConnectServiceImp(
-            network: NetworkImp(),
-            files: filesImp,
-            shell: shellImp,
-            clock: clockImp
+            enterprise: false
         )
     }
 
@@ -236,7 +237,8 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
         bundleIdentifierName: String?,
         platform: String,
         profileName: String?,
-        autoRegenerate: Bool
+        autoRegenerate: Bool,
+        enterprise: Bool
     ) {
         self.files = files
         self.log = log
@@ -261,24 +263,23 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
         self.platform = platform
         self.profileName = profileName
         self.autoRegenerate = autoRegenerate
+        self.enterprise = enterprise
     }
 
     internal init(from decoder: Decoder) throws {
         let filesImp: Files = FilesImp()
         let clockImp: Clock = ClockImp()
         let shellImp: Shell = ShellImp()
         let container: KeyedDecodingContainer<CodingKeys> = try decoder.container(keyedBy: CodingKeys.self)
+        let enterprise: Bool = try container.decode(Bool.self, forKey: .enterprise)
         self.init(
             files: filesImp,
             log: LogImp(),
             jsonWebTokenService: JSONWebTokenServiceImp(clock: clockImp),
             shell: shellImp,
             uuid: UUIDImp(),
             iTunesConnectService: iTunesConnectServiceImp(
-                network: NetworkImp(),
-                files: filesImp,
-                shell: shellImp,
-                clock: clockImp
+                enterprise: enterprise
             ),
             keyIdentifier: try container.decode(String.self, forKey: .keyIdentifier),
             issuerID: try container.decode(String.self, forKey: .issuerID),
@@ -296,15 +297,17 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
             bundleIdentifierName: try container.decodeIfPresent(String.self, forKey: .bundleIdentifierName),
             platform: try container.decode(String.self, forKey: .platform),
             profileName: try container.decodeIfPresent(String.self, forKey: .profileName),
-            autoRegenerate: try container.decode(Bool.self, forKey: .autoRegenerate)
+            autoRegenerate: try container.decode(Bool.self, forKey: .autoRegenerate),
+            enterprise: enterprise
         )
     }
 
     internal func run() throws {
         let jsonWebToken: String = try jsonWebTokenService.createToken(
             keyIdentifier: keyIdentifier,
             issuerID: issuerID,
-            secretKey: try files.read(Path(itunesConnectKeyPath))
+            secretKey: try files.read(Path(itunesConnectKeyPath)),
+            enterprise: enterprise
         )
         let deviceIDs: Set<String> = try iTunesConnectService.fetchITCDeviceIDs(jsonWebToken: jsonWebToken)
         guard let profileName, let profile = try? fetchProvisioningProfile(jsonWebToken: jsonWebToken, name: profileName)

Sources/SignHereLibrary/Commands/CreateProvisioningProfileCommand.swift

@@ -24,6 +24,7 @@ internal struct DeleteProvisioningProfileCommand: ParsableCommand {
         case keyIdentifier = "keyIdentifier"
         case issuerID = "issuerID"
         case itunesConnectKeyPath = "itunesConnectKeyPath"
+        case enterprise = "enterprise"
     }
 
     @Option(help: "The iTunes Connect API ID of the provisioning profile to delete (https://developer.apple.com/documentation/appstoreconnectapi/profile)")
@@ -38,6 +39,9 @@ internal struct DeleteProvisioningProfileCommand: ParsableCommand {
     @Option(help: "The path to the private key (https://developer.apple.com/documentation/appstoreconnectapi/generating_tokens_for_api_requests)")
     internal var itunesConnectKeyPath: String
 
+    @Flag(help: "Controls if the enterprise API should be used.")
+    internal var enterprise: Bool = false
+
     private let files: Files
     private let jsonWebTokenService: JSONWebTokenService
     private let iTunesConnectService: iTunesConnectService
@@ -47,10 +51,7 @@ internal struct DeleteProvisioningProfileCommand: ParsableCommand {
         files = filesImp
         jsonWebTokenService = JSONWebTokenServiceImp(clock: ClockImp())
         iTunesConnectService = iTunesConnectServiceImp(
-            network: NetworkImp(),
-            files: filesImp,
-            shell: ShellImp(),
-            clock: ClockImp()
+            enterprise: false
         )
     }
 
@@ -61,7 +62,8 @@ internal struct DeleteProvisioningProfileCommand: ParsableCommand {
         provisioningProfileId: String,
         keyIdentifier: String,
         issuerID: String,
-        itunesConnectKeyPath: String
+        itunesConnectKeyPath: String,
+        enterprise: Bool
     ) {
         self.files = files
         self.jsonWebTokenService = jsonWebTokenService
@@ -70,32 +72,33 @@ internal struct DeleteProvisioningProfileCommand: ParsableCommand {
         self.keyIdentifier = keyIdentifier
         self.issuerID = issuerID
         self.itunesConnectKeyPath = itunesConnectKeyPath
+        self.enterprise = enterprise
     }
 
     internal init(from decoder: Decoder) throws {
         let filesImp: Files = FilesImp()
         let container: KeyedDecodingContainer<CodingKeys> = try decoder.container(keyedBy: CodingKeys.self)
+        let enterprise: Bool = try container.decode(Bool.self, forKey: .enterprise)
         self.init(
             files: filesImp,
             jsonWebTokenService: JSONWebTokenServiceImp(clock: ClockImp()),
             iTunesConnectService: iTunesConnectServiceImp(
-                network: NetworkImp(),
-                files: filesImp,
-                shell: ShellImp(),
-                clock: ClockImp()
+                enterprise: enterprise
             ),
             provisioningProfileId: try container.decode(String.self, forKey: .provisioningProfileId),
             keyIdentifier: try container.decode(String.self, forKey: .keyIdentifier),
             issuerID: try container.decode(String.self, forKey: .issuerID),
-            itunesConnectKeyPath: try container.decode(String.self, forKey: .itunesConnectKeyPath)
+            itunesConnectKeyPath: try container.decode(String.self, forKey: .itunesConnectKeyPath),
+            enterprise: enterprise
         )
     }
 
     internal func run() throws {
         let jsonWebToken: String = try jsonWebTokenService.createToken(
             keyIdentifier: keyIdentifier,
             issuerID: issuerID,
-            secretKey: try files.read(Path(itunesConnectKeyPath))
+            secretKey: try files.read(Path(itunesConnectKeyPath)),
+            enterprise: enterprise
         )
         try iTunesConnectService.deleteProvisioningProfile(
             jsonWebToken: jsonWebToken,

Sources/SignHereLibrary/Commands/DeleteProvisioningProfileCommand.swift

@@ -28,7 +28,7 @@ enum ProfileType {
 
     var usesDevices: Bool {
         switch self {
-            case .appStore: return false
+            case .appStore, .inHouse: return false
             default: return true
         }
     }

Sources/SignHereLibrary/Models/ProfileType.swift

@@ -7,7 +7,7 @@
 
 import CoreLibrary
 import Foundation
-import CryptorECC
+import CryptoKit
 
 // ME: Documented here https://developer.apple.com/documentation/appstoreconnectapi/generating_tokens_for_api_requests
 
@@ -16,7 +16,8 @@ internal protocol JSONWebTokenService {
     func createToken(
         keyIdentifier: String,
         issuerID: String,
-        secretKey: Data
+        secretKey: Data,
+        enterprise: Bool
     ) throws -> String
 }
 
@@ -44,7 +45,8 @@ internal class JSONWebTokenServiceImp: JSONWebTokenService {
     func createToken(
         keyIdentifier: String,
         issuerID: String,
-        secretKey: Data
+        secretKey: Data,
+        enterprise: Bool
     ) throws -> String {
         let header: JSONWebTokenHeader = .init(
             alg: "ES256",
@@ -57,33 +59,29 @@ internal class JSONWebTokenServiceImp: JSONWebTokenService {
             iss: issuerID,
             iat: currentTime.timeIntervalSince1970,
             exp: expirationTime.timeIntervalSince1970,
-            aud: "appstoreconnect-v1"
+            aud: enterprise ? "apple-developer-enterprise-v1" : "appstoreconnect-v1"
         )
         let jsonEncoder: JSONEncoder = .init()
         var components: [String] = [
             urlBase64Encode(data: try jsonEncoder.encode(header)),
             ".",
             urlBase64Encode(data: try jsonEncoder.encode(payload)),
         ]
-        let signature: String = try createSignedHeaderPayload(data: Data(components.joined().utf8), secretKey: secretKey)
+        let signature: String = try createSignature(data: Data(components.joined().utf8), secretKey: secretKey)
         components.append(contentsOf: [
             ".",
             signature
         ])
         return components.joined()
     }
 
-    private func createSignedHeaderPayload(data: Data, secretKey: Data) throws -> String {
+    private func createSignature(data: Data, secretKey: Data) throws -> String {
         guard let keyString = String(data: secretKey, encoding: .utf8) else {
             throw Error.unableToCreateKeyString
         }
-        let privateKey: ECPrivateKey = try .init(key: keyString)
-        guard privateKey.curve == .prime256v1
-        else {
-            throw Error.unableToCreatePrivateKey
-        }
-        let signedData: ECSignature = try data.sign(with: privateKey)
-        return urlBase64Encode(data: signedData.r + signedData.s)
+        let key = try P256.Signing.PrivateKey(pemRepresentation: keyString)
+        let signature = try key.signature(for: data)
+        return urlBase64Encode(data: signature.rawRepresentation)
     }
 
     private func urlBase64Encode(data: Data) -> String {