Merge remote-tracking branch 'origin/handle-invalid-params'

Merges #95
skroutz · Feb 23, 2023 · d0e9eb7 · d0e9eb7
2 parents c2237ea + a296334
commit d0e9eb7
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/spec/url_helper_spec.coffee b/spec/url_helper_spec.coffee
@@ -163,6 +163,44 @@ describe 'URLHelper', ->
 
       expect(@subject.getParamsFromUrl(url)).to.deep.equal(params)
 
+    context 'when contains a malformed param without a key', ->
+      it 'returns the proper JSON object', ->
+        url = "http://foo.bar?foo=bar&=xxxx&baz=qux"
+        params = { '': 'xxxx', foo: 'bar', baz: 'qux' }
+
+        expect(@subject.getParamsFromUrl(url)).to.deep.equal(params)
+
+      it 'returns the proper JSON object', ->
+        url = "http://foo.bar?=bar&=xxxx&foo=bar"
+        params = { '': 'xxxx', foo: 'bar' }
+
+        expect(@subject.getParamsFromUrl(url)).to.deep.equal(params)
+
+      it 'returns the proper JSON object', ->
+        url = "http://foo.bar?foo=bar&=xxxx&=zzzz"
+        params = { '': 'zzzz', foo: 'bar' }
+
+        expect(@subject.getParamsFromUrl(url)).to.deep.equal(params)
+
+    context 'when contains a malformed param without a value', ->
+      it 'returns the proper JSON object', ->
+        url = "http://foo.bar?foo=bar&xxxx=&baz=qux"
+        params = { xxxx: '', foo: 'bar', baz: 'qux' }
+
+        expect(@subject.getParamsFromUrl(url)).to.deep.equal(params)
+
+      it 'returns the proper JSON object', ->
+        url = "http://foo.bar?xxxx=&zzzz=&foo=bar"
+        params = { xxxx: '', zzzz: '', foo: 'bar' }
+
+        expect(@subject.getParamsFromUrl(url)).to.deep.equal(params)
+
+      it 'returns the proper JSON object', ->
+        url = "http://foo.bar?foo=bar&xxxx=&zzzz="
+        params = { xxxx: '', zzzz: '', foo: 'bar' }
+
+        expect(@subject.getParamsFromUrl(url)).to.deep.equal(params)
+
     context 'when contains an escaped param name', ->
       it 'replaces the given param', ->
         url = "http://foo.bar?#{encodeURIComponent('ελλη=νικά')}=xxxx&foo=bar"

diff --git a/src/helpers/url_helper.coffee b/src/helpers/url_helper.coffee
@@ -34,7 +34,7 @@ define ['settings'], (Settings)->
     # https://stackoverflow.com/a/1099670/4375736
     getParamsFromUrl: (url = Settings.url.current) ->
       url = url.split('#')[0] # drop hash from url, if exists
-      regex  = /[?&;](.+?)=([^&;]+)/g
+      regex  = /[?&;](.*?)=([^&;]*)/g
       params = {}
 
       while match = regex.exec(url)