luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-17 08:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #279 from metosin/path-param-concurrency

Browse source 
FIX: path-parameters concurrency
This commit is contained in:
Tommi Reiman 2019-05-22 21:25:09 +03:00 committed by GitHub
commit 1edc987d9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/reitit-core/java-src/reitit/Trie.java
View file

@ -38,8 +38,8 @@ public class Trie {
return decode(new String(chars, begin, end - begin), hasPercent, hasPlus);
}
public static class Match {
public IPersistentMap params;
public final static class Match {
public final IPersistentMap params;
public final Object data;
public Match(IPersistentMap params, Object data) {
@ -47,6 +47,10 @@ public class Trie {
this.data = data;
}
Match assoc(Object key, Object value) {
return new Match(params.assoc(key, value), data);
}
@Override
public String toString() {
Map<Object, Object> m = new HashMap<>();
@ -174,10 +178,7 @@ public class Trie {
}
}
final Match m = child.match(stop, max, path);
if (m != null) {
m.params = m.params.assoc(key, decode(new String(path, i, stop - i), hasPercent, hasPlus));
}
return m;
return m != null ? m.assoc(key, decode(new String(path, i, stop - i), hasPercent, hasPlus)) : null;
}
return null;
}
@ -216,7 +217,7 @@ public class Trie {
@Override
public Match match(int i, int max, char[] path) {
if (i <= max) {
return new Match(params.assoc(parameter, decode(path, i, max)), data);
return new Match(params, data).assoc(parameter, decode(path, i, max));
}
return null;
}

19
test/cljc/reitit/ring_test.cljc
View file

@ -3,7 +3,8 @@
[clojure.set :as set]
[reitit.middleware :as middleware]
[reitit.ring :as ring]
[reitit.core :as r])
[reitit.core :as r]
[reitit.trie :as trie])
#?(:clj
(:import (clojure.lang ExceptionInfo))))
@ -577,3 +578,19 @@
(fn [{:keys [::r/router]} _ _]
(is router)))
{} ::respond ::raise)))
#?(:clj
(deftest invalid-path-parameters-parsing-concurrent-requests-277-test
(testing "in enough concurrent system, path-parameters can bleed"
(doseq [compiler [trie/java-trie-compiler trie/clojure-trie-compiler]]
(let [app (ring/ring-handler
(ring/router
["/:id" (fn [request]
{:status 200
:body (-> request :path-params :id)})])
{::trie/trie-compiler compiler})]
(dotimes [_ 10]
(future
(dotimes [n 100000]
(let [body (:body (app {:request-method :get, :uri (str "/" n)}))]
(is (= body (str n))))))))))))