Allow any string for parameter names in router, fixes #871.

JuliaWeb · Jul 4, 2022 · 271373c · 271373c
1 parent 9fc906c
commit 271373c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Handlers.jl b/src/Handlers.jl
@@ -145,15 +145,15 @@ mutable struct Variable
     pattern::Union{Nothing, Regex}
 end
 
-const VARREGEX = r"^{([[:alnum:]]+):?(.*)}$"
+const VARREGEX = r"^{([^:{}]+)(?::(.*))?}$"
 
 function Variable(pattern)
     re = Base.match(VARREGEX, pattern)
     if re === nothing
         error("problem parsing path variable for route: `$pattern`")
     end
     pat = re.captures[2]
-    return Variable(re.captures[1], pat == "" ? nothing : Regex(pat))
+    return Variable(re.captures[1], pat === nothing ? nothing : Regex(pat))
 end
 
 struct Leaf
@@ -178,7 +178,7 @@ end
 Base.show(io::IO, x::Node) = print(io, "Node($(x.segment))")
 
 isvariable(x) = startswith(x, "{") && endswith(x, "}")
-segment(x) = segment == "*" ? String(segment) : isvariable(x) ? Variable(x) : String(x)
+segment(x) = isvariable(x) ? Variable(x) : String(x)
 
 Node(x) = Node(x, Node[], Node[], nothing, nothing, Leaf[])
 Node() = Node("*")

diff --git a/test/handlers.jl b/test/handlers.jl
@@ -32,6 +32,9 @@ using HTTP, Test
     @test r(HTTP.Request("GET", "/test/sarv/ghotra/seven")) == 10
     @test r(HTTP.Request("GET", "/test/foo")) == 8
 
+    HTTP.register!(r, "/api/issue/{issue_id}", req -> req.context[:params]["issue_id"])
+    @test r(HTTP.Request("GET", "/api/issue/871")) == "871"
+
     HTTP.register!(r, "/api/widgets/{id}", req -> req.context[:params]["id"])
     @test r(HTTP.Request("GET", "/api/widgets/11")) == "11"