Fix for URLs with percent-encoded paths

Author: gregneagle

GCSMiddleware/GCSMiddleware.swift

@@ -28,8 +28,11 @@ func generateSignedUrl(
     clientId: String,
     expiration: Int
 ) -> String? {
-    guard let parsedURL = URL(string: url) else { return nil }
-    let path = parsedURL.path
+    guard let components = URLComponents(string: url) else {
+        print("ERROR: could parse URL string")
+        return nil
+    }
+    let path = components.percentEncodedPath
     let toSign = "GET\n\n\n\(expiration)\n\(path)"
     if let signature = signSHA256(Data(toSign.utf8), withKey: key) {
         let signatureString = signature.base64EncodedString()

GCSMiddlewareTests/GCSMiddlewareTests.swift

@@ -26,6 +26,23 @@ struct GCSMiddlewareTests {
         #expect(signedURL == expectedURL)
     }
 
+    @Test func generateSignedUrlFromPercentEncodedURLReturnsExpected() throws {
+        let expectedURL = "https://storage.googleapis.com/foo/bar%20baz?GoogleAccessId=readonly@double.iam.gserviceaccount.com&Expires=1747270308&Signature=4BNAeHKlLZRqW0St49hf5FRszUsHQ9YvBHDSh3%2BsFxyQec%2F14nwvZR5%2FB%2FMU6199kswVu1IFFAnJADqSHwnpIvJd1yxtj8vFIM8wcaWGGtleQFVRXjQPJXi%2BUfyRNrWhhqAmmch9D%2F3aEQNEcVFejiq7d4wtgokbM2gGN3rQGEFrVMWtwXdi%2F6j%2FE3rOBuGNIgn429c%2BFg%2BoK0AHEZ2hac1QKdNqt%2Fp64zkwlicHhMjW%2FbN9ha5i6o0YLn1dKkQG1K9WZyi880TiPHpZNYd%2Fke7OhwM9nLL8zff13l7FaH7hsHxTPwTHG%2BtD4116AUKTbO6vpfLRmWWPwBAwRyJHkQ%3D%3D"
+        let url = "https://storage.googleapis.com/foo/bar%20baz"
+        let clientId = "readonly@double.iam.gserviceaccount.com"
+        let expiration = 1_747_270_308
+        let key = rsaPrivateKeyFromPemString(RSA_PRIVATE_KEY_STRING)
+        let unwrappedKey = try #require(key, "Could not load RSA private key from PEM string")
+
+        let signedURL = generateSignedUrl(
+            url,
+            withKey: unwrappedKey,
+            clientId: clientId,
+            expiration: expiration,
+        )
+        #expect(signedURL == expectedURL)
+    }
+
     // Make sure we can parse the gcs.json file
     @Test func readJsonKeyStore() throws {
         let jsonPath = try #require(TestingResource.path(for: "gcs.json"),