Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/core/operations/ParseURI.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ParseURI extends Operation {
* @returns {string}
*/
run(input, args) {
const uri = url.parse(input, true);
const uri = url.parse(input, false);

let output = "";

Expand All @@ -43,18 +43,31 @@ class ParseURI extends Operation {
if (uri.port) output += "Port:\t\t" + uri.port + "\n";
if (uri.pathname) output += "Path name:\t" + uri.pathname + "\n";
if (uri.query) {
const keys = Object.keys(uri.query);
const queryObj = Object.create(null);
for (const [key, value] of new URLSearchParams(uri.query)) {
if (Object.prototype.hasOwnProperty.call(queryObj, key)) {
if (Array.isArray(queryObj[key])) {
queryObj[key].push(value);
} else {
queryObj[key] = [queryObj[key], value];
}
} else {
queryObj[key] = value;
}
}

const keys = Object.keys(queryObj);
let padding = 0;

keys.forEach(k => {
padding = (k.length > padding) ? k.length : padding;
});

output += "Arguments:\n";
for (const key in uri.query) {
for (const key in queryObj) {
output += "\t" + key.padEnd(padding, " ");
if (uri.query[key].length) {
output += " = " + uri.query[key] + "\n";
if (queryObj[key].length) {
output += " = " + queryObj[key] + "\n";
} else {
output += "\n";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/browser/02_ops.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ module.exports = {
// testOp(browser, "Parse TLV", "test input", "test_output");
testOpHtml(browser, "Parse UDP", "04 89 00 35 00 2c 01 01", "tr:last-child td:last-child", "0x0101");
// testOp(browser, "Parse UNIX file permissions", "test input", "test_output");
// testOp(browser, "Parse URI", "test input", "test_output");
testOp(browser, "Parse URI", "https://example.com/?constructor=ok&__proto__=hello", /Arguments:\s+constructor = ok\s+__proto__\s+= hello/);
testOp(browser, "Parse User Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 ", /Architecture: amd64/);
// testOp(browser, "Parse X.509 certificate", "test input", "test_output");
testOpFile(browser, "Play Media", "files/mp3example.mp3", "audio", "");
Expand Down
12 changes: 12 additions & 0 deletions tests/node/tests/operations.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,18 @@ Arguments:
assert.strictEqual(result.toString(), expected);
}),

it("Parse URI with constructor and __proto__ arguments", () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test won't verify this fix correctly - this test runs within the node environment which utilises the Node built-in url module, rather than the npmjs url module. The bug is only present in the npmjs module. Could you add a browser test?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@C85297 I have successfully update PR accordingly now check at once ?

const result = chef.parseURI("https://example.com/?constructor=ok&__proto__=hello");
const expected = `Protocol: https:
Hostname: example.com
Path name: /
Arguments:
\tconstructor = ok
\t__proto__ = hello
`;
assert.strictEqual(result.toString(), expected);
}),

it("Parse user agent", () => {
const result = chef.parseUserAgent("Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 ");
const expected = `Browser
Expand Down