vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 02:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve resilience when getting binary names

Browse source
This commit is contained in:
Daniel 2020-12-11 17:01:17 +01:00
parent 40e2c1f9f7
commit 9a34850cbd
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
profile/profile.go
View file

@ -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 // Update profile name if it is empty or equals the filename, which is the
// case for older profiles. // 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. // Generate a default profile name if does not exist.
profile.Name = osdetail.GenerateBinaryNameFromPath(profile.LinkedPath) profile.Name = osdetail.GenerateBinaryNameFromPath(profile.LinkedPath)
if profile.Name == filename { if profile.Name == filename {
@ -457,12 +457,21 @@ func (profile *Profile) updateMetadataFromSystem(ctx context.Context) error {
// Get binary name from linked path. // Get binary name from linked path.
newName, err := osdetail.GetBinaryNameFromSystem(profile.LinkedPath) newName, err := osdetail.GetBinaryNameFromSystem(profile.LinkedPath)
if err != nil { 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) log.Warningf("profile: error while getting binary name for %s: %s", profile.LinkedPath, err)
} }
return nil return nil
} }
// Check if the new name is valid.
if strings.TrimSpace(newName) == "" {
return nil
}
// Get filename of linked path for comparison. // Get filename of linked path for comparison.
filename := filepath.Base(profile.LinkedPath) filename := filepath.Base(profile.LinkedPath)