Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/commands/firewall/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package firewall

import (
"common/acl"
license "common/license"
"common/modulefirewall"
"common/preferences"
"common/registry"
Expand Down Expand Up @@ -125,6 +126,16 @@ func requireCertified() error {
return nil
}

func requireGovernancePolicy() error {
if err := requireCertified(); err != nil {
return err
}
if !license.AllowsMachinePolicy() {
return fmt.Errorf("module/version firewall allow|deny requires a Governance license (machine policy)")
}
return nil
}

func policyKey(name string) string {
root := strings.TrimSpace(preferences.MACHINE_POLICY_ROOT)
if root == "" {
Expand Down Expand Up @@ -534,21 +545,21 @@ func removeTrusted(entries []string, machine bool) error {
}

func (a *AllowVersion) Run() error {
if err := requireCertified(); err != nil {
if err := requireGovernancePolicy(); err != nil {
return err
}
return appendPolicyMulti("VersionAllowList", a.Entries, false)
}

func (d *DenyVersion) Run() error {
if err := requireCertified(); err != nil {
if err := requireGovernancePolicy(); err != nil {
return err
}
return appendPolicyMulti("VersionAllowList", d.Entries, true)
}

func (a *AllowModule) Run() error {
if err := requireCertified(); err != nil {
if err := requireGovernancePolicy(); err != nil {
return err
}
key, label := "approved_modules", "ApprovedModules"
Expand All @@ -559,7 +570,7 @@ func (a *AllowModule) Run() error {
}

func (d *DenyModule) Run() error {
if err := requireCertified(); err != nil {
if err := requireGovernancePolicy(); err != nil {
return err
}
key, label := "approved_modules", "ApprovedModules"
Expand Down
Loading