From b2338f94f0fd78f09af01bb578d80770e45c7908 Mon Sep 17 00:00:00 2001 From: Muskan Kumari Date: Sun, 15 Nov 2026 13:32:34 +0530 Subject: [PATCH] Fix AttributeError in parse_gomod on comments or blank lines (fixes #5489) Signed-off-by: Muskan Kumari --- src/packagedcode/go_mod.py | 12 ++++++++---- tests/packagedcode/test_golang.py | 30 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/packagedcode/go_mod.py b/src/packagedcode/go_mod.py index 527931c2dcc..dcb00f0ce3c 100644 --- a/src/packagedcode/go_mod.py +++ b/src/packagedcode/go_mod.py @@ -129,10 +129,12 @@ def parse_gomod(location): req = preprocess(req) if ')' in req: break + if not req: + continue parsed_dep_link = parse_dep_link(req) - ns_name = parsed_dep_link.group('ns_name') - namespace, _, name = ns_name.rpartition('/') if parsed_dep_link: + ns_name = parsed_dep_link.group('ns_name') + namespace, _, name = ns_name.rpartition('/') require.append(GoModule( namespace=namespace, name=name, @@ -146,10 +148,12 @@ def parse_gomod(location): exc = preprocess(exc) if ')' in exc: break + if not exc: + continue parsed_dep_link = parse_dep_link(exc) - ns_name = parsed_dep_link.group('ns_name') - namespace, _, name = ns_name.rpartition('/') if parsed_dep_link: + ns_name = parsed_dep_link.group('ns_name') + namespace, _, name = ns_name.rpartition('/') exclude.append(GoModule( namespace=namespace, name=name, diff --git a/tests/packagedcode/test_golang.py b/tests/packagedcode/test_golang.py index 58feea2def0..7490617a599 100644 --- a/tests/packagedcode/test_golang.py +++ b/tests/packagedcode/test_golang.py @@ -60,6 +60,36 @@ def test_parse_gomod_user_agent(self): package = golang.GoModHandler.parse(test_file) self.check_packages_data(package, expected_loc, regen=REGEN_TEST_FIXTURES) + def test_parse_gomod_with_comments_and_blank_lines(self): + test_file = self.get_temp_file('go.mod') + with open(test_file, 'w') as f: + f.write( + 'module example.com/hello\n\n' + 'go 1.21\n\n' + 'require (\n' + ' // Direct dependencies\n' + ' github.com/stretchr/testify v1.8.4\n\n' + ' // Indirect dependencies\n' + ' github.com/davecgh/go-spew v1.1.1\n' + ')\n\n' + 'exclude (\n' + ' // Excluded versions\n' + ' github.com/bad/pkg v1.0.0\n\n' + ' github.com/another/bad v2.0.0\n' + ')\n' + ) + packages = list(golang.GoModHandler.parse(test_file)) + assert len(packages) == 1 + pkg = packages[0] + assert pkg.name == 'hello' + purls = [d.purl for d in pkg.dependencies] + assert purls == [ + 'pkg:golang/github.com/stretchr/testify@v1.8.4', + 'pkg:golang/github.com/davecgh/go-spew@v1.1.1', + 'pkg:golang/github.com/bad/pkg@v1.0.0', + 'pkg:golang/github.com/another/bad@v2.0.0', + ] + def test_gosum_is_package_data_file(self): test_file = self.get_test_loc('golang/gosum/sample1/go.sum') assert golang.GoSumHandler.is_datafile(test_file)