URL encode (ä|ö|ü) in invalidation path

Author: laurilehmijoki

changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.8.5
+
+* URL encode (ä|ö|ü) in invalidation path
+
 ## 2.8.4
 
 * URL encude ' in invalidation path

lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.8.4'
+  VERSION = '2.8.5'
 end

src/main/scala/s3/website/CloudFront.scala

@@ -117,9 +117,16 @@ object CloudFront {
   def toInvalidationPath(report: PushSuccessReport) = "/" + report.s3Key
 
   def encodeUnsafeChars(invalidationPath: String) =
-    new URI("http", "cloudfront", invalidationPath, "").toURL.getPath
+    new URI("http", "cloudfront", invalidationPath, "")
+      .toURL
+      .getPath
       .replaceAll("'", URLEncoder.encode("'", "UTF-8")) // CloudFront does not accept ' in invalidation path
-
+      .flatMap(chr => {
+        if (Seq("ä", "ö", "ü").contains(chr.toString.toLowerCase))
+          URLEncoder.encode(chr.toString, "UTF-8")
+        else
+          chr.toString
+      })
 
   def needsInvalidation: PartialFunction[PushSuccessReport, Boolean] = {
     case succ: SuccessfulUpload => succ.details.fold(_.uploadType, _.uploadType) == FileUpdate

src/test/scala/s3/website/S3WebsiteSpec.scala

@@ -207,6 +207,14 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold%27s%20file.html" :: Nil).sorted)
     }
 
+    "encode unsafe characters in the keys" in new BasicSetup {
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("articles/Äöü.html")
+      setOutdatedS3Keys("articles/Äöü.html")
+      push()
+      sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/%C3%84%C3%B6%C3%BC.html" :: Nil).sorted)
+    }
+
     "invalidate the root object '/' if a top-level object is updated or deleted" in new BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("maybe-index.html")