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

Merge pull request #174 from smallstep/acmeAccNotFound

Browse source 
Should be returning status code 400 for ACME Account Not Found.
This commit is contained in:
Max 2020-02-03 10:25:21 -08:00 committed by GitHub
commit bd33799531
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acme/api/account.go
View file

@ -96,7 +96,7 @@ func (h *Handler) NewAccount(w http.ResponseWriter, r *http.Request) {
acc, err := accountFromContext(r)
if err != nil {
acmeErr, ok := err.(*acme.Error)
if !ok || acmeErr.Status != http.StatusNotFound {
if !ok || acmeErr.Status != http.StatusBadRequest {
// Something went wrong ...
api.WriteError(w, err)
return

10
acme/api/account_test.go
View file

@ -202,7 +202,7 @@ func TestHandlerGetOrdersByAccount(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -212,7 +212,7 @@ func TestHandlerGetOrdersByAccount(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -378,7 +378,7 @@ func TestHandlerNewAccount(t *testing.T) {
ctx = context.WithValue(ctx, payloadContextKey, &payloadInfo{value: b})
return test{
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -569,7 +569,7 @@ func TestHandlerGetUpdateAccount(t *testing.T) {
"fail/no-account": func(t *testing.T) test {
return test{
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -578,7 +578,7 @@ func TestHandlerGetUpdateAccount(t *testing.T) {
ctx = context.WithValue(ctx, accContextKey, nil)
return test{
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},

12
acme/api/handler_test.go
View file

@ -372,7 +372,7 @@ func TestHandlerGetAuthz(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -382,7 +382,7 @@ func TestHandlerGetAuthz(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -504,7 +504,7 @@ func TestHandlerGetCertificate(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -513,7 +513,7 @@ func TestHandlerGetCertificate(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -623,7 +623,7 @@ func TestHandlerGetChallenge(t *testing.T) {
"fail/no-account": func(t *testing.T) test {
return test{
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -632,7 +632,7 @@ func TestHandlerGetChallenge(t *testing.T) {
ctx = context.WithValue(ctx, accContextKey, nil)
return test{
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},

2
acme/api/middleware_test.go
View file

@ -842,7 +842,7 @@ func TestHandlerLookupJWK(t *testing.T) {
},
},
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},

12
acme/api/order_test.go
View file

@ -205,7 +205,7 @@ func TestHandlerGetOrder(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -215,7 +215,7 @@ func TestHandlerGetOrder(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -343,7 +343,7 @@ func TestHandlerNewOrder(t *testing.T) {
"fail/no-account": func(t *testing.T) test {
return test{
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -352,7 +352,7 @@ func TestHandlerNewOrder(t *testing.T) {
ctx = context.WithValue(ctx, accContextKey, nil)
return test{
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -597,7 +597,7 @@ func TestHandlerFinalizeOrder(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: context.WithValue(context.Background(), provisionerContextKey, prov),
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},
@ -607,7 +607,7 @@ func TestHandlerFinalizeOrder(t *testing.T) {
return test{
auth: &mockAcmeAuthority{},
ctx: ctx,
statusCode: 404,
statusCode: 400,
problem: acme.AccountDoesNotExistErr(nil),
}
},

2
acme/errors.go
View file

@ -9,7 +9,7 @@ func AccountDoesNotExistErr(err error) *Error {
return &Error{
Type: accountDoesNotExistErr,
Detail: "Account does not exist",
Status: 404,
Status: 400,
Err: err,
}
}