Merge branch 'main' into feature/encoding_compliance

chrisdecker1201 · web-flow · commit e8ae39d50ff3 · 2023-09-20T20:23:31.000+02:00
diff --git a/src/spdx_tools/spdx/validation/uri_validators.py b/src/spdx_tools/spdx/validation/uri_validators.py
@@ -28,8 +28,8 @@ def validate_url(url: str) -> List[str]:
 
 
 def validate_download_location(location: str) -> List[str]:
-    if not re.match(download_location_pattern, location):
-        return [f"must be a valid download location according to the specification, but is: {location}"]
+    if not (validate_url(location) == [] or re.match(download_location_pattern, location)):
+        return [f"must be a valid URL or download location according to the specification, but is: {location}"]
 
     return []
 
diff --git a/tests/spdx/validation/test_uri_validators.py b/tests/spdx/validation/test_uri_validators.py
@@ -18,6 +18,8 @@
 )
 def test_valid_url(input_value):
     assert validate_url(input_value) == []
+    # URLs are also valid download locations:
+    assert validate_download_location(input_value) == []
 
 
 # TODO: more negative examples: https://github.com/spdx/tools-python/issues/377
@@ -92,7 +94,7 @@ def test_valid_package_download_location(input_value):
 )
 def test_invalid_package_download_location(input_value):
     assert validate_download_location(input_value) == [
-        f"must be a valid download location according to the specification, but is: {input_value}"
+        f"must be a valid URL or download location according to the specification, but is: {input_value}"
     ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`)`
`19`	`19`	`def test_valid_url(input_value):`
`20`	`20`	`assert validate_url(input_value) == []`
	`21`	`+ # URLs are also valid download locations:`
	`22`	`+ assert validate_download_location(input_value) == []`
`21`	`23`
`22`	`24`
`23`	`25`	`# TODO: more negative examples: https://github.com/spdx/tools-python/issues/377`
`@@ -92,7 +94,7 @@ def test_valid_package_download_location(input_value):`
`92`	`94`	`)`
`93`	`95`	`def test_invalid_package_download_location(input_value):`
`94`	`96`	`assert validate_download_location(input_value) == [`
`95`		`- f"must be a valid download location according to the specification, but is: {input_value}"`
	`97`	`+ f"must be a valid URL or download location according to the specification, but is: {input_value}"`
`96`	`98`	`]`
`97`	`99`
`98`	`100`