forked from TrueCloudLab/certificates
Improve test coverage for reloadPolicyEngines
This commit is contained in:
parent
72bbe53376
commit
3eecc4f7bb
4 changed files with 637 additions and 73 deletions
|
@ -190,12 +190,15 @@ func (m *MockDB) DeleteAdmin(ctx context.Context, id string) error {
|
||||||
return m.MockError
|
return m.MockError
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CreateAuthorityPolicy mock
|
||||||
func (m *MockDB) CreateAuthorityPolicy(ctx context.Context, policy *linkedca.Policy) error {
|
func (m *MockDB) CreateAuthorityPolicy(ctx context.Context, policy *linkedca.Policy) error {
|
||||||
if m.MockCreateAuthorityPolicy != nil {
|
if m.MockCreateAuthorityPolicy != nil {
|
||||||
return m.MockCreateAuthorityPolicy(ctx, policy)
|
return m.MockCreateAuthorityPolicy(ctx, policy)
|
||||||
}
|
}
|
||||||
return m.MockError
|
return m.MockError
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetAuthorityPolicy mock
|
||||||
func (m *MockDB) GetAuthorityPolicy(ctx context.Context) (*linkedca.Policy, error) {
|
func (m *MockDB) GetAuthorityPolicy(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
if m.MockGetAuthorityPolicy != nil {
|
if m.MockGetAuthorityPolicy != nil {
|
||||||
return m.MockGetAuthorityPolicy(ctx)
|
return m.MockGetAuthorityPolicy(ctx)
|
||||||
|
@ -203,6 +206,7 @@ func (m *MockDB) GetAuthorityPolicy(ctx context.Context) (*linkedca.Policy, erro
|
||||||
return m.MockRet1.(*linkedca.Policy), m.MockError
|
return m.MockRet1.(*linkedca.Policy), m.MockError
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UpdateAuthorityPolicy mock
|
||||||
func (m *MockDB) UpdateAuthorityPolicy(ctx context.Context, policy *linkedca.Policy) error {
|
func (m *MockDB) UpdateAuthorityPolicy(ctx context.Context, policy *linkedca.Policy) error {
|
||||||
if m.MockUpdateAuthorityPolicy != nil {
|
if m.MockUpdateAuthorityPolicy != nil {
|
||||||
return m.MockUpdateAuthorityPolicy(ctx, policy)
|
return m.MockUpdateAuthorityPolicy(ctx, policy)
|
||||||
|
@ -210,6 +214,7 @@ func (m *MockDB) UpdateAuthorityPolicy(ctx context.Context, policy *linkedca.Pol
|
||||||
return m.MockError
|
return m.MockError
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteAuthorityPolicy mock
|
||||||
func (m *MockDB) DeleteAuthorityPolicy(ctx context.Context) error {
|
func (m *MockDB) DeleteAuthorityPolicy(ctx context.Context) error {
|
||||||
if m.MockDeleteAuthorityPolicy != nil {
|
if m.MockDeleteAuthorityPolicy != nil {
|
||||||
return m.MockDeleteAuthorityPolicy(ctx)
|
return m.MockDeleteAuthorityPolicy(ctx)
|
||||||
|
|
|
@ -6,7 +6,6 @@ import (
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
|
||||||
"log"
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
@ -222,62 +221,6 @@ func (a *Authority) reloadAdminResources(ctx context.Context) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// reloadPolicyEngines reloads x509 and SSH policy engines using
|
|
||||||
// configuration stored in the DB or from the configuration file.
|
|
||||||
func (a *Authority) reloadPolicyEngines(ctx context.Context) error {
|
|
||||||
var (
|
|
||||||
err error
|
|
||||||
policyOptions *policy.Options
|
|
||||||
)
|
|
||||||
// if admin API is enabled, the CA is running in linked mode
|
|
||||||
if a.config.AuthorityConfig.EnableAdmin {
|
|
||||||
|
|
||||||
// temporarily disable policy loading when LinkedCA is in use
|
|
||||||
if _, ok := a.adminDB.(*linkedCaClient); ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// temporarily only support the admin nosql DB
|
|
||||||
if _, ok := a.adminDB.(*adminDBNosql.DB); !ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
linkedPolicy, err := a.adminDB.GetAuthorityPolicy(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("error getting policy to (re)load policy engines: %w", err)
|
|
||||||
}
|
|
||||||
policyOptions = policyToCertificates(linkedPolicy)
|
|
||||||
} else {
|
|
||||||
policyOptions = a.config.AuthorityConfig.Policy
|
|
||||||
}
|
|
||||||
|
|
||||||
// if no new or updated policy option is set, clear policy engines that (may have)
|
|
||||||
// been configured before and return early
|
|
||||||
if policyOptions == nil {
|
|
||||||
a.x509Policy = nil
|
|
||||||
a.sshHostPolicy = nil
|
|
||||||
a.sshUserPolicy = nil
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize the x509 allow/deny policy engine
|
|
||||||
if a.x509Policy, err = policy.NewX509PolicyEngine(policyOptions.GetX509Options()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// // Initialize the SSH allow/deny policy engine for host certificates
|
|
||||||
if a.sshHostPolicy, err = policy.NewSSHHostPolicyEngine(policyOptions.GetSSHOptions()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// // Initialize the SSH allow/deny policy engine for user certificates
|
|
||||||
if a.sshUserPolicy, err = policy.NewSSHUserPolicyEngine(policyOptions.GetSSHOptions()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// init performs validation and initializes the fields of an Authority struct.
|
// init performs validation and initializes the fields of an Authority struct.
|
||||||
func (a *Authority) init() error {
|
func (a *Authority) init() error {
|
||||||
// Check if handler has already been validated/initialized.
|
// Check if handler has already been validated/initialized.
|
||||||
|
|
|
@ -206,6 +206,73 @@ func (a *Authority) checkPolicy(ctx context.Context, currentAdmin *linkedca.Admi
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// reloadPolicyEngines reloads x509 and SSH policy engines using
|
||||||
|
// configuration stored in the DB or from the configuration file.
|
||||||
|
func (a *Authority) reloadPolicyEngines(ctx context.Context) error {
|
||||||
|
var (
|
||||||
|
err error
|
||||||
|
policyOptions *authPolicy.Options
|
||||||
|
)
|
||||||
|
// if admin API is enabled, the CA is running in linked mode
|
||||||
|
if a.config.AuthorityConfig.EnableAdmin {
|
||||||
|
|
||||||
|
// temporarily disable policy loading when LinkedCA is in use
|
||||||
|
if _, ok := a.adminDB.(*linkedCaClient); ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// // temporarily only support the admin nosql DB
|
||||||
|
// if _, ok := a.adminDB.(*adminDBNosql.DB); !ok {
|
||||||
|
// return nil
|
||||||
|
// }
|
||||||
|
|
||||||
|
linkedPolicy, err := a.adminDB.GetAuthorityPolicy(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("error getting policy to (re)load policy engines: %w", err)
|
||||||
|
}
|
||||||
|
policyOptions = policyToCertificates(linkedPolicy)
|
||||||
|
} else {
|
||||||
|
policyOptions = a.config.AuthorityConfig.Policy
|
||||||
|
}
|
||||||
|
|
||||||
|
// if no new or updated policy option is set, clear policy engines that (may have)
|
||||||
|
// been configured before and return early
|
||||||
|
if policyOptions == nil {
|
||||||
|
a.x509Policy = nil
|
||||||
|
a.sshHostPolicy = nil
|
||||||
|
a.sshUserPolicy = nil
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
x509Policy authPolicy.X509Policy
|
||||||
|
sshHostPolicy authPolicy.HostPolicy
|
||||||
|
sshUserPolicy authPolicy.UserPolicy
|
||||||
|
)
|
||||||
|
|
||||||
|
// initialize the x509 allow/deny policy engine
|
||||||
|
if x509Policy, err = authPolicy.NewX509PolicyEngine(policyOptions.GetX509Options()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// initialize the SSH allow/deny policy engine for host certificates
|
||||||
|
if sshHostPolicy, err = authPolicy.NewSSHHostPolicyEngine(policyOptions.GetSSHOptions()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// initialize the SSH allow/deny policy engine for user certificates
|
||||||
|
if sshUserPolicy, err = authPolicy.NewSSHUserPolicyEngine(policyOptions.GetSSHOptions()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// set all policy engines; all or nothing
|
||||||
|
a.x509Policy = x509Policy
|
||||||
|
a.sshHostPolicy = sshHostPolicy
|
||||||
|
a.sshUserPolicy = sshUserPolicy
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func isAllowed(engine authPolicy.X509Policy, sans []string) error {
|
func isAllowed(engine authPolicy.X509Policy, sans []string) error {
|
||||||
var (
|
var (
|
||||||
allowed bool
|
allowed bool
|
||||||
|
|
|
@ -11,7 +11,9 @@ import (
|
||||||
|
|
||||||
"go.step.sm/linkedca"
|
"go.step.sm/linkedca"
|
||||||
|
|
||||||
authPolicy "github.com/smallstep/certificates/authority/policy"
|
"github.com/smallstep/certificates/authority/admin"
|
||||||
|
"github.com/smallstep/certificates/authority/config"
|
||||||
|
"github.com/smallstep/certificates/authority/policy"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestAuthority_checkPolicy(t *testing.T) {
|
func TestAuthority_checkPolicy(t *testing.T) {
|
||||||
|
@ -196,7 +198,7 @@ func Test_policyToCertificates(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
policy *linkedca.Policy
|
policy *linkedca.Policy
|
||||||
want *authPolicy.Options
|
want *policy.Options
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "nil",
|
name: "nil",
|
||||||
|
@ -219,9 +221,9 @@ func Test_policyToCertificates(t *testing.T) {
|
||||||
VerifySubjectCommonName: &wrapperspb.BoolValue{Value: true},
|
VerifySubjectCommonName: &wrapperspb.BoolValue{Value: true},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
want: &authPolicy.Options{
|
want: &policy.Options{
|
||||||
X509: &authPolicy.X509PolicyOptions{
|
X509: &policy.X509PolicyOptions{
|
||||||
AllowedNames: &authPolicy.X509NameOptions{
|
AllowedNames: &policy.X509NameOptions{
|
||||||
DNSDomains: []string{"*.local"},
|
DNSDomains: []string{"*.local"},
|
||||||
},
|
},
|
||||||
AllowWildcardLiteral: &falseValue,
|
AllowWildcardLiteral: &falseValue,
|
||||||
|
@ -273,15 +275,15 @@ func Test_policyToCertificates(t *testing.T) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
want: &authPolicy.Options{
|
want: &policy.Options{
|
||||||
X509: &authPolicy.X509PolicyOptions{
|
X509: &policy.X509PolicyOptions{
|
||||||
AllowedNames: &authPolicy.X509NameOptions{
|
AllowedNames: &policy.X509NameOptions{
|
||||||
DNSDomains: []string{"step"},
|
DNSDomains: []string{"step"},
|
||||||
IPRanges: []string{"127.0.0.1/24"},
|
IPRanges: []string{"127.0.0.1/24"},
|
||||||
EmailAddresses: []string{"*.example.com"},
|
EmailAddresses: []string{"*.example.com"},
|
||||||
URIDomains: []string{"https://*.local"},
|
URIDomains: []string{"https://*.local"},
|
||||||
},
|
},
|
||||||
DeniedNames: &authPolicy.X509NameOptions{
|
DeniedNames: &policy.X509NameOptions{
|
||||||
DNSDomains: []string{"bad"},
|
DNSDomains: []string{"bad"},
|
||||||
IPRanges: []string{"127.0.0.30"},
|
IPRanges: []string{"127.0.0.30"},
|
||||||
EmailAddresses: []string{"badhost.example.com"},
|
EmailAddresses: []string{"badhost.example.com"},
|
||||||
|
@ -290,25 +292,25 @@ func Test_policyToCertificates(t *testing.T) {
|
||||||
AllowWildcardLiteral: &trueValue,
|
AllowWildcardLiteral: &trueValue,
|
||||||
VerifySubjectCommonName: &trueValue,
|
VerifySubjectCommonName: &trueValue,
|
||||||
},
|
},
|
||||||
SSH: &authPolicy.SSHPolicyOptions{
|
SSH: &policy.SSHPolicyOptions{
|
||||||
Host: &authPolicy.SSHHostCertificateOptions{
|
Host: &policy.SSHHostCertificateOptions{
|
||||||
AllowedNames: &authPolicy.SSHNameOptions{
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
DNSDomains: []string{"*.localhost"},
|
DNSDomains: []string{"*.localhost"},
|
||||||
IPRanges: []string{"127.0.0.1/24"},
|
IPRanges: []string{"127.0.0.1/24"},
|
||||||
Principals: []string{"user"},
|
Principals: []string{"user"},
|
||||||
},
|
},
|
||||||
DeniedNames: &authPolicy.SSHNameOptions{
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
DNSDomains: []string{"badhost.localhost"},
|
DNSDomains: []string{"badhost.localhost"},
|
||||||
IPRanges: []string{"127.0.0.40"},
|
IPRanges: []string{"127.0.0.40"},
|
||||||
Principals: []string{"root"},
|
Principals: []string{"root"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
User: &authPolicy.SSHUserCertificateOptions{
|
User: &policy.SSHUserCertificateOptions{
|
||||||
AllowedNames: &authPolicy.SSHNameOptions{
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
EmailAddresses: []string{"@work"},
|
EmailAddresses: []string{"@work"},
|
||||||
Principals: []string{"user"},
|
Principals: []string{"user"},
|
||||||
},
|
},
|
||||||
DeniedNames: &authPolicy.SSHNameOptions{
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
EmailAddresses: []string{"root@work"},
|
EmailAddresses: []string{"root@work"},
|
||||||
Principals: []string{"root"},
|
Principals: []string{"root"},
|
||||||
},
|
},
|
||||||
|
@ -326,3 +328,550 @@ func Test_policyToCertificates(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAuthority_reloadPolicyEngines(t *testing.T) {
|
||||||
|
type exp struct {
|
||||||
|
x509Policy bool
|
||||||
|
sshUserPolicy bool
|
||||||
|
sshHostPolicy bool
|
||||||
|
}
|
||||||
|
trueValue := true
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
config *config.Config
|
||||||
|
adminDB admin.DB
|
||||||
|
ctx context.Context
|
||||||
|
expected *exp
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "fail/standalone-x509-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
X509: &policy.X509PolicyOptions{
|
||||||
|
AllowedNames: &policy.X509NameOptions{
|
||||||
|
DNSDomains: []string{"**.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail/standalone-ssh-host-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
SSH: &policy.SSHPolicyOptions{
|
||||||
|
Host: &policy.SSHHostCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"**.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail/standalone-ssh-user-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
SSH: &policy.SSHPolicyOptions{
|
||||||
|
User: &policy.SSHUserCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
EmailAddresses: []string{"**example.com"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail/adminDB.GetAuthorityPolicy-error",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return nil, errors.New("force")
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail/admin-x509-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
X509: &linkedca.X509Policy{
|
||||||
|
Allow: &linkedca.X509Names{
|
||||||
|
Dns: []string{"**.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail/admin-ssh-host-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
Ssh: &linkedca.SSHPolicy{
|
||||||
|
Host: &linkedca.SSHHostPolicy{
|
||||||
|
Allow: &linkedca.SSHHostNames{
|
||||||
|
Dns: []string{"**.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail/admin-ssh-user-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
Ssh: &linkedca.SSHPolicy{
|
||||||
|
User: &linkedca.SSHUserPolicy{
|
||||||
|
Allow: &linkedca.SSHUserNames{
|
||||||
|
Emails: []string{"@@example.com"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/linkedca-unsupported",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &linkedCaClient{},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/standalone-no-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: nil,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: nil,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/standalone-x509-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
X509: &policy.X509PolicyOptions{
|
||||||
|
AllowedNames: &policy.X509NameOptions{
|
||||||
|
DNSDomains: []string{"*.local"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.X509NameOptions{
|
||||||
|
DNSDomains: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
AllowWildcardLiteral: &trueValue,
|
||||||
|
VerifySubjectCommonName: &trueValue,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
// expect only the X.509 policy to exist
|
||||||
|
x509Policy: true,
|
||||||
|
sshHostPolicy: false,
|
||||||
|
sshUserPolicy: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/standalone-ssh-host-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
SSH: &policy.SSHPolicyOptions{
|
||||||
|
Host: &policy.SSHHostCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"*.local"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
// expect only the SSH host policy to exist
|
||||||
|
x509Policy: false,
|
||||||
|
sshHostPolicy: true,
|
||||||
|
sshUserPolicy: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/standalone-ssh-user-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
SSH: &policy.SSHPolicyOptions{
|
||||||
|
User: &policy.SSHUserCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"*"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"root"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
// expect only the SSH user policy to exist
|
||||||
|
x509Policy: false,
|
||||||
|
sshHostPolicy: false,
|
||||||
|
sshUserPolicy: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/standalone-ssh-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
SSH: &policy.SSHPolicyOptions{
|
||||||
|
Host: &policy.SSHHostCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"*.local"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
User: &policy.SSHUserCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"*"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"root"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
// expect only the SSH policy engines to exist
|
||||||
|
x509Policy: false,
|
||||||
|
sshHostPolicy: true,
|
||||||
|
sshUserPolicy: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/standalone-full-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: false,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
X509: &policy.X509PolicyOptions{
|
||||||
|
AllowedNames: &policy.X509NameOptions{
|
||||||
|
DNSDomains: []string{"*.local"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.X509NameOptions{
|
||||||
|
DNSDomains: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
AllowWildcardLiteral: &trueValue,
|
||||||
|
VerifySubjectCommonName: &trueValue,
|
||||||
|
},
|
||||||
|
SSH: &policy.SSHPolicyOptions{
|
||||||
|
Host: &policy.SSHHostCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"*.local"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
User: &policy.SSHUserCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"*"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"root"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
// expect all three policy engines to exist
|
||||||
|
x509Policy: true,
|
||||||
|
sshHostPolicy: true,
|
||||||
|
sshUserPolicy: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/admin-x509-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
X509: &linkedca.X509Policy{
|
||||||
|
Allow: &linkedca.X509Names{
|
||||||
|
Dns: []string{"*.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
x509Policy: true,
|
||||||
|
sshHostPolicy: false,
|
||||||
|
sshUserPolicy: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/admin-ssh-host-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
Ssh: &linkedca.SSHPolicy{
|
||||||
|
Host: &linkedca.SSHHostPolicy{
|
||||||
|
Allow: &linkedca.SSHHostNames{
|
||||||
|
Dns: []string{"*.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
x509Policy: false,
|
||||||
|
sshHostPolicy: true,
|
||||||
|
sshUserPolicy: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/admin-ssh-user-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
Ssh: &linkedca.SSHPolicy{
|
||||||
|
User: &linkedca.SSHUserPolicy{
|
||||||
|
Allow: &linkedca.SSHUserNames{
|
||||||
|
Emails: []string{"@example.com"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
x509Policy: false,
|
||||||
|
sshHostPolicy: false,
|
||||||
|
sshUserPolicy: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ok/admin-full-policy",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
X509: &linkedca.X509Policy{
|
||||||
|
Allow: &linkedca.X509Names{
|
||||||
|
Dns: []string{"*.local"},
|
||||||
|
},
|
||||||
|
Deny: &linkedca.X509Names{
|
||||||
|
Dns: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
AllowWildcardLiteral: &wrapperspb.BoolValue{Value: true},
|
||||||
|
VerifySubjectCommonName: &wrapperspb.BoolValue{Value: true},
|
||||||
|
},
|
||||||
|
Ssh: &linkedca.SSHPolicy{
|
||||||
|
Host: &linkedca.SSHHostPolicy{
|
||||||
|
Allow: &linkedca.SSHHostNames{
|
||||||
|
Dns: []string{"*.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
User: &linkedca.SSHUserPolicy{
|
||||||
|
Allow: &linkedca.SSHUserNames{
|
||||||
|
Emails: []string{"@example.com"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
// expect all three policy engines to exist
|
||||||
|
x509Policy: true,
|
||||||
|
sshHostPolicy: true,
|
||||||
|
sshUserPolicy: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// both DB and JSON config; DB config is taken if Admin API is enabled
|
||||||
|
name: "ok/admin-over-standalone",
|
||||||
|
config: &config.Config{
|
||||||
|
AuthorityConfig: &config.AuthConfig{
|
||||||
|
EnableAdmin: true,
|
||||||
|
Policy: &policy.Options{
|
||||||
|
SSH: &policy.SSHPolicyOptions{
|
||||||
|
Host: &policy.SSHHostCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"*.local"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
DNSDomains: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
User: &policy.SSHUserCertificateOptions{
|
||||||
|
AllowedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"*"},
|
||||||
|
},
|
||||||
|
DeniedNames: &policy.SSHNameOptions{
|
||||||
|
Principals: []string{"root"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ctx: context.Background(),
|
||||||
|
adminDB: &admin.MockDB{
|
||||||
|
MockGetAuthorityPolicy: func(ctx context.Context) (*linkedca.Policy, error) {
|
||||||
|
return &linkedca.Policy{
|
||||||
|
X509: &linkedca.X509Policy{
|
||||||
|
Allow: &linkedca.X509Names{
|
||||||
|
Dns: []string{"*.local"},
|
||||||
|
},
|
||||||
|
Deny: &linkedca.X509Names{
|
||||||
|
Dns: []string{"badhost.local"},
|
||||||
|
},
|
||||||
|
AllowWildcardLiteral: &wrapperspb.BoolValue{Value: true},
|
||||||
|
VerifySubjectCommonName: &wrapperspb.BoolValue{Value: true},
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
expected: &exp{
|
||||||
|
// expect all three policy engines to exist
|
||||||
|
x509Policy: true,
|
||||||
|
sshHostPolicy: false,
|
||||||
|
sshUserPolicy: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
a := &Authority{
|
||||||
|
config: tt.config,
|
||||||
|
adminDB: tt.adminDB,
|
||||||
|
}
|
||||||
|
if err := a.reloadPolicyEngines(tt.ctx); (err != nil) != tt.wantErr {
|
||||||
|
t.Errorf("Authority.reloadPolicyEngines() error = %v, wantErr %v", err, tt.wantErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// if expected value is set, check existence of the policy engines
|
||||||
|
// Check that they're always nil if the expected value is not set,
|
||||||
|
// which happens on errors.
|
||||||
|
if tt.expected != nil {
|
||||||
|
assert.Equal(t, tt.expected.x509Policy, a.x509Policy != nil)
|
||||||
|
assert.Equal(t, tt.expected.sshHostPolicy, a.sshHostPolicy != nil)
|
||||||
|
assert.Equal(t, tt.expected.sshUserPolicy, a.sshUserPolicy != nil)
|
||||||
|
} else {
|
||||||
|
assert.Nil(t, a.x509Policy)
|
||||||
|
assert.Nil(t, a.sshHostPolicy)
|
||||||
|
assert.Nil(t, a.sshUserPolicy)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue