From 8f2f80574187f6e7d0b4a5c0504226e4d1ebe3b4 Mon Sep 17 00:00:00 2001 From: Lucas Manuel Rodriguez Date: Thu, 17 Jul 2025 11:03:01 -0300 Subject: [PATCH] Use UUID if osquery identifier not set (#30990) Change related to https://github.com/fleetdm/fleet/issues/28818. --- server/service/orbit.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/service/orbit.go b/server/service/orbit.go index 8f1f29f7ee..501d82243d 100644 --- a/server/service/orbit.go +++ b/server/service/orbit.go @@ -143,7 +143,12 @@ func (svc *Service) EnrollOrbit(ctx context.Context, hostInfo fleet.OrbitHostInf return "", fleet.OrbitError{Message: err.Error()} } - identityCert, err := svc.ds.GetHostIdentityCertByName(ctx, hostInfo.OsqueryIdentifier) + identifier := hostInfo.OsqueryIdentifier + if identifier == "" { + identifier = hostInfo.HardwareUUID + } + + identityCert, err := svc.ds.GetHostIdentityCertByName(ctx, identifier) if err != nil && !fleet.IsNotFound(err) { return "", fleet.OrbitError{Message: fmt.Sprintf("loading certificate: %s", err.Error())} }