From 67af1af2d22bb15fcc6a4833a13553436ef7284d Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Tue, 29 Oct 2024 17:07:29 +0200 Subject: [PATCH 1/3] Allow URLs with capital letters Signed-off-by: Gergely Csatari --- src/spdx_tools/spdx/validation/uri_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spdx_tools/spdx/validation/uri_validators.py b/src/spdx_tools/spdx/validation/uri_validators.py index c14d196f4..1763ebd25 100644 --- a/src/spdx_tools/spdx/validation/uri_validators.py +++ b/src/spdx_tools/spdx/validation/uri_validators.py @@ -9,7 +9,7 @@ url_pattern = ( "(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/|ssh:\\/\\/|git:\\/\\/|svn:\\/\\/|sftp:" - "\\/\\/|ftp:\\/\\/)?([\\w\\-.!~*'()%;:&=+$,]+@)?[a-z0-9]+([\\-\\.]{1}[a-z0-9]+){0,100}\\.[a-z]{2,5}" + "\\/\\/|ftp:\\/\\/)?([\\w\\-.!~*'()%;:&=+$,]+@)?[a-zA-Z0-9]+([\\-\\.]{1}[a-zA-Z0-9]+){0,100}\\.[a-zA-Z]{2,5}" "(:[0-9]{1,5})?(\\/.*)?" ) supported_download_repos: str = "(git|hg|svn|bzr)" From 2443d3857f9249d05f6d3850b66b6b5f03cf240b Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Tue, 27 May 2025 08:48:50 +0300 Subject: [PATCH 2/3] Not yet working tests Signed-off-by: Gergely Csatari --- src/spdx_tools/spdx/validation/uri_validators.py | 2 +- tests/spdx/validation/test_uri_validators.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/spdx_tools/spdx/validation/uri_validators.py b/src/spdx_tools/spdx/validation/uri_validators.py index 1763ebd25..6cf4d85c0 100644 --- a/src/spdx_tools/spdx/validation/uri_validators.py +++ b/src/spdx_tools/spdx/validation/uri_validators.py @@ -22,7 +22,7 @@ def validate_url(url: str) -> List[str]: if not re.match(url_pattern, url): - return [f"must be a valid URL, but is: {url}"] + return [f"must be a valid URL, but is 01: {url}"] return [] diff --git a/tests/spdx/validation/test_uri_validators.py b/tests/spdx/validation/test_uri_validators.py index 2d374ee8e..c430f7c06 100644 --- a/tests/spdx/validation/test_uri_validators.py +++ b/tests/spdx/validation/test_uri_validators.py @@ -14,6 +14,7 @@ "https://spdx.org/spdxdocs/spdx-tools-v1.2-3F2504E0-4F89-41D3-9A0C-0305E82...", "http://some.url", "http://ftp.gnu.org/gnu/glibc/glibc-ports-2.15.tar.gz", + "http://some.url", ], ) def test_valid_url(input_value): From b9da38e95d6c0038fe0c7a002069bb80bb2832ce Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Tue, 27 May 2025 09:09:13 +0300 Subject: [PATCH 3/3] Adding test Signed-off-by: Gergely Csatari --- src/spdx_tools/spdx/validation/uri_validators.py | 2 +- tests/spdx/validation/test_uri_validators.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/spdx_tools/spdx/validation/uri_validators.py b/src/spdx_tools/spdx/validation/uri_validators.py index 6cf4d85c0..1763ebd25 100644 --- a/src/spdx_tools/spdx/validation/uri_validators.py +++ b/src/spdx_tools/spdx/validation/uri_validators.py @@ -22,7 +22,7 @@ def validate_url(url: str) -> List[str]: if not re.match(url_pattern, url): - return [f"must be a valid URL, but is 01: {url}"] + return [f"must be a valid URL, but is: {url}"] return [] diff --git a/tests/spdx/validation/test_uri_validators.py b/tests/spdx/validation/test_uri_validators.py index c430f7c06..59ad81ccc 100644 --- a/tests/spdx/validation/test_uri_validators.py +++ b/tests/spdx/validation/test_uri_validators.py @@ -107,6 +107,7 @@ def test_invalid_package_download_location(input_value): "https://spdx.org/spdxdocs/spdx-tools-v1.2-3F2504E0-4F89-41D3-9A0C-0305E82...", "h://someweirdtest^?", "https://some.uri that goes on!?", + "HTTPS://ANURIINCAPITALS.ORG", ], ) def test_valid_uri(input_value):