Skip to content

fix(golang): reject // indirect //exhortignore as ignore marker #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
a-oren merged 2 commits into from
Jun 23, 2026
+40 −26
Merged

fix(golang): reject // indirect //exhortignore as ignore marker #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fba57b
fix(golang): reject // indirect //exhortignore as ignore marker (TC-4…
a-oren Jun 22, 2026
4dd9db8
refactor: extract ignore-format regexes into precompiled Pattern cons…
a-oren Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions src/main/java/io/github/guacsec/trustifyda/providers/GoModulesProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ public final class GoModulesProvider extends Provider {
"TRUSTIFY_DA_GO_MVS_LOGIC_ENABLED";
private static final Logger log = LoggersFactory.getLogger(GoModulesProvider.class.getName());
public static final String DEFAULT_MAIN_VERSION = "v0.0.0";

private static final Pattern STANDALONE_IGNORE_PATTERN =
Pattern.compile("(exhortignore|trustify-da-ignore)");
private static final Pattern INDIRECT_IGNORE_PATTERN =
Pattern.compile("indirect\\s*;\\s*(//)?\\s*(exhortignore|trustify-da-ignore)");
private static final Pattern DEPENDENCY_LINE_PATTERN =
Pattern.compile("^[a-z.0-9/-]+\\s{1,2}[vV][0-9]\\.[0-9](\\.[0-9]){0,2}.*");

private final String goExecutable;

public String getMainModuleVersion() {
Expand Down Expand Up @@ -560,32 +568,31 @@ private String extractPackageName(String line) {
public boolean IgnoredLine(String line) {
boolean result = false;
if (IgnorePatternDetector.containsIgnorePattern(line)) {
// if exhortignore or trustify-da-ignore is alone in a comment or is in a comment together
// with indirect or as a
// comment inside a
// comment ( e.g // indirect //exhort)
// then this line is to be checked if it's a comment after a package name.
if (Pattern.matches(".+//\\s*(exhortignore|trustify-da-ignore)", line)
|| Pattern.matches(
".+//\\s*indirect\\s*;\\s*(//)?\\s*(exhortignore|trustify-da-ignore)", line)) {
String trimmedRow = line.trim();
// filter out lines where exhortignore or trustify-da-ignore has no meaning
if (!trimmedRow.startsWith("module ")
&& !trimmedRow.startsWith("go ")
&& !trimmedRow.startsWith("require (")
&& !trimmedRow.startsWith("require(")
&& !trimmedRow.startsWith("exclude ")
&& !trimmedRow.startsWith("replace ")
&& !trimmedRow.startsWith("retract ")
&& !trimmedRow.startsWith("use ")
&& !trimmedRow.contains(
"=>")) { // only for lines that after trimming starts with "require " or starting
// with
// package name followd by one space, and then a semver version.
if (trimmedRow.startsWith("require ")
|| Pattern.matches(
"^[a-z.0-9/-]+\\s{1,2}[vV][0-9]\\.[0-9](\\.[0-9]){0,2}.*", trimmedRow)) {
result = true;
String trimmedRow = line.trim();
int firstComment = trimmedRow.indexOf("//");
if (firstComment >= 0) {
String comment = trimmedRow.substring(firstComment + 2).trim();
// Match standalone ignore pattern (e.g. "// exhortignore") or
// semicolon-separated with indirect (e.g. "// indirect; exhortignore",
// "// indirect; // exhortignore").
// Does NOT match "// indirect //exhortignore" (no semicolon) or
// "// indirect exhortignore" (space-separated) — these are incorrect formats.
if (STANDALONE_IGNORE_PATTERN.matcher(comment).matches()
|| INDIRECT_IGNORE_PATTERN.matcher(comment).matches()) {
// filter out lines where exhortignore or trustify-da-ignore has no meaning
if (!trimmedRow.startsWith("module ")
&& !trimmedRow.startsWith("go ")
&& !trimmedRow.startsWith("require (")
&& !trimmedRow.startsWith("require(")
&& !trimmedRow.startsWith("exclude ")
&& !trimmedRow.startsWith("replace ")
&& !trimmedRow.startsWith("retract ")
&& !trimmedRow.startsWith("use ")
&& !trimmedRow.contains("=>")) {
if (trimmedRow.startsWith("require ")
|| DEPENDENCY_LINE_PATTERN.matcher(trimmedRow).matches()) {
result = true;
}
}
}
}
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/io/github/guacsec/trustifyda/providers/Golang_Modules_Provider_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,13 @@ void test_IgnoredLine_rejects_old_space_separated_indirect_format() {
.isFalse();
assertThat(provider.IgnoredLine(" github.com/foo/bar v1.0.0 // indirect exhortignore"))
.isFalse();
// Double-slash without semicolon should NOT be recognized (TC-4345)
assertThat(
provider.IgnoredLine(
" github.com/foo/bar v1.0.0 // indirect //trustify-da-ignore"))
.isFalse();
assertThat(provider.IgnoredLine(" github.com/foo/bar v1.0.0 // indirect //exhortignore"))
.isFalse();
// New semicolon format should still be recognized
assertThat(
provider.IgnoredLine(
Expand Down
Loading