Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disallow root policy from being specified #2309

Merged
merged 1 commit into from
Feb 14, 2017
Merged

Disallow root policy from being specified #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions nomad/structs/structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3238,21 +3238,28 @@ func (v *Vault) Validate() error {
return nil
}

var mErr multierror.Error
if len(v.Policies) == 0 {
return fmt.Errorf("Policy list cannot be empty")
multierror.Append(&mErr, fmt.Errorf("Policy list cannot be empty"))
}

for _, p := range v.Policies {
if p == "root" {
multierror.Append(&mErr, fmt.Errorf("Can not specifiy \"root\" policy"))
}
}

switch v.ChangeMode {
case VaultChangeModeSignal:
if v.ChangeSignal == "" {
return fmt.Errorf("Signal must be specified when using change mode %q", VaultChangeModeSignal)
multierror.Append(&mErr, fmt.Errorf("Signal must be specified when using change mode %q", VaultChangeModeSignal))
}
case VaultChangeModeNoop, VaultChangeModeRestart:
default:
return fmt.Errorf("Unknown change mode %q", v.ChangeMode)
multierror.Append(&mErr, fmt.Errorf("Unknown change mode %q", v.ChangeMode))
}

return nil
return mErr.ErrorOrNil()
}

const (
Expand Down
12 changes: 10 additions & 2 deletions nomad/structs/structs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,12 +1493,20 @@ func TestVault_Validate(t *testing.T) {
t.Fatalf("Expected policy list empty error")
}

v.Policies = []string{"foo"}
v.Policies = []string{"foo", "root"}
v.ChangeMode = VaultChangeModeSignal

if err := v.Validate(); err == nil || !strings.Contains(err.Error(), "Signal must") {
err := v.Validate()
if err == nil {
t.Fatalf("Expected validation errors")
}

if !strings.Contains(err.Error(), "Signal must") {
t.Fatalf("Expected signal empty error")
}
if !strings.Contains(err.Error(), "root") {
t.Fatalf("Expected root error")
}
}

func TestParameterizedJobConfig_Validate(t *testing.T) {
Expand Down