Page MenuHomeSoftware Heritage
Files F7123469

D8955.diff
No OneTemporary
Actions

D8955.diff
View Options

diff --git a/swh/web/utils/identifiers.py b/swh/web/utils/identifiers.py
--- a/swh/web/utils/identifiers.py
+++ b/swh/web/utils/identifiers.py
@@ -361,7 +361,8 @@
object_type, object_id, metadata=swhid_context
)
swhid_with_context_url = reverse(
- "browse-swhid", url_args={"swhid": swhid_with_context}
+ "browse-swhid",
+ url_args={"swhid": quote(swhid_with_context, safe=":;=/")},
)
swhids_info.append(
diff --git a/swh/web/utils/tests/test_identifiers.py b/swh/web/utils/tests/test_identifiers.py
--- a/swh/web/utils/tests/test_identifiers.py
+++ b/swh/web/utils/tests/test_identifiers.py
@@ -4,7 +4,7 @@
# See top-level LICENSE file for more information
import random
-from urllib.parse import quote
+from urllib.parse import quote, unquote, urlparse
import pytest
@@ -458,21 +458,26 @@
extra_context={"path": path},
)[0]
- # check special characters in SWHID have been escaped
+ # check special characters in SWHID have been percent escaped
assert (
swhid_info["context"]["origin"] == "http://example.org/?project%3Dabc%3Bdef%25"
)
assert swhid_info["context"]["path"] == "/foo%3B/bar%25"
# check special characters in SWHID URL have been escaped
- parsed_url_swhid = QualifiedSWHID.from_string(
- swhid_info["swhid_with_context_url"][1:]
+ parsed_swhid_url = urlparse(swhid_info["swhid_with_context_url"])
+ assert (
+ "origin=http://example.org/%253Fproject%25253Dabc%25253Bdef%252525;"
+ in parsed_swhid_url.path
)
+ assert "path=/foo%25253B/bar%252525" in parsed_swhid_url.path
+
+ # check that by double unquoting SWHID URL path, we get back on the SWHID value
+ # first unquoting is done by HTTP server, second unquoting by the SWHID parser
+ # when processing origin and path qualifiers
assert (
- parsed_url_swhid.qualifiers()["origin"]
- == "http://example.org/%3Fproject%253Dabc%253Bdef%2525"
+ unquote(unquote(parsed_swhid_url.path[1:])) == swhid_info["swhid_with_context"]
)
- assert parsed_url_swhid.qualifiers()["path"] == "/foo%253B/bar%2525"
def test_resolve_swhids_snapshot_context(

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 9:29 AM (15 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3214861

Event Timeline

About · Developer information · Legal