From b4b94593aaa039d8ae51adea7b0baaa9dea4f2c5 Mon Sep 17 00:00:00 2001 From: prabhu Date: Sun, 22 Sep 2024 19:46:45 +0100 Subject: [PATCH] Removes aliasing for namespaces that affected maven (#350) Signed-off-by: Prabhu Subramanian --- depscan/lib/normalize.py | 11 ----------- test/test_norm.py | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/depscan/lib/normalize.py b/depscan/lib/normalize.py index 93320ed2..3898b23a 100644 --- a/depscan/lib/normalize.py +++ b/depscan/lib/normalize.py @@ -108,17 +108,6 @@ def create_pkg_variations(pkg_dict): vendor_aliases.add(vendor) vendor_aliases.add(vendor.lower()) vendor_aliases.add(vendor.lstrip("@")) - if ( - vendor.startswith("org.") - or vendor.startswith("io.") - or vendor.startswith("com.") - or vendor.startswith("net.") - ): - tmp_a = vendor.split(".") - # Automatically add short vendor forms - if len(tmp_a) > 1 and len(tmp_a[1]) > 6: - if tmp_a[1] != name: - vendor_aliases.add(tmp_a[1]) # Add some common vendor aliases if purl.startswith("pkg:golang") and not name.startswith("go"): vendor_aliases.add("go") diff --git a/test/test_norm.py b/test/test_norm.py index 124184df..3f8c4f51 100644 --- a/test/test_norm.py +++ b/test/test_norm.py @@ -21,7 +21,7 @@ def test_pkg_variations(): pkg_list = create_pkg_variations( {"vendor": "org.eclipse.foo", "name": "bar", "version": "1.0.0"} ) - assert len(pkg_list) > 1 + assert len(pkg_list) == 1 pkg_list = create_pkg_variations( { "vendor": "com.fasterxml.jackson.core",