Merge pull request moby#4996 from jsternberg/linter-nilcheck

dockerfile/linter: check for nil linter in linter functions
thaJeztah · Jun 5, 2024 · c1f5352 · c1f5352
2 parents 1128073 + f4cff87
commit c1f5352
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/frontend/dockerfile/instructions/parse.go b/frontend/dockerfile/instructions/parse.go
@@ -80,10 +80,8 @@ func ParseInstructionWithLinter(node *parser.Node, lint *linter.Linter) (v inter
 	case command.Env:
 		return parseEnv(req, lint)
 	case command.Maintainer:
-		if lint != nil {
-			msg := linter.RuleMaintainerDeprecated.Format()
-			lint.Run(&linter.RuleMaintainerDeprecated, node.Location(), msg)
-		}
+		msg := linter.RuleMaintainerDeprecated.Format()
+		lint.Run(&linter.RuleMaintainerDeprecated, node.Location(), msg)
 		return parseMaintainer(req)
 	case command.Label:
 		return parseLabel(req, lint)
@@ -92,11 +90,11 @@ func ParseInstructionWithLinter(node *parser.Node, lint *linter.Linter) (v inter
 	case command.Copy:
 		return parseCopy(req)
 	case command.From:
-		if lint != nil && !isLowerCaseStageName(req.args) {
+		if !isLowerCaseStageName(req.args) {
 			msg := linter.RuleStageNameCasing.Format(req.args[2])
 			lint.Run(&linter.RuleStageNameCasing, node.Location(), msg)
 		}
-		if lint != nil && !doesFromCaseMatchAsCase(req) {
+		if !doesFromCaseMatchAsCase(req) {
 			msg := linter.RuleFromAsCasing.Format(req.command, req.args[1])
 			lint.Run(&linter.RuleFromAsCasing, node.Location(), msg)
 		}

diff --git a/frontend/dockerfile/instructions/parse_test.go b/frontend/dockerfile/instructions/parse_test.go
@@ -151,6 +151,30 @@ func TestParseOptInterval(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestNilLinter(t *testing.T) {
+	for cmd := range command.Commands {
+		cmd := cmd
+		t.Run(cmd, func(t *testing.T) {
+			t.Parallel()
+
+			for _, tc := range []string{
+				cmd + " foo=bar",
+				cmd + " a",
+				cmd + " a b",
+				cmd + " a b c",
+				cmd + " 0 0",
+			} {
+				t.Run(tc, func(t *testing.T) {
+					ast, err := parser.Parse(strings.NewReader("FROM busybox\n" + tc))
+					if err == nil {
+						_, _, _ = Parse(ast.AST, nil)
+					}
+				})
+			}
+		})
+	}
+}
+
 func TestCommentsDetection(t *testing.T) {
 	dt := `# foo sets foo
 ARG foo=bar

diff --git a/frontend/dockerfile/linter/linter.go b/frontend/dockerfile/linter/linter.go
@@ -38,7 +38,7 @@ func New(config *Config) *Linter {
 }
 
 func (lc *Linter) Run(rule LinterRuleI, location []parser.Range, txt ...string) {
-	if lc.Warn == nil || lc.SkipAll {
+	if lc == nil || lc.Warn == nil || lc.SkipAll {
 		return
 	}
 	rulename := rule.RuleName()
@@ -50,7 +50,7 @@ func (lc *Linter) Run(rule LinterRuleI, location []parser.Range, txt ...string)
 }
 
 func (lc *Linter) Error() error {
-	if !lc.ReturnAsError {
+	if lc == nil || !lc.ReturnAsError {
 		return nil
 	}
 	if len(lc.CalledRules) == 0 {