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

Merge pull request #212 from safing/fix/profile-metadata-updating

Browse source 
Fix profile metadata updating
This commit is contained in:
Daniel 2020-12-11 17:02:19 +01:00 • committed by GitHub
commit f32e11e0ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
process/profile.go
View file

@ -10,8 +10,7 @@ import (
// GetProfile finds and assigns a profile set to the process. // GetProfile finds and assigns a profile set to the process.
func (p *Process) GetProfile(ctx context.Context) (changed bool, err error) { func (p *Process) GetProfile(ctx context.Context) (changed bool, err error) {
// Update profile metadata outside of *Process lock. // Update profile metadata outside of *Process lock.
var localProfile *profile.Profile defer p.UpdateProfileMetadata()
defer p.updateProfileMetadata(localProfile)
p.Lock() p.Lock()
defer p.Unlock() defer p.Unlock()
@ -35,7 +34,7 @@ func (p *Process) GetProfile(ctx context.Context) (changed bool, err error) {
} }
// Get the (linked) local profile. // Get the (linked) local profile.
localProfile, err = profile.GetProfile(profile.SourceLocal, profileID, p.Path) localProfile, err := profile.GetProfile(profile.SourceLocal, profileID, p.Path)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -47,8 +46,9 @@ func (p *Process) GetProfile(ctx context.Context) (changed bool, err error) {
return true, nil return true, nil
} }
func (p *Process) updateProfileMetadata(localProfile *profile.Profile) { func (p *Process) UpdateProfileMetadata() {
// Check if there is a profile to work with. // Check if there is a profile to work with.
localProfile := p.Profile().LocalProfile()
if localProfile == nil { if localProfile == nil {
return return
} }

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)