Backport of security: fix AliasCheck panic into release/1.19.x (#21341)

* backport of commit aeba4bc * backport of commit 8c5b157 --------- Co-authored-by: dduzgun-security <[email protected]>
hashicorp · Jun 14, 2024 · 3296038 · 3296038
1 parent 480dedf
commit 3296038
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.changelog/21339.txt b/.changelog/21339.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fix panic runtime error on AliasCheck
+```
diff --git a/agent/checks/alias.go b/agent/checks/alias.go
@@ -144,6 +144,9 @@ func (c *CheckAlias) runLocal(stopCh chan struct{}) {
 type CheckIfServiceIDExists func(*structs.ServiceID) bool
 
 func (c *CheckAlias) checkServiceExistsOnRemoteServer(serviceID *structs.ServiceID) (bool, error) {
+	if serviceID == nil {
+		return false, fmt.Errorf("serviceID cannot be nil")
+	}
 	args := c.RPCReq
 	args.Node = c.Node
 	args.AllowStale = true