alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Fix linting issues

Browse source
This commit is contained in:
Herman Slatman 2022-05-06 13:23:09 +02:00
parent 7104299119
commit 0f4ffa504a
No known key found for this signature in database
GPG key ID: F4D8A44EA0A75A4F
4 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
authority/admin/api/policy.go
View file

@ -61,18 +61,18 @@ func (par *PolicyAdminResponder) GetAuthorityPolicy(w http.ResponseWriter, r *ht
return return
} }
policy, err := par.auth.GetAuthorityPolicy(r.Context()) authorityPolicy, err := par.auth.GetAuthorityPolicy(r.Context())
if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) { if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) {
render.Error(w, admin.WrapErrorISE(ae, "error retrieving authority policy")) render.Error(w, admin.WrapErrorISE(ae, "error retrieving authority policy"))
return return
} }
if policy == nil { if authorityPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "authority policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "authority policy does not exist"))
return return
} }
render.ProtoJSONStatus(w, policy, http.StatusOK) render.ProtoJSONStatus(w, authorityPolicy, http.StatusOK)
} }
// CreateAuthorityPolicy handles the POST /admin/authority/policy request // CreateAuthorityPolicy handles the POST /admin/authority/policy request
@ -84,14 +84,14 @@ func (par *PolicyAdminResponder) CreateAuthorityPolicy(w http.ResponseWriter, r
} }
ctx := r.Context() ctx := r.Context()
policy, err := par.auth.GetAuthorityPolicy(ctx) authorityPolicy, err := par.auth.GetAuthorityPolicy(ctx)
if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) { if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) {
render.Error(w, admin.WrapErrorISE(err, "error retrieving authority policy")) render.Error(w, admin.WrapErrorISE(err, "error retrieving authority policy"))
return return
} }
if policy != nil { if authorityPolicy != nil {
adminErr := admin.NewError(admin.ErrorConflictType, "authority already has a policy") adminErr := admin.NewError(admin.ErrorConflictType, "authority already has a policy")
render.Error(w, adminErr) render.Error(w, adminErr)
return return
@ -135,14 +135,14 @@ func (par *PolicyAdminResponder) UpdateAuthorityPolicy(w http.ResponseWriter, r
} }
ctx := r.Context() ctx := r.Context()
policy, err := par.auth.GetAuthorityPolicy(ctx) authorityPolicy, err := par.auth.GetAuthorityPolicy(ctx)
if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) { if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) {
render.Error(w, admin.WrapErrorISE(err, "error retrieving authority policy")) render.Error(w, admin.WrapErrorISE(err, "error retrieving authority policy"))
return return
} }
if policy == nil { if authorityPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "authority policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "authority policy does not exist"))
return return
} }
@ -185,14 +185,14 @@ func (par *PolicyAdminResponder) DeleteAuthorityPolicy(w http.ResponseWriter, r
} }
ctx := r.Context() ctx := r.Context()
policy, err := par.auth.GetAuthorityPolicy(ctx) authorityPolicy, err := par.auth.GetAuthorityPolicy(ctx)
if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) { if ae, ok := err.(*admin.Error); ok && !ae.IsType(admin.ErrorNotFoundType) {
render.Error(w, admin.WrapErrorISE(ae, "error retrieving authority policy")) render.Error(w, admin.WrapErrorISE(ae, "error retrieving authority policy"))
return return
} }
if policy == nil { if authorityPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "authority policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "authority policy does not exist"))
return return
} }
@ -215,13 +215,13 @@ func (par *PolicyAdminResponder) GetProvisionerPolicy(w http.ResponseWriter, r *
prov := linkedca.MustProvisionerFromContext(r.Context()) prov := linkedca.MustProvisionerFromContext(r.Context())
policy := prov.GetPolicy() provisionerPolicy := prov.GetPolicy()
if policy == nil { if provisionerPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "provisioner policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "provisioner policy does not exist"))
return return
} }
render.ProtoJSONStatus(w, policy, http.StatusOK) render.ProtoJSONStatus(w, provisionerPolicy, http.StatusOK)
} }
// CreateProvisionerPolicy handles the POST /admin/provisioners/{name}/policy request // CreateProvisionerPolicy handles the POST /admin/provisioners/{name}/policy request
@ -235,8 +235,8 @@ func (par *PolicyAdminResponder) CreateProvisionerPolicy(w http.ResponseWriter,
ctx := r.Context() ctx := r.Context()
prov := linkedca.MustProvisionerFromContext(ctx) prov := linkedca.MustProvisionerFromContext(ctx)
policy := prov.GetPolicy() provisionerPolicy := prov.GetPolicy()
if policy != nil { if provisionerPolicy != nil {
adminErr := admin.NewError(admin.ErrorConflictType, "provisioner %s already has a policy", prov.Name) adminErr := admin.NewError(admin.ErrorConflictType, "provisioner %s already has a policy", prov.Name)
render.Error(w, adminErr) render.Error(w, adminErr)
return return
@ -281,7 +281,8 @@ func (par *PolicyAdminResponder) UpdateProvisionerPolicy(w http.ResponseWriter,
ctx := r.Context() ctx := r.Context()
prov := linkedca.MustProvisionerFromContext(ctx) prov := linkedca.MustProvisionerFromContext(ctx)
if prov.Policy == nil { provisionerPolicy := prov.GetPolicy()
if provisionerPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "provisioner policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "provisioner policy does not exist"))
return return
} }
@ -350,13 +351,13 @@ func (par *PolicyAdminResponder) GetACMEAccountPolicy(w http.ResponseWriter, r *
ctx := r.Context() ctx := r.Context()
eak := linkedca.MustExternalAccountKeyFromContext(ctx) eak := linkedca.MustExternalAccountKeyFromContext(ctx)
policy := eak.GetPolicy() eakPolicy := eak.GetPolicy()
if policy == nil { if eakPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "ACME EAK policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "ACME EAK policy does not exist"))
return return
} }
render.ProtoJSONStatus(w, policy, http.StatusOK) render.ProtoJSONStatus(w, eakPolicy, http.StatusOK)
} }
func (par *PolicyAdminResponder) CreateACMEAccountPolicy(w http.ResponseWriter, r *http.Request) { func (par *PolicyAdminResponder) CreateACMEAccountPolicy(w http.ResponseWriter, r *http.Request) {
@ -370,8 +371,8 @@ func (par *PolicyAdminResponder) CreateACMEAccountPolicy(w http.ResponseWriter,
prov := linkedca.MustProvisionerFromContext(ctx) prov := linkedca.MustProvisionerFromContext(ctx)
eak := linkedca.MustExternalAccountKeyFromContext(ctx) eak := linkedca.MustExternalAccountKeyFromContext(ctx)
policy := eak.GetPolicy() eakPolicy := eak.GetPolicy()
if policy != nil { if eakPolicy != nil {
adminErr := admin.NewError(admin.ErrorConflictType, "ACME EAK %s already has a policy", eak.Id) adminErr := admin.NewError(admin.ErrorConflictType, "ACME EAK %s already has a policy", eak.Id)
render.Error(w, adminErr) render.Error(w, adminErr)
return return
@ -412,8 +413,8 @@ func (par *PolicyAdminResponder) UpdateACMEAccountPolicy(w http.ResponseWriter,
prov := linkedca.MustProvisionerFromContext(ctx) prov := linkedca.MustProvisionerFromContext(ctx)
eak := linkedca.MustExternalAccountKeyFromContext(ctx) eak := linkedca.MustExternalAccountKeyFromContext(ctx)
policy := eak.GetPolicy() eakPolicy := eak.GetPolicy()
if policy == nil { if eakPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "ACME EAK policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "ACME EAK policy does not exist"))
return return
} }
@ -452,8 +453,8 @@ func (par *PolicyAdminResponder) DeleteACMEAccountPolicy(w http.ResponseWriter,
prov := linkedca.MustProvisionerFromContext(ctx) prov := linkedca.MustProvisionerFromContext(ctx)
eak := linkedca.MustExternalAccountKeyFromContext(ctx) eak := linkedca.MustExternalAccountKeyFromContext(ctx)
policy := eak.GetPolicy() eakPolicy := eak.GetPolicy()
if policy == nil { if eakPolicy == nil {
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "ACME EAK policy does not exist")) render.Error(w, admin.NewError(admin.ErrorNotFoundType, "ACME EAK policy does not exist"))
return return
} }
@ -490,7 +491,7 @@ func isBadRequest(err error) bool {
func validatePolicy(p *linkedca.Policy) error { func validatePolicy(p *linkedca.Policy) error {
// convert the policy; return early if nil // convert the policy; return early if nil
options := policy.PolicyToCertificates(p) options := policy.LinkedToCertificates(p)
if options == nil { if options == nil {
return nil return nil
} }

4
authority/policy.go
View file

@ -155,7 +155,7 @@ func (a *Authority) checkProvisionerPolicy(ctx context.Context, currentAdmin *li
func (a *Authority) checkPolicy(ctx context.Context, currentAdmin *linkedca.Admin, otherAdmins []*linkedca.Admin, p *linkedca.Policy) error { func (a *Authority) checkPolicy(ctx context.Context, currentAdmin *linkedca.Admin, otherAdmins []*linkedca.Admin, p *linkedca.Policy) error {
// convert the policy; return early if nil // convert the policy; return early if nil
policyOptions := authPolicy.PolicyToCertificates(p) policyOptions := authPolicy.LinkedToCertificates(p)
if policyOptions == nil { if policyOptions == nil {
return nil return nil
} }
@ -222,7 +222,7 @@ func (a *Authority) reloadPolicyEngines(ctx context.Context) error {
return fmt.Errorf("error getting policy to (re)load policy engines: %w", err) return fmt.Errorf("error getting policy to (re)load policy engines: %w", err)
} }
} }
policyOptions = authPolicy.PolicyToCertificates(linkedPolicy) policyOptions = authPolicy.LinkedToCertificates(linkedPolicy)
} else { } else {
policyOptions = a.config.AuthorityConfig.Policy policyOptions = a.config.AuthorityConfig.Policy
} }

2
authority/policy/policy.go
View file

@ -142,7 +142,7 @@ func newSSHPolicyEngine(policyOptions SSHPolicyOptionsInterface, typ sshPolicyEn
return policy.New(options...) return policy.New(options...)
} }
func PolicyToCertificates(p *linkedca.Policy) *Options { func LinkedToCertificates(p *linkedca.Policy) *Options {
// return early // return early
if p == nil { if p == nil {

2
authority/policy/policy_test.go
View file

@ -146,7 +146,7 @@ func TestPolicyToCertificates(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
got := PolicyToCertificates(tt.args.policy) got := LinkedToCertificates(tt.args.policy)
if !cmp.Equal(tt.want, got) { if !cmp.Equal(tt.want, got) {
t.Errorf("policyToCertificates() diff=\n%s", cmp.Diff(tt.want, got)) t.Errorf("policyToCertificates() diff=\n%s", cmp.Diff(tt.want, got))
} }