Merge pull request soto-project#69 from tengyifei/patch-1

Fix duplicate bucket name in URL normalization
tyressk · Apr 14, 2018 · 265b8d7 · 265b8d7
2 parents 8d744d4 + da8ce4c
commit 265b8d7
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Sources/AWSSDKSwift/Middlewares/S3/S3RequestMiddleware.swift b/Sources/AWSSDKSwift/Middlewares/S3/S3RequestMiddleware.swift
@@ -22,12 +22,18 @@ struct S3RequestMiddleware: AWSRequestMiddleware {
             }
             request.url = URL(string: "\(request.url.scheme ?? "https")://\(paths.removeFirst()).\(domain)/\(paths.joined(separator: "/"))\(query)")!
         default:
-            guard  let host = request.url.host, host.contains("amazonaws.com") else { break }
+            guard let host = request.url.host, host.contains("amazonaws.com") else { break }
             var pathes = request.url.path.components(separatedBy: "/")
             if paths.count > 1 {
                 _ = pathes.removeFirst() // /
                 let bucket = pathes.removeFirst() // bucket
-                var urlString = "https://\(bucket).\(host)/\(pathes.joined(separator: "/"))"
+                var urlString: String
+                if let firstHostComponent = host.components(separatedBy: ".").first, bucket == firstHostComponent {
+                    // Bucket name is part of host. No need to append bucket
+                    urlString = "https://\(host)/\(pathes.joined(separator: "/"))"
+                } else {
+                    urlString = "https://\(bucket).\(host)/\(pathes.joined(separator: "/"))"
+                }
                 if let query = request.url.query {
                     urlString += "?\(query)"
                 }