Accept more characters for crates names/versions in path

#33

This commit fix a bug where using characters like "+" in crates names
was causing issues with Meuse.

Author: mcorbin

src/meuse/api/crate.clj

@@ -0,0 +1,7 @@
+(ns meuse.api.crate)
+
+;; the regex for the crates names and versions in path
+(def crate-regex #"[a-zA-Z0-9~._+~-]+")
+
+(def crate-name-path [crate-regex :crate-name])
+(def crate-version-path [crate-regex :crate-version])

src/meuse/api/crate/http.clj

@@ -1,5 +1,6 @@
 (ns meuse.api.crate.http
-  (:require [meuse.api.default :as default]))
+  (:require [meuse.api.default :as default]
+            [meuse.api.crate :as mac]))
 
 (def skip-auth
   "Skip token auth for these calls."
@@ -8,12 +9,12 @@
 (def crates-routes
   {#"/new/?" {:put ::new}
    #"/?" {:get ::search}
-   ["/" :crate-name #"/owners/?"] {:put ::add-owner}
-   ["/" :crate-name #"/owners/?"] {:delete ::remove-owner}
-   ["/" :crate-name #"/owners/?"] {:get ::list-owners}
-   ["/" :crate-name "/" :crate-version "/yank"] {:delete ::yank}
-   ["/" :crate-name "/" :crate-version "/unyank"] {:put ::unyank}
-   ["/" :crate-name "/" :crate-version "/download"] {:get ::download}
+   ["/" mac/crate-name-path #"/owners/?"] {:put ::add-owner}
+   ["/" mac/crate-name-path #"/owners/?"] {:delete ::remove-owner}
+   ["/" mac/crate-name-path #"/owners/?"] {:get ::list-owners}
+   ["/" mac/crate-name-path "/" mac/crate-version-path "/yank"] {:delete ::yank}
+   ["/" mac/crate-name-path "/" mac/crate-version-path "/unyank"] {:put ::unyank}
+   ["/" mac/crate-name-path "/" mac/crate-version-path "/download"] {:get ::download}
    #"/andouillette" ::andouillette})
 
 (defmulti crates-api!

src/meuse/api/meuse/http.clj

@@ -1,5 +1,6 @@
 (ns meuse.api.meuse.http
-  (:require [meuse.api.default :as default]))
+  (:require [meuse.api.crate :as mac]
+            [meuse.api.default :as default]))
 
 (def skip-auth
   "Skip token auth for these calls."
@@ -17,7 +18,7 @@
    #"/token/?" {:get ::list-tokens}
    [#"/token/?"] {:delete ::delete-token}
    #"/crate/?" {:get ::list-crates}
-   [#"/crate/?" :name] {:get ::get-crate}
+   [#"/crate/?" [mac/crate-regex :name]] {:get ::get-crate}
    #"/check/?" {:get ::check-crates}
    #"/statistics/?" {:get ::statistics}})
 

src/meuse/api/mirror/http.clj

@@ -1,13 +1,14 @@
 (ns meuse.api.mirror.http
-  (:require [meuse.api.default :as default]))
+  (:require [meuse.api.crate :as mac]
+            [meuse.api.default :as default]))
 
 (def skip-auth
   "Skip token auth for these calls."
   #{:download})
 
 (def mirror-routes
-  {["/" :crate-name "/" :crate-version "/download"] {:get ::download}
-   ["/" :crate-name "/" :crate-version "/cache"] {:post ::cache}})
+  {["/" mac/crate-name-path "/" mac/crate-version-path "/download"] {:get ::download}
+   ["/" mac/crate-name-path "/" mac/crate-version-path "/cache"] {:post ::cache}})
 
 (defmulti mirror-api!
   "Handle crates.io api calls"

test/meuse/api/crate_test.clj

@@ -0,0 +1,21 @@
+(ns meuse.api.crate-test
+  (:require [clojure.test :refer :all]
+            [meuse.api.crate :as mac]))
+
+(deftest crate-regex-test
+  (are [v] (re-matches mac/crate-regex v)
+    "foo"
+    "foo-bar"
+    "foo_bar"
+    "foo-1.1.2"
+    "1.1.2"
+    "1.1.2-alpha"
+    "1.1.2_alpha"
+    "1.1.2+3.4.5"
+    "1.1.2~foo"
+    "1.1.2~_-+134.1")
+  (are [v] (not (re-matches mac/crate-regex v))
+    "foo bar"
+    "foo%bar"
+    "foo/bar"
+    "foo\\bar"))