Skip to content

Commit

Permalink
Catch malformed URI Components
Browse files Browse the repository at this point in the history
Fix for error thrown when a value contains non-valid / malformed URI Component
Example: test=%c5%a1%e8ZM%80%82H
will throw "URI malformed"
This update will leave the value as-is when an error is thrown
  • Loading branch information
jdiderik authored and StephanHoyer committed Feb 20, 2022
1 parent 1eec62e commit fae15d3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 10 additions & 2 deletions querystring/parse.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
"use strict"

function decodeURIComponentSave(str) {
try {
return decodeURIComponent(str)
} catch(err) {
return str
}
}

module.exports = function(string) {
if (string === "" || string == null) return {}
if (string.charAt(0) === "?") string = string.slice(1)

var entries = string.split("&"), counters = {}, data = {}
for (var i = 0; i < entries.length; i++) {
var entry = entries[i].split("=")
var key = decodeURIComponent(entry[0])
var value = entry.length === 2 ? decodeURIComponent(entry[1]) : ""
var key = decodeURIComponentSave(entry[0])
var value = entry.length === 2 ? decodeURIComponentSave(entry[1]) : ""

if (value === "true") value = true
else if (value === "false") value = false
Expand Down
4 changes: 4 additions & 0 deletions querystring/tests/test-parseQueryString.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ o.spec("parseQueryString", function() {
var data = parseQueryString("?%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23=%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23")
o(data).deepEquals({";:@&=+$,/?%#": ";:@&=+$,/?%#"})
})
o("handles wrongly escaped values", function() {
var data = parseQueryString("?test=%c5%a1%e8ZM%80%82H")
o(data).deepEquals({test: "%c5%a1%e8ZM%80%82H"})
})
o("handles escaped slashes followed by a number", function () {
var data = parseQueryString("?hello=%2Fen%2F1")
o(data.hello).equals("/en/1")
Expand Down

0 comments on commit fae15d3

Please sign in to comment.