extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-30 22:50:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor posture check policy linking logic

Browse Source 
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
This commit is contained in:
bcmmbaga
2024-09-05 19:36:20 +03:00
parent 75ab35563a
commit 7523a9e7be
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
management/server/policy.go
View File

@ -191,11 +191,10 @@ func (p *Policy) UpgradeAndFix() {
} }
} }
// appliedGroups returns a list of groups applied in the policy, including // ruleGroups returns a list of all groups referenced in the policy's rules,
// both Sources and Destinations from all rules. // including sources and destinations.
func (p *Policy) appliedGroups() []string { func (p *Policy) ruleGroups() []string {
groups := make([]string, 0) groups := make([]string, 0)
for _, rule := range p.Rules { for _, rule := range p.Rules {
groups = append(groups, rule.Sources...) groups = append(groups, rule.Sources...)
groups = append(groups, rule.Destinations...) groups = append(groups, rule.Destinations...)
@ -405,7 +404,7 @@ func (am *DefaultAccountManager) DeletePolicy(ctx context.Context, accountID, po
am.StoreEvent(ctx, userID, policy.ID, accountID, activity.PolicyRemoved, policy.EventMeta()) am.StoreEvent(ctx, userID, policy.ID, accountID, activity.PolicyRemoved, policy.EventMeta())
if anyGroupHasPeers(account, policy.appliedGroups()) { if anyGroupHasPeers(account, policy.ruleGroups()) {
am.updateAccountPeers(ctx, account) am.updateAccountPeers(ctx, account)
} }
@ -457,14 +456,14 @@ func (am *DefaultAccountManager) savePolicy(account *Account, policy *Policy) (e
account.Policies[i] = policy account.Policies[i] = policy
exists = true exists = true
updateAccountPeers = anyGroupHasPeers(account, p.appliedGroups()) || anyGroupHasPeers(account, policy.appliedGroups()) updateAccountPeers = anyGroupHasPeers(account, p.ruleGroups()) || anyGroupHasPeers(account, policy.ruleGroups())
break break
} }
} }
if !exists { if !exists {
account.Policies = append(account.Policies, policy) account.Policies = append(account.Policies, policy)
updateAccountPeers = anyGroupHasPeers(account, policy.appliedGroups()) updateAccountPeers = anyGroupHasPeers(account, policy.ruleGroups())
} }
return return
} }

4
management/server/posture_checks.go
View File

@ -82,8 +82,8 @@ func (am *DefaultAccountManager) SavePostureChecks(ctx context.Context, accountI
am.StoreEvent(ctx, userID, postureChecks.ID, accountID, action, postureChecks.EventMeta()) am.StoreEvent(ctx, userID, postureChecks.ID, accountID, action, postureChecks.EventMeta())
updateAccountPeers, _ := isPostureCheckLinkedToPolicy(account, postureChecks.ID) isLinked, linkedPolicy := isPostureCheckLinkedToPolicy(account, postureChecks.ID)
if exists && updateAccountPeers { if exists && isLinked && anyGroupHasPeers(account, linkedPolicy.ruleGroups()) {
am.updateAccountPeers(ctx, account) am.updateAccountPeers(ctx, account)
} }