Concurrency fixes

soto-project · Apr 1, 2024 · db929f6 · db929f6
1 parent 4b020eb
commit db929f6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Soto for AWS open source project
@@ -17,6 +17,10 @@
 
 import PackageDescription
 
+let swiftSettings: [SwiftSetting] = [
+    .enableExperimentalFeature("StrictConcurrency=complete"),
+]
+
 let package = Package(
     name: "soto-cognito-authentication-kit",
     platforms: [
@@ -30,7 +34,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMajor(from: "1.0.0")),
-        .package(url: "https://github.com/soto-project/soto.git", from: "7.0.0-alpha"),
+        .package(url: "https://github.com/soto-project/soto.git", branch: "7.x.x"),
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.10.0"),
         .package(url: "https://github.com/vapor/jwt-kit.git", .upToNextMajor(from: "4.2.6")),
         // for SRP
@@ -45,17 +49,18 @@ let package = Package(
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .product(name: "JWTKit", package: "jwt-kit"),
                 .product(name: "Crypto", package: "swift-crypto"),
-            ]
+            ],
+            swiftSettings: swiftSettings
         ),
-        .testTarget(name: "SotoCognitoAuthenticationKitTests", dependencies: ["SotoCognitoAuthenticationKit"]),
-
         .target(
             name: "SotoCognitoAuthenticationSRP",
             dependencies: [
                 .product(name: "BigNum", package: "big-num"),
                 .target(name: "SotoCognitoAuthenticationKit"),
-            ]
+            ],
+            swiftSettings: swiftSettings
         ),
+        .testTarget(name: "SotoCognitoAuthenticationKitTests", dependencies: ["SotoCognitoAuthenticationKit"]),
         .testTarget(name: "SotoCognitoAuthenticationSRPTests", dependencies: ["SotoCognitoAuthenticationSRP"]),
     ]
 )
diff --git a/Sources/SotoCognitoAuthenticationKit/Authenticatable+JWT.swift b/Sources/SotoCognitoAuthenticationKit/Authenticatable+JWT.swift
@@ -91,18 +91,17 @@ extension CognitoAuthenticatable {
         }
 
         logger.debug("Load jwks.json")
-        let jwtSignersURL = "https://cognito-idp.\(configuration.region.rawValue).amazonaws.com/\(configuration.userPoolId)/.well-known/jwks.json"
+        let jwtSignersURL = URL(string: "https://cognito-idp.\(configuration.region.rawValue).amazonaws.com/\(configuration.userPoolId)/.well-known/jwks.json")!
         let httpClient = configuration.cognitoIDP.client.httpClient
-        let response = try await httpClient.get(
-            url: jwtSignersURL,
-            deadline: .now() + .seconds(20),
+        let request = AWSHTTPRequest(url: jwtSignersURL, method: .GET, headers: [:], body: .init())
+        let response = try await httpClient.execute(
+            request: request,
+            timeout: .seconds(20),
             logger: logger
-        ).get()
+        )
         let signers = JWTSigners()
-        guard let body = response.body else { return JWTSigners() }
-        if let data = body.getString(at: body.readerIndex, length: body.readableBytes) {
-            try signers.use(jwksJSON: data)
-        }
+        let data = try await response.body.collect(upTo: 1_000_000)
+        try signers.use(jwksJSON: String(buffer: data))
         self.jwtSigners = signers
         return signers
     }

diff --git a/Sources/SotoCognitoAuthenticationKit/Identifiable.swift b/Sources/SotoCognitoAuthenticationKit/Identifiable.swift
@@ -15,7 +15,7 @@
 import NIO
 import SotoCognitoIdentity
 
-public final class CognitoIdentifiable: Sendable {
+public struct CognitoIdentifiable: Sendable {
     // MARK: Member variables
 
     /// Configuration

diff --git a/Sources/SotoCognitoAuthenticationKit/UserPoolCredentialProvider.swift b/Sources/SotoCognitoAuthenticationKit/UserPoolCredentialProvider.swift
@@ -16,7 +16,7 @@ import SotoCognitoIdentity
 import SotoCognitoIdentityProvider
 
 /// Cognito authentication method used by `CredentialProviderFactory.cognitoUserPool`.
-public struct CognitoAuthenticationMethod {
+public struct CognitoAuthenticationMethod: Sendable {
     public struct Context: Sendable {
         public let authenticatable: CognitoAuthenticatable
         public let userName: String

diff --git a/Sources/SotoCognitoAuthenticationSRP/SRP.swift b/Sources/SotoCognitoAuthenticationSRP/SRP.swift
@@ -16,8 +16,8 @@ import BigNum
 import Crypto
 import Foundation
 
-/// Class to generate SRP password authentication key
-class SRP<H: HashFunction> {
+/// Generates SRP password authentication key
+struct SRP<H: HashFunction>: Sendable {
     let N: BigNum
     let g: BigNum
     let k: BigNum