|
|
|
@ -16,18 +16,19 @@ import (
|
|
|
|
|
"github.com/smallstep/assert"
|
|
|
|
|
"github.com/smallstep/certificates/authority"
|
|
|
|
|
"github.com/smallstep/certificates/authority/provisioner"
|
|
|
|
|
"github.com/smallstep/certificates/errs"
|
|
|
|
|
"github.com/smallstep/certificates/logging"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
func TestRevokeRequestValidate(t *testing.T) {
|
|
|
|
|
type test struct {
|
|
|
|
|
rr *RevokeRequest
|
|
|
|
|
err *Error
|
|
|
|
|
err *errs.Error
|
|
|
|
|
}
|
|
|
|
|
tests := map[string]test{
|
|
|
|
|
"error/missing serial": {
|
|
|
|
|
rr: &RevokeRequest{},
|
|
|
|
|
err: &Error{Err: errors.New("missing serial"), Status: http.StatusBadRequest},
|
|
|
|
|
err: &errs.Error{Err: errors.New("missing serial"), Status: http.StatusBadRequest},
|
|
|
|
|
},
|
|
|
|
|
"error/bad reasonCode": {
|
|
|
|
|
rr: &RevokeRequest{
|
|
|
|
@ -35,7 +36,7 @@ func TestRevokeRequestValidate(t *testing.T) {
|
|
|
|
|
ReasonCode: 15,
|
|
|
|
|
Passive: true,
|
|
|
|
|
},
|
|
|
|
|
err: &Error{Err: errors.New("reasonCode out of bounds"), Status: http.StatusBadRequest},
|
|
|
|
|
err: &errs.Error{Err: errors.New("reasonCode out of bounds"), Status: http.StatusBadRequest},
|
|
|
|
|
},
|
|
|
|
|
"error/non-passive not implemented": {
|
|
|
|
|
rr: &RevokeRequest{
|
|
|
|
@ -43,7 +44,7 @@ func TestRevokeRequestValidate(t *testing.T) {
|
|
|
|
|
ReasonCode: 8,
|
|
|
|
|
Passive: false,
|
|
|
|
|
},
|
|
|
|
|
err: &Error{Err: errors.New("non-passive revocation not implemented"), Status: http.StatusNotImplemented},
|
|
|
|
|
err: &errs.Error{Err: errors.New("non-passive revocation not implemented"), Status: http.StatusNotImplemented},
|
|
|
|
|
},
|
|
|
|
|
"ok": {
|
|
|
|
|
rr: &RevokeRequest{
|
|
|
|
@ -57,7 +58,7 @@ func TestRevokeRequestValidate(t *testing.T) {
|
|
|
|
|
t.Run(name, func(t *testing.T) {
|
|
|
|
|
if err := tc.rr.Validate(); err != nil {
|
|
|
|
|
switch v := err.(type) {
|
|
|
|
|
case *Error:
|
|
|
|
|
case *errs.Error:
|
|
|
|
|
assert.HasPrefix(t, v.Error(), tc.err.Error())
|
|
|
|
|
assert.Equals(t, v.StatusCode(), tc.err.Status)
|
|
|
|
|
default:
|
|
|
|
@ -189,7 +190,7 @@ func Test_caHandler_Revoke(t *testing.T) {
|
|
|
|
|
return nil, nil
|
|
|
|
|
},
|
|
|
|
|
revoke: func(ctx context.Context, opts *authority.RevokeOptions) error {
|
|
|
|
|
return InternalServerError(errors.New("force"))
|
|
|
|
|
return errs.InternalServerError(errors.New("force"))
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|