From 9a34850cbdd1aa2a9b7b8349e0b841f0b8da8141 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 11 Dec 2020 17:01:17 +0100 Subject: [PATCH] Improve resilience when getting binary names --- profile/profile.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/profile/profile.go b/profile/profile.go index a17a8dad..0552ab16 100644 --- a/profile/profile.go +++ b/profile/profile.go @@ -414,7 +414,7 @@ func (profile *Profile) UpdateMetadata(processName string) (changed bool) { // Update profile name if it is empty or equals the filename, which is the // case for older profiles. - if profile.Name == "" || profile.Name == filename { + if strings.TrimSpace(profile.Name) == "" || profile.Name == filename { // Generate a default profile name if does not exist. profile.Name = osdetail.GenerateBinaryNameFromPath(profile.LinkedPath) if profile.Name == filename { @@ -457,12 +457,21 @@ func (profile *Profile) updateMetadataFromSystem(ctx context.Context) error { // Get binary name from linked path. newName, err := osdetail.GetBinaryNameFromSystem(profile.LinkedPath) if err != nil { - if !errors.Is(err, osdetail.ErrNotSupported) { + switch { + case errors.Is(err, osdetail.ErrNotSupported): + case errors.Is(err, osdetail.ErrNotFound): + case errors.Is(err, osdetail.ErrEmptyOutput): + default: log.Warningf("profile: error while getting binary name for %s: %s", profile.LinkedPath, err) } return nil } + // Check if the new name is valid. + if strings.TrimSpace(newName) == "" { + return nil + } + // Get filename of linked path for comparison. filename := filepath.Base(profile.LinkedPath)