@@ -22,10 +22,11 @@ [param-string separator] (reduce (fn [param-map s] - (let [[key val] (re-split #"=" s)] + (if-let [[_ key val] (re-matches #"([^=]+)=(.*)" s)] (assoc-vec param-map (keyword (urldecode key)) - (urldecode (or val ""))))) + (urldecode (or val ""))) + param-map)) {} (remove blank? (re-split separator param-string)))) src/compojure/http/request.clj @@ -16,6 +16,13 @@ (is (= (parse-query-params {:query-string "a=1%202"}) {:a "1 2"}))) +(deftest query-params-invalid + (are (= (parse-query-params {:query-string _1}) _2) + "" {} + "=" {} + "=1" {} + "a=1&=" {:a "1"})) + (deftest urlencoded-charset (is (urlencoded-form? {:content-type "application/x-www-form-urlencoded; charset=UTF8"}))) test/compojure/http/request.clj bffc3921bce52d76e1c0e7c93653e0abceef7bb5 weavejester jreeves@weavejester.com http://github.com/abedra/compojure/commit/e365932c8f799f03b1318bf19845559df9648174 e365932c8f799f03b1318bf19845559df9648174 2009-09-29T17:53:38-07:00 2009-09-29T17:53:25-07:00 Updated param parsing to cope with bad input. Fixes #16. 6a0284bdfa2ba1bdc316d93ad65e35fa0f925fec weavejester jreeves@weavejester.com