From 5b8ddce11d27b5b5f078e32a18243e878e494ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Wold?= <wohakon@gmail.com>
Date: Thu, 7 Dec 2017 21:44:01 +0100
Subject: [PATCH] Url encode filename in bucket file on s3 request - fixes #89

---
 src/main/scala/fly/play/s3/S3Client.scala     |  9 ++++----
 src/test/scala/fly/play/s3/S3BucketSpec.scala | 23 +++++++++++++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/fly/play/s3/S3Client.scala b/src/main/scala/fly/play/s3/S3Client.scala
index 717db31..85af92b 100644
--- a/src/main/scala/fly/play/s3/S3Client.scala
+++ b/src/main/scala/fly/play/s3/S3Client.scala
@@ -2,8 +2,8 @@ package fly.play.s3
 
 import play.api.libs.ws.WSClient
 import play.api.libs.ws.WSRequest
-import fly.play.aws.AwsRequestHolder
-import fly.play.aws.AwsSigner
+import fly.play.aws.{AwsRequestHolder, AwsSigner, AwsUrlEncoder}
+
 import scala.concurrent.ExecutionContext
 
 class S3Client(private val wsClient: WSClient, val signer: AwsSigner, val configuration: S3Configuration) {
@@ -17,8 +17,9 @@ class S3Client(private val wsClient: WSClient, val signer: AwsSigner, val config
     val S3Configuration(_, _, https, host, pathStyleAccess) = configuration
     val protocol = if (https) "https" else "http"
 
-    if (pathStyleAccess) s"$protocol://$host/$bucketName/$path"
-    else s"$protocol://$bucketName.$host/$path"
+    val urlEncodedPath = AwsUrlEncoder.encodePath(path)
+    if (pathStyleAccess) s"$protocol://$host/$bucketName/$urlEncodedPath"
+    else s"$protocol://$bucketName.$host/$urlEncodedPath"
   }
 }
 
diff --git a/src/test/scala/fly/play/s3/S3BucketSpec.scala b/src/test/scala/fly/play/s3/S3BucketSpec.scala
index de9baa0..7f8c517 100644
--- a/src/test/scala/fly/play/s3/S3BucketSpec.scala
+++ b/src/test/scala/fly/play/s3/S3BucketSpec.scala
@@ -2,7 +2,6 @@ package fly.play.s3
 
 import java.util.Date
 
-import fly.play.aws.AwsUrlEncoder
 import fly.play.aws.acl._
 import fly.play.aws.policy.Condition
 import fly.play.s3.upload.{Form, FormElement}
@@ -76,6 +75,16 @@ class S3BucketSpec extends S3SpecSetup {
       value.header(CONTENT_TYPE) must_== Some("text/plain")
     }
 
+    "be able to add a file with url encoded character" inApp {
+
+      val result = testBucket +
+        BucketFile("UrlEncodedChar'.txt", "text/plain", """
+          This is a bucket used for testing the S3 module of play
+        """.getBytes)
+
+      noException(result)
+    }
+
     "be able to check if it exists" inApp {
 
       val result = testBucket get "README.txt"
@@ -102,12 +111,12 @@ class S3BucketSpec extends S3SpecSetup {
       testBucket.list must beAnInstanceOf[Future[Iterable[BucketItem]]]
     }
 
-    "list should have a size of 2" inApp {
+    "list should have a size of 3" inApp {
 
       val result = testBucket.list
       val value = await(result)
 
-      value.size === 2
+      value.size === 3
     }
 
     "list should have the correct contents" inApp {
@@ -120,6 +129,10 @@ class S3BucketSpec extends S3SpecSetup {
         case f                               => failure("Wrong file returned: " + f)
       }
       seq(1) match {
+        case BucketItem("UrlEncodedChar'.txt", false) => success
+        case f                               => failure("Wrong file returned: " + f)
+      }
+      seq(2) match {
         case BucketItem("testPrefix/", true) => success
         case f                               => failure("Wrong file returned: " + f)
       }
@@ -401,13 +414,13 @@ class S3BucketSpec extends S3SpecSetup {
     "be able to add and delete files with 'weird' names" inApp {
 
       def uploadListAndRemoveFileWithName(prefix: String, name: String) = {
-        await(testBucket + BucketFile(AwsUrlEncoder.encodePath(prefix + name), "text/plain", "test".getBytes))
+        await(testBucket + BucketFile(prefix + name, "text/plain", "test".getBytes))
 
         await(testBucket.list(prefix)) must beLike {
           case Seq(BucketItem(itemName, false)) => itemName === (prefix + name)
         }
 
-        noException(testBucket - AwsUrlEncoder.encodePath(prefix + name))
+        noException(testBucket - (prefix + name))
       }
 
       uploadListAndRemoveFileWithName("sample/", "test file.txt")