Fix file/resource matching with multiple paths

Author: weavejester

src/duct/handler/util.clj

@@ -3,17 +3,15 @@
             [ring.middleware.content-type :as type]
             [ring.util.async :as async]))
 
-(defn- match-path [uri paths]
-  (first (filter #(str/starts-with? uri (key %)) paths)))
-
 (defn path-handler [paths make-response not-found-response]
-  (let [paths (sort-by (comp count key) paths)]
+  (let [paths (reverse (sort-by (comp count key) paths))]
     (fn handler
       ([{:keys [uri] :as req}]
-       (if-some [[path opts] (match-path uri paths)]
-         (or (some-> (make-response (subs uri (count path)) opts)
-                     (type/content-type-response req opts))
-             not-found-response)
-         not-found-response))
+       (or (some (fn [[path opts]]
+                   (when (str/starts-with? uri path)
+                     (some-> (make-response (subs uri (count path)) opts)
+                             (type/content-type-response req opts))))
+                 paths)
+           not-found-response))
       ([request respond raise]
        (async/raising raise (respond (handler request)))))))

test/duct/handler/file_test.clj

@@ -1,7 +1,7 @@
 (ns duct.handler.file-test
   (:require [clojure.java.io :as io]
             [clojure.test :refer [deftest is]]
-            [duct.handler.file :as file]
+            [duct.handler.file]
             [integrant.core :as ig]))
 
 (deftest test-file-handler
@@ -53,3 +53,22 @@
             :body    (io/file root "foo.txt")}
            (-> (deref respond 100 nil)
                (update :headers dissoc "Last-Modified"))))))
+
+(deftest test-multiple-paths
+  (let [paths   {"/"    {:root "test/duct/handler/files"}
+                 "/sub" {:root "test/duct/handler/files/subdir"}}
+        handler (ig/init-key :duct.handler/file {:paths paths})]
+    (is (= {:status 200
+            :headers {"Content-Type" "text/plain"
+                      "Content-Length" "4"}
+            :body    (io/file "test/duct/handler/files/foo.txt")}
+           (-> (handler {:request-method :get, :uri "/foo.txt"})
+               (update :headers dissoc "Last-Modified"))))
+    (is (= {:status 200
+            :headers {"Content-Type" "text/plain"
+                      "Content-Length" "4"}
+            :body    (io/file "test/duct/handler/files/subdir/bar.txt")}
+           (-> (handler {:request-method :get, :uri "/sub/bar.txt"})
+               (update :headers dissoc "Last-Modified"))))
+    (is (nil? (handler {:request-method :get, :uri "/bar.txt"})))
+    (is (nil? (handler {:request-method :get, :uri "/sub/foo.txt"})))))

test/duct/handler/files/subdir/bar.txt

@@ -0,0 +1 @@
+bar

test/duct/handler/resource_test.clj

@@ -1,6 +1,6 @@
 (ns duct.handler.resource-test
   (:require [clojure.test :refer [deftest is]]
-            [duct.handler.resource :as resource]
+            [duct.handler.resource]
             [integrant.core :as ig]))
 
 (deftest test-resource-handler
@@ -55,3 +55,24 @@
            (-> (deref respond 100 nil)
                (update :headers dissoc "Last-Modified")
                (update :body slurp))))))
+
+(deftest test-multiple-paths
+  (let [paths   {"/"    {:root "duct/handler/files"}
+                 "/sub" {:root "duct/handler/files/subdir"}}
+        handler (ig/init-key :duct.handler/resource {:paths paths})]
+    (is (= {:status 200
+            :headers {"Content-Type" "text/plain"
+                      "Content-Length" "4"}
+            :body    "foo\n"}
+           (-> (handler {:request-method :get, :uri "/foo.txt"})
+               (update :headers dissoc "Last-Modified")
+               (update :body slurp))))
+    (is (= {:status 200
+            :headers {"Content-Type" "text/plain"
+                      "Content-Length" "4"}
+            :body    "bar\n"}
+           (-> (handler {:request-method :get, :uri "/sub/bar.txt"})
+               (update :headers dissoc "Last-Modified")
+               (update :body slurp))))
+    (is (nil? (handler {:request-method :get, :uri "/bar.txt"})))
+    (is (nil? (handler {:request-method :get, :uri "/sub/foo.txt"})))))