Skip to content
This repository has been archived by the owner on Nov 20, 2019. It is now read-only.

Url encode filename in bucket file on s3 request #91

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Url encode filename in bucket file on s3 request #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/main/scala/fly/play/s3/S3Client.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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"
}
}

Expand Down
23 changes: 18 additions & 5 deletions src/test/scala/fly/play/s3/S3BucketSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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"
Expand All @@ -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 {
Expand All @@ -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)
}
Expand Down Expand Up @@ -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")
Expand Down