github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove security level from profile

Browse Source
This commit is contained in:
Daniel
2023-12-15 14:07:40 +01:00
parent de2cf914df
commit 79ec3954e9
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
profile/merge.go
View File

@@ -30,7 +30,6 @@ func MergeProfiles(name string, primary *Profile, secondaries ...*Profile) (newP
Description: primary.Description, Description: primary.Description,
Homepage: primary.Homepage, Homepage: primary.Homepage,
UsePresentationPath: false, // Disable presentation path. UsePresentationPath: false, // Disable presentation path.
SecurityLevel: primary.SecurityLevel,
Config: primary.Config, Config: primary.Config,
Created: nowUnix, Created: nowUnix,
} }

16
profile/profile-layered.go
View File

@@ -135,8 +135,6 @@ func NewLayeredProfile(localProfile *Profile) *LayeredProfile {
// TODO: Load additional profiles. // TODO: Load additional profiles.
lp.updateCaches()
lp.CreateMeta() lp.CreateMeta()
lp.SetKey(runtime.DefaultRegistry.DatabaseName() + ":" + revisionProviderPrefix + localProfile.ScopedID()) lp.SetKey(runtime.DefaultRegistry.DatabaseName() + ":" + revisionProviderPrefix + localProfile.ScopedID())
@@ -292,9 +290,6 @@ func (lp *LayeredProfile) Update(md MatchingData, createProfileCallback func() *
// get global config validity flag // get global config validity flag
lp.globalValidityFlag.Refresh() lp.globalValidityFlag.Refresh()
// update cached data fields
lp.updateCaches()
// bump revision counter // bump revision counter
lp.increaseRevisionCounter(false) lp.increaseRevisionCounter(false)
} }
@@ -302,17 +297,6 @@ func (lp *LayeredProfile) Update(md MatchingData, createProfileCallback func() *
return lp.RevisionCounter return lp.RevisionCounter
} }
func (lp *LayeredProfile) updateCaches() {
// update security level
var newLevel uint8
for _, layer := range lp.layers {
if newLevel < layer.SecurityLevel {
newLevel = layer.SecurityLevel
}
}
atomic.StoreUint32(lp.securityLevel, uint32(newLevel))
}
// SecurityLevel returns the highest security level of all layered profiles. This function is atomic and does not require any locking. // SecurityLevel returns the highest security level of all layered profiles. This function is atomic and does not require any locking.
func (lp *LayeredProfile) SecurityLevel() uint8 { func (lp *LayeredProfile) SecurityLevel() uint8 {
return uint8(atomic.LoadUint32(lp.securityLevel)) return uint8(atomic.LoadUint32(lp.securityLevel))

6
profile/profile.go
View File

@@ -87,12 +87,6 @@ type Profile struct { //nolint:maligned // not worth the effort
UsePresentationPath bool UsePresentationPath bool
// Fingerprints holds process matching information. // Fingerprints holds process matching information.
Fingerprints []Fingerprint Fingerprints []Fingerprint
// SecurityLevel is the mininum security level to apply to
// connections made with this profile.
// Note(ppacher): we may deprecate this one as it can easily
// be "simulated" by adjusting the settings
// directly.
SecurityLevel uint8
// Config holds profile specific setttings. It's a nested // Config holds profile specific setttings. It's a nested
// object with keys defining the settings database path. All keys // object with keys defining the settings database path. All keys
// until the actual settings value (which is everything that is not // until the actual settings value (which is everything that is not