0.1.50.1.5

3 files changed, 12 insertions, 2 deletions

diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala
index 15eae0d..876683e 100644
--- a/cask/src/cask/endpoints/StaticEndpoints.scala
+++ b/cask/src/cask/endpoints/StaticEndpoints.scala
@@ -10,7 +10,9 @@ class staticFiles(val path: String) extends Endpoint{
   type InputParser[T] = QueryParamReader[T]
   override def subpath = true
   def wrapFunction(ctx: Request, delegate: Delegate): Returned = {
-    delegate(Map()).map(t => cask.model.StaticFile(t + "/" + ctx.remainingPathSegments.mkString("/")))
+    delegate(Map()).map(t =>
+      cask.model.StaticFile(t + "/" + ctx.remainingPathSegments.filter(s => s != "." && s != "..").mkString("/"))
+    )
   }
 
   def wrapPathSegment(s: String): Input = Seq(s)
@@ -24,7 +26,7 @@ class staticResources(val path: String, resourceRoot: ClassLoader = getClass.get
   override def subpath = true
   def wrapFunction(ctx: Request, delegate: Delegate): Returned = {
     delegate(Map()).map(t =>
-      cask.model.StaticResource(t + "/" + ctx.remainingPathSegments.mkString("/"), resourceRoot)
+      cask.model.StaticResource(t + "/" + ctx.remainingPathSegments.filter(s => s != "." && s != "..").mkString("/"), resourceRoot)
     )
   }
 
diff --git a/example/staticFiles/app/src/StaticFiles.scala b/example/staticFiles/app/src/StaticFiles.scala
index e47f0a1..00d1ace 100644
--- a/example/staticFiles/app/src/StaticFiles.scala
+++ b/example/staticFiles/app/src/StaticFiles.scala
@@ -11,5 +11,8 @@ object StaticFiles extends cask.MainRoutes{
   @cask.staticResources("/static/resource")
   def staticResourceRoutes() = "cask"
 
+  @cask.staticResources("/static/resource2")
+  def staticResourceRoutes2() = "."
+
   initialize()
 }
diff --git a/example/staticFiles/app/test/src/ExampleTests.scala b/example/staticFiles/app/test/src/ExampleTests.scala
index c60f443..ab67bcf 100644
--- a/example/staticFiles/app/test/src/ExampleTests.scala
+++ b/example/staticFiles/app/test/src/ExampleTests.scala
@@ -24,6 +24,11 @@ object ExampleTests extends TestSuite{
 
       requests.get(s"$host/static/resource/example.txt").text() ==>
         "the quick brown fox jumps over the lazy dog"
+
+      requests.get(s"$host/static/resource2/cask/example.txt").text() ==>
+        "the quick brown fox jumps over the lazy dog"
+
+      requests.get(s"$host/static/file/../../../build.sc").statusCode ==> 404
     }
 
   }