From 70b6f5ad86bb65778a76d3264d92e0724b19189d Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 10 Jul 2024 21:38:32 +0200 Subject: [PATCH 1/3] impl Signed-off-by: Jan Kowalleck --- src/_helpers/uri.ts | 20 +++++++++---------- tests/_data/models.js | 10 +++++----- .../json_sortedLists_spec1.2.json | 10 +++++----- .../json_sortedLists_spec1.3.json | 10 +++++----- .../json_sortedLists_spec1.4.json | 10 +++++----- .../json_sortedLists_spec1.5.json | 10 +++++----- .../json_sortedLists_spec1.6.json | 10 +++++----- .../xml_sortedLists_spec1.2.json | 10 +++++----- .../xml_sortedLists_spec1.3.json | 10 +++++----- .../xml_sortedLists_spec1.4.json | 10 +++++----- .../xml_sortedLists_spec1.5.json | 10 +++++----- .../xml_sortedLists_spec1.6.json | 10 +++++----- .../json_complex_spec1.2.json.bin | 10 +++++----- .../json_complex_spec1.3.json.bin | 10 +++++----- .../json_complex_spec1.4.json.bin | 10 +++++----- .../json_complex_spec1.5.json.bin | 10 +++++----- .../json_complex_spec1.6.json.bin | 10 +++++----- 17 files changed, 90 insertions(+), 90 deletions(-) diff --git a/src/_helpers/uri.ts b/src/_helpers/uri.ts index dad9b71ed..5b5c56ad0 100644 --- a/src/_helpers/uri.ts +++ b/src/_helpers/uri.ts @@ -17,15 +17,15 @@ SPDX-License-Identifier: Apache-2.0 Copyright (c) OWASP Foundation. All Rights Reserved. */ -const escapeMap: Readonly> = Object.freeze({ - ' ': '%20', - '[': '%5B', - ']': '%5D', - '<': '%3C', - '>': '%3E', - '{': '%7B', - '}': '%7D' -}) +const _ESCAPES: Array<[RegExp, string]> = [ + [/ /g, '%20'], + [/\[/g, '%5B'], + [/]/g, '%5D'], + [//g, '%3E'], + [/\{/g, '%7B'], + [/}/g, '%7D'] +] /** * Make a string valid to @@ -43,7 +43,7 @@ export function escapeUri (value: T): T { if (value === undefined) { return value } - for (const [s, r] of Object.entries(escapeMap)) { + for (const [s, r] of _ESCAPES) { /* @ts-expect-error -- TS does not properly detect that value is to be forced as string, here */ value = value.replace(s, r) } diff --git a/tests/_data/models.js b/tests/_data/models.js index a6eea8bc0..d19322e72 100644 --- a/tests/_data/models.js +++ b/tests/_data/models.js @@ -283,12 +283,12 @@ module.exports.createComplexStructure = function () { ['encode anyUri: https', 'https://example.org/p?k=v#f'], ['encode anyUri: mailto', 'mailto:info@example.org'], ['encode anyUri: relative path', '../foo/bar'], - ['encode anyUri: space', 'https://example.org/foo bar'], - ['encode anyUri: []', 'https://example.org/?bar[test]=baz'], - ['encode anyUri: <>', 'https://example.org/#'], - ['encode anyUri: {}', 'https://example.org/#{test}'], + ['encode anyUri: space', 'https://example.org/foo bar bazz%20again+again'], + ['encode anyUri: []', 'https://example.org/?bar[test]=baz[again]'], + ['encode anyUri: <>', 'https://example.org/#'], + ['encode anyUri: {}', 'https://example.org/#{test}{again}'], ['encode anyUri: non-ASCII', 'https://example.org/édition'], - ['encode anyUri: partially encoded', 'https://example.org/?bar[test%5D=baz'] + ['encode anyUri: partially encoded', 'https://example.org/?bar[test%5D=baz%5bagain]'] ].map( ([desc, uri]) => new Models.ExternalReference( uri, Enums.ExternalReferenceType.Other, { diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.2.json b/tests/_data/normalizeResults/json_sortedLists_spec1.2.json index 6f135fc33..56065b436 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.2.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.2.json @@ -136,22 +136,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -161,7 +161,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.3.json b/tests/_data/normalizeResults/json_sortedLists_spec1.3.json index 76a67449c..8c6948459 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.3.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.3.json @@ -158,22 +158,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -183,7 +183,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.4.json b/tests/_data/normalizeResults/json_sortedLists_spec1.4.json index 96ab686c5..b0cec3698 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.4.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.4.json @@ -160,22 +160,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -185,7 +185,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.5.json b/tests/_data/normalizeResults/json_sortedLists_spec1.5.json index c91b9a4c3..8f58fd8d6 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.5.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.5.json @@ -169,22 +169,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.6.json b/tests/_data/normalizeResults/json_sortedLists_spec1.6.json index 26e9ddea0..c266c981b 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.6.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.6.json @@ -169,22 +169,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json index ef52294c5..ab2da4c4d 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json @@ -423,7 +423,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz[again]" }, { "type": "element", @@ -442,7 +442,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D" }, { "type": "element", @@ -461,7 +461,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D" + "children": "https://example.org/#%7Btest%7D{again}" }, { "type": "element", @@ -480,7 +480,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E" }, { "type": "element", @@ -518,7 +518,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar" + "children": "https://example.org/foo%20bar bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json index 69ac54ec4..93473768d 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json @@ -475,7 +475,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz[again]" }, { "type": "element", @@ -494,7 +494,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D" }, { "type": "element", @@ -513,7 +513,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D" + "children": "https://example.org/#%7Btest%7D{again}" }, { "type": "element", @@ -532,7 +532,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E" }, { "type": "element", @@ -570,7 +570,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar" + "children": "https://example.org/foo%20bar bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json index 8259985e4..881b881b9 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json @@ -475,7 +475,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz[again]" }, { "type": "element", @@ -494,7 +494,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D" }, { "type": "element", @@ -513,7 +513,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D" + "children": "https://example.org/#%7Btest%7D{again}" }, { "type": "element", @@ -532,7 +532,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E" }, { "type": "element", @@ -570,7 +570,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar" + "children": "https://example.org/foo%20bar bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json index 76010f13a..f266147f9 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json @@ -508,7 +508,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz[again]" }, { "type": "element", @@ -527,7 +527,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D" }, { "type": "element", @@ -546,7 +546,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D" + "children": "https://example.org/#%7Btest%7D{again}" }, { "type": "element", @@ -565,7 +565,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E" }, { "type": "element", @@ -603,7 +603,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar" + "children": "https://example.org/foo%20bar bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json index d88184122..0aa6df1bb 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json @@ -508,7 +508,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz[again]" }, { "type": "element", @@ -527,7 +527,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz" + "children": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D" }, { "type": "element", @@ -546,7 +546,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D" + "children": "https://example.org/#%7Btest%7D{again}" }, { "type": "element", @@ -565,7 +565,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E" }, { "type": "element", @@ -603,7 +603,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar" + "children": "https://example.org/foo%20bar bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/serializeResults/json_complex_spec1.2.json.bin b/tests/_data/serializeResults/json_complex_spec1.2.json.bin index 2eb5b6756..9eefdcc35 100644 --- a/tests/_data/serializeResults/json_complex_spec1.2.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.2.json.bin @@ -136,22 +136,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -161,7 +161,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.3.json.bin b/tests/_data/serializeResults/json_complex_spec1.3.json.bin index 36ba3a051..b284c6356 100644 --- a/tests/_data/serializeResults/json_complex_spec1.3.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.3.json.bin @@ -158,22 +158,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -183,7 +183,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.4.json.bin b/tests/_data/serializeResults/json_complex_spec1.4.json.bin index e954c0f1a..a3c6f592e 100644 --- a/tests/_data/serializeResults/json_complex_spec1.4.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.4.json.bin @@ -160,22 +160,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -185,7 +185,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.5.json.bin b/tests/_data/serializeResults/json_complex_spec1.5.json.bin index 2a8c59931..3273d030e 100644 --- a/tests/_data/serializeResults/json_complex_spec1.5.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.5.json.bin @@ -169,22 +169,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.6.json.bin b/tests/_data/serializeResults/json_complex_spec1.6.json.bin index 7c36426cd..d64df0871 100644 --- a/tests/_data/serializeResults/json_complex_spec1.6.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.6.json.bin @@ -169,22 +169,22 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz[again]", "type": "other", "comment": "encode anyUri: []" }, { - "url": "https://example.org/?bar%5Btest%5D=baz", + "url": "https://example.org/?bar%5Btest%5D=baz%5bagain%5D", "type": "other", "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D", + "url": "https://example.org/#%7Btest%7D{again}", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar", + "url": "https://example.org/foo%20bar bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, From 24c1e30ced63ba985b5a908651c998981d658ac7 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 10 Jul 2024 21:38:59 +0200 Subject: [PATCH 2/3] tests Signed-off-by: Jan Kowalleck --- .../normalizeResults/json_sortedLists_spec1.2.json | 8 ++++---- .../normalizeResults/json_sortedLists_spec1.3.json | 8 ++++---- .../normalizeResults/json_sortedLists_spec1.4.json | 8 ++++---- .../normalizeResults/json_sortedLists_spec1.5.json | 8 ++++---- .../normalizeResults/json_sortedLists_spec1.6.json | 8 ++++---- .../normalizeResults/xml_sortedLists_spec1.2.json | 8 ++++---- .../normalizeResults/xml_sortedLists_spec1.3.json | 8 ++++---- .../normalizeResults/xml_sortedLists_spec1.4.json | 8 ++++---- .../normalizeResults/xml_sortedLists_spec1.5.json | 8 ++++---- .../normalizeResults/xml_sortedLists_spec1.6.json | 8 ++++---- .../serializeResults/json_complex_spec1.2.json.bin | 8 ++++---- .../serializeResults/json_complex_spec1.3.json.bin | 8 ++++---- .../serializeResults/json_complex_spec1.4.json.bin | 8 ++++---- .../serializeResults/json_complex_spec1.5.json.bin | 8 ++++---- .../serializeResults/json_complex_spec1.6.json.bin | 8 ++++---- .../_data/serializeResults/xml_complex_spec1.2.xml.bin | 10 +++++----- .../_data/serializeResults/xml_complex_spec1.3.xml.bin | 10 +++++----- .../_data/serializeResults/xml_complex_spec1.4.xml.bin | 10 +++++----- .../_data/serializeResults/xml_complex_spec1.5.xml.bin | 10 +++++----- .../_data/serializeResults/xml_complex_spec1.6.xml.bin | 10 +++++----- 20 files changed, 85 insertions(+), 85 deletions(-) diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.2.json b/tests/_data/normalizeResults/json_sortedLists_spec1.2.json index 56065b436..6a44367a2 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.2.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.2.json @@ -136,7 +136,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -146,12 +146,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -161,7 +161,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.3.json b/tests/_data/normalizeResults/json_sortedLists_spec1.3.json index 8c6948459..388254ee9 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.3.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.3.json @@ -158,7 +158,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -168,12 +168,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -183,7 +183,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.4.json b/tests/_data/normalizeResults/json_sortedLists_spec1.4.json index b0cec3698..354fa4cdb 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.4.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.4.json @@ -160,7 +160,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -170,12 +170,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -185,7 +185,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.5.json b/tests/_data/normalizeResults/json_sortedLists_spec1.5.json index 8f58fd8d6..37d4d26fc 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.5.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.5.json @@ -169,7 +169,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -179,12 +179,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/json_sortedLists_spec1.6.json b/tests/_data/normalizeResults/json_sortedLists_spec1.6.json index c266c981b..2fdeb6c25 100644 --- a/tests/_data/normalizeResults/json_sortedLists_spec1.6.json +++ b/tests/_data/normalizeResults/json_sortedLists_spec1.6.json @@ -169,7 +169,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -179,12 +179,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json index ab2da4c4d..58c6dbbe1 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.2.json @@ -423,7 +423,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz[again]" + "children": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D" }, { "type": "element", @@ -461,7 +461,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D{again}" + "children": "https://example.org/#%7Btest%7D%7Bagain%7D" }, { "type": "element", @@ -480,7 +480,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E%3Cagain%3E" }, { "type": "element", @@ -518,7 +518,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar bazz%20again+again" + "children": "https://example.org/foo%20bar%20bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json index 93473768d..1f66df784 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.3.json @@ -475,7 +475,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz[again]" + "children": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D" }, { "type": "element", @@ -513,7 +513,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D{again}" + "children": "https://example.org/#%7Btest%7D%7Bagain%7D" }, { "type": "element", @@ -532,7 +532,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E%3Cagain%3E" }, { "type": "element", @@ -570,7 +570,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar bazz%20again+again" + "children": "https://example.org/foo%20bar%20bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json index 881b881b9..2663329e8 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.4.json @@ -475,7 +475,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz[again]" + "children": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D" }, { "type": "element", @@ -513,7 +513,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D{again}" + "children": "https://example.org/#%7Btest%7D%7Bagain%7D" }, { "type": "element", @@ -532,7 +532,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E%3Cagain%3E" }, { "type": "element", @@ -570,7 +570,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar bazz%20again+again" + "children": "https://example.org/foo%20bar%20bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json index f266147f9..cf9460c42 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.5.json @@ -508,7 +508,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz[again]" + "children": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D" }, { "type": "element", @@ -546,7 +546,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D{again}" + "children": "https://example.org/#%7Btest%7D%7Bagain%7D" }, { "type": "element", @@ -565,7 +565,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E%3Cagain%3E" }, { "type": "element", @@ -603,7 +603,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar bazz%20again+again" + "children": "https://example.org/foo%20bar%20bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json b/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json index 0aa6df1bb..8089e5fb4 100644 --- a/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json +++ b/tests/_data/normalizeResults/xml_sortedLists_spec1.6.json @@ -508,7 +508,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/?bar%5Btest%5D=baz[again]" + "children": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D" }, { "type": "element", @@ -546,7 +546,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%7Btest%7D{again}" + "children": "https://example.org/#%7Btest%7D%7Bagain%7D" }, { "type": "element", @@ -565,7 +565,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/#%3Ctest%3E" + "children": "https://example.org/#%3Ctest%3E%3Cagain%3E" }, { "type": "element", @@ -603,7 +603,7 @@ { "type": "element", "name": "url", - "children": "https://example.org/foo%20bar bazz%20again+again" + "children": "https://example.org/foo%20bar%20bazz%20again+again" }, { "type": "element", diff --git a/tests/_data/serializeResults/json_complex_spec1.2.json.bin b/tests/_data/serializeResults/json_complex_spec1.2.json.bin index 9eefdcc35..d6894cecf 100644 --- a/tests/_data/serializeResults/json_complex_spec1.2.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.2.json.bin @@ -136,7 +136,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -146,12 +146,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -161,7 +161,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.3.json.bin b/tests/_data/serializeResults/json_complex_spec1.3.json.bin index b284c6356..0e4c9e547 100644 --- a/tests/_data/serializeResults/json_complex_spec1.3.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.3.json.bin @@ -158,7 +158,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -168,12 +168,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -183,7 +183,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.4.json.bin b/tests/_data/serializeResults/json_complex_spec1.4.json.bin index a3c6f592e..39212b41a 100644 --- a/tests/_data/serializeResults/json_complex_spec1.4.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.4.json.bin @@ -160,7 +160,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -170,12 +170,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -185,7 +185,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.5.json.bin b/tests/_data/serializeResults/json_complex_spec1.5.json.bin index 3273d030e..261d45245 100644 --- a/tests/_data/serializeResults/json_complex_spec1.5.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.5.json.bin @@ -169,7 +169,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -179,12 +179,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/json_complex_spec1.6.json.bin b/tests/_data/serializeResults/json_complex_spec1.6.json.bin index d64df0871..79983803b 100644 --- a/tests/_data/serializeResults/json_complex_spec1.6.json.bin +++ b/tests/_data/serializeResults/json_complex_spec1.6.json.bin @@ -169,7 +169,7 @@ "comment": "encode anyUri: relative path" }, { - "url": "https://example.org/?bar%5Btest%5D=baz[again]", + "url": "https://example.org/?bar%5Btest%5D=baz%5Bagain%5D", "type": "other", "comment": "encode anyUri: []" }, @@ -179,12 +179,12 @@ "comment": "encode anyUri: partially encoded" }, { - "url": "https://example.org/#%7Btest%7D{again}", + "url": "https://example.org/#%7Btest%7D%7Bagain%7D", "type": "other", "comment": "encode anyUri: {}" }, { - "url": "https://example.org/#%3Ctest%3E", + "url": "https://example.org/#%3Ctest%3E%3Cagain%3E", "type": "other", "comment": "encode anyUri: <>" }, @@ -194,7 +194,7 @@ "comment": "encode anyUri: non-ASCII" }, { - "url": "https://example.org/foo%20bar bazz%20again+again", + "url": "https://example.org/foo%20bar%20bazz%20again+again", "type": "other", "comment": "encode anyUri: space" }, diff --git a/tests/_data/serializeResults/xml_complex_spec1.2.xml.bin b/tests/_data/serializeResults/xml_complex_spec1.2.xml.bin index cc297d95f..1a9258333 100644 --- a/tests/_data/serializeResults/xml_complex_spec1.2.xml.bin +++ b/tests/_data/serializeResults/xml_complex_spec1.2.xml.bin @@ -95,19 +95,19 @@ encode anyUri: relative path - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5Bagain%5D encode anyUri: [] - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5bagain%5D encode anyUri: partially encoded - https://example.org/#%7Btest%7D + https://example.org/#%7Btest%7D%7Bagain%7D encode anyUri: {} - https://example.org/#%3Ctest%3E + https://example.org/#%3Ctest%3E%3Cagain%3E encode anyUri: <> @@ -115,7 +115,7 @@ encode anyUri: non-ASCII - https://example.org/foo%20bar + https://example.org/foo%20bar%20bazz%20again+again encode anyUri: space diff --git a/tests/_data/serializeResults/xml_complex_spec1.3.xml.bin b/tests/_data/serializeResults/xml_complex_spec1.3.xml.bin index 97f97b5be..bf3f198aa 100644 --- a/tests/_data/serializeResults/xml_complex_spec1.3.xml.bin +++ b/tests/_data/serializeResults/xml_complex_spec1.3.xml.bin @@ -107,19 +107,19 @@ encode anyUri: relative path - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5Bagain%5D encode anyUri: [] - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5bagain%5D encode anyUri: partially encoded - https://example.org/#%7Btest%7D + https://example.org/#%7Btest%7D%7Bagain%7D encode anyUri: {} - https://example.org/#%3Ctest%3E + https://example.org/#%3Ctest%3E%3Cagain%3E encode anyUri: <> @@ -127,7 +127,7 @@ encode anyUri: non-ASCII - https://example.org/foo%20bar + https://example.org/foo%20bar%20bazz%20again+again encode anyUri: space diff --git a/tests/_data/serializeResults/xml_complex_spec1.4.xml.bin b/tests/_data/serializeResults/xml_complex_spec1.4.xml.bin index 3dffebaaa..a6a1371a5 100644 --- a/tests/_data/serializeResults/xml_complex_spec1.4.xml.bin +++ b/tests/_data/serializeResults/xml_complex_spec1.4.xml.bin @@ -108,19 +108,19 @@ encode anyUri: relative path - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5Bagain%5D encode anyUri: [] - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5bagain%5D encode anyUri: partially encoded - https://example.org/#%7Btest%7D + https://example.org/#%7Btest%7D%7Bagain%7D encode anyUri: {} - https://example.org/#%3Ctest%3E + https://example.org/#%3Ctest%3E%3Cagain%3E encode anyUri: <> @@ -128,7 +128,7 @@ encode anyUri: non-ASCII - https://example.org/foo%20bar + https://example.org/foo%20bar%20bazz%20again+again encode anyUri: space diff --git a/tests/_data/serializeResults/xml_complex_spec1.5.xml.bin b/tests/_data/serializeResults/xml_complex_spec1.5.xml.bin index e4b400960..775294f46 100644 --- a/tests/_data/serializeResults/xml_complex_spec1.5.xml.bin +++ b/tests/_data/serializeResults/xml_complex_spec1.5.xml.bin @@ -117,19 +117,19 @@ encode anyUri: relative path - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5Bagain%5D encode anyUri: [] - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5bagain%5D encode anyUri: partially encoded - https://example.org/#%7Btest%7D + https://example.org/#%7Btest%7D%7Bagain%7D encode anyUri: {} - https://example.org/#%3Ctest%3E + https://example.org/#%3Ctest%3E%3Cagain%3E encode anyUri: <> @@ -137,7 +137,7 @@ encode anyUri: non-ASCII - https://example.org/foo%20bar + https://example.org/foo%20bar%20bazz%20again+again encode anyUri: space diff --git a/tests/_data/serializeResults/xml_complex_spec1.6.xml.bin b/tests/_data/serializeResults/xml_complex_spec1.6.xml.bin index 925ac893f..28a42fde8 100644 --- a/tests/_data/serializeResults/xml_complex_spec1.6.xml.bin +++ b/tests/_data/serializeResults/xml_complex_spec1.6.xml.bin @@ -117,19 +117,19 @@ encode anyUri: relative path - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5Bagain%5D encode anyUri: [] - https://example.org/?bar%5Btest%5D=baz + https://example.org/?bar%5Btest%5D=baz%5bagain%5D encode anyUri: partially encoded - https://example.org/#%7Btest%7D + https://example.org/#%7Btest%7D%7Bagain%7D encode anyUri: {} - https://example.org/#%3Ctest%3E + https://example.org/#%3Ctest%3E%3Cagain%3E encode anyUri: <> @@ -137,7 +137,7 @@ encode anyUri: non-ASCII - https://example.org/foo%20bar + https://example.org/foo%20bar%20bazz%20again+again encode anyUri: space From cf8a42183733374ea3c3d5eda0d50a02c1e91cce Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 10 Jul 2024 21:40:32 +0200 Subject: [PATCH 3/3] docs Signed-off-by: Jan Kowalleck --- HISTORY.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 67aee6c78..cf32f536a 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file. +* Fixed + * Imported URL sanitizer (via [#1121]) + +[#1121]: https://github.com/CycloneDX/cyclonedx-javascript-library/pull/1121 + ## 6.10.1 -- 2024-07-03 * Fixed