Backport of security: fix AliasCheck panic (update) into release/1.19…

….x (#21511) backport of commit 8c3682a Co-authored-by: Kiran Naidoo <[email protected]>
hashicorp · Jul 3, 2024 · 1e3ea57 · 1e3ea57
1 parent 73d46d6
commit 1e3ea57
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/agent/checks/alias.go b/agent/checks/alias.go
@@ -164,6 +164,12 @@ RETRY_CALL:
 		}
 		return false, err
 	}
+
+	// Do not proceed for nil returned services.
+	if out.NodeServices == nil {
+		return false, fmt.Errorf("no services found on node")
+	}
+
 	for _, srv := range out.NodeServices.Services {
 		if serviceID.Matches(srv.CompoundServiceID()) {
 			return true, nil