[acme db interface] more unit tests

smallstep · Mar 25, 2021 · 8d2ebcf · 8d2ebcf
1 parent 20b9785
commit 8d2ebcf
Show file tree

Hide file tree

Showing 5 changed files with 314 additions and 119 deletions.
diff --git a/acme/account.go b/acme/account.go
@@ -27,16 +27,6 @@ func (a *Account) ToLog() (interface{}, error) {
 	return string(b), nil
 }
 
-// GetID returns the account ID.
-func (a *Account) GetID() string {
-	return a.ID
-}
-
-// GetKey returns the JWK associated with the account.
-func (a *Account) GetKey() *jose.JSONWebKey {
-	return a.Key
-}
-
 // IsValid returns true if the Account is valid.
 func (a *Account) IsValid() bool {
 	return Status(a.Status) == StatusValid

diff --git a/acme/api/account.go b/acme/api/account.go
@@ -153,15 +153,17 @@ func (h *Handler) GetUpdateAccount(w http.ResponseWriter, r *http.Request) {
 			api.WriteError(w, err)
 			return
 		}
-		var err error
-		// If neither the status nor the contacts are being updated then ignore
-		// the updates and return 200. This conforms with the behavior detailed
-		// in the ACME spec (https://tools.ietf.org/html/rfc8555#section-7.3.2).
-		acc.Status = uar.Status
-		acc.Contact = uar.Contact
-		if err = h.db.UpdateAccount(ctx, acc); err != nil {
-			api.WriteError(w, acme.WrapErrorISE(err, "error updating account"))
-			return
+		if len(uar.Status) > 0 || len(uar.Contact) > 0 {
+			if len(uar.Status) > 0 {
+				acc.Status = uar.Status
+			} else if len(uar.Contact) > 0 {
+				acc.Contact = uar.Contact
+			}
+
+			if err := h.db.UpdateAccount(ctx, acc); err != nil {
+				api.WriteError(w, acme.WrapErrorISE(err, "error updating account"))
+				return
+			}
 		}
 	}
 

diff --git a/acme/api/account_test.go b/acme/api/account_test.go
@@ -168,16 +168,22 @@ func TestUpdateAccountRequest_Validate(t *testing.T) {
 }
 
 func TestHandler_GetOrdersByAccountID(t *testing.T) {
-	oids := []string{
-		"https://ca.smallstep.com/acme/order/foo",
-		"https://ca.smallstep.com/acme/order/bar",
+	oids := []string{"foo", "bar"}
+	oidURLs := []string{
+		"https://test.ca.smallstep.com/acme/test@acme-provisioner.com/order/foo",
+		"https://test.ca.smallstep.com/acme/test@acme-provisioner.com/order/bar",
 	}
 	accID := "account-id"
 
 	// Request with chi context
 	chiCtx := chi.NewRouteContext()
 	chiCtx.URLParams.Add("accID", accID)
-	url := fmt.Sprintf("http://ca.smallstep.com/acme/account/%s/orders", accID)
+
+	prov := newProv()
+	provName := url.PathEscape(prov.GetName())
+	baseURL := &url.URL{Scheme: "https", Host: "test.ca.smallstep.com"}
+
+	url := fmt.Sprintf("http://ca.smallstep.com/acme/%s/account/%s/orders", provName, accID)
 
 	type test struct {
 		db         acme.DB
@@ -189,15 +195,15 @@ func TestHandler_GetOrdersByAccountID(t *testing.T) {
 		"fail/no-account": func(t *testing.T) test {
 			return test{
 				db:         &acme.MockDB{},
+				ctx:        context.Background(),
 				statusCode: 400,
 				err:        acme.NewError(acme.ErrorAccountDoesNotExistType, "account does not exist"),
 			}
 		},
 		"fail/nil-account": func(t *testing.T) test {
-			ctx := context.WithValue(context.Background(), accContextKey, nil)
 			return test{
 				db:         &acme.MockDB{},
-				ctx:        ctx,
+				ctx:        context.WithValue(context.Background(), accContextKey, nil),
 				statusCode: 400,
 				err:        acme.NewError(acme.ErrorAccountDoesNotExistType, "account does not exist"),
 			}
@@ -213,7 +219,7 @@ func TestHandler_GetOrdersByAccountID(t *testing.T) {
 				err:        acme.NewError(acme.ErrorUnauthorizedType, "account ID does not match url param"),
 			}
 		},
-		"fail/getOrdersByAccount-error": func(t *testing.T) test {
+		"fail/db.GetOrdersByAccountID-error": func(t *testing.T) test {
 			acc := &acme.Account{ID: accID}
 			ctx := context.WithValue(context.Background(), accContextKey, acc)
 			ctx = context.WithValue(ctx, chi.RouteCtxKey, chiCtx)
@@ -230,6 +236,8 @@ func TestHandler_GetOrdersByAccountID(t *testing.T) {
 			acc := &acme.Account{ID: accID}
 			ctx := context.WithValue(context.Background(), accContextKey, acc)
 			ctx = context.WithValue(ctx, chi.RouteCtxKey, chiCtx)
+			ctx = context.WithValue(ctx, baseURLContextKey, baseURL)
+			ctx = context.WithValue(ctx, provisionerContextKey, prov)
 			return test{
 				db: &acme.MockDB{
 					MockGetOrdersByAccountID: func(ctx context.Context, id string) ([]string, error) {
@@ -245,7 +253,7 @@ func TestHandler_GetOrdersByAccountID(t *testing.T) {
 	for name, run := range tests {
 		tc := run(t)
 		t.Run(name, func(t *testing.T) {
-			h := &Handler{db: tc.db}
+			h := &Handler{db: tc.db, linker: NewLinker("dns", "acme")}
 			req := httptest.NewRequest("GET", url, nil)
 			req = req.WithContext(tc.ctx)
 			w := httptest.NewRecorder()
@@ -268,7 +276,7 @@ func TestHandler_GetOrdersByAccountID(t *testing.T) {
 				assert.Equals(t, ae.Subproblems, tc.err.Subproblems)
 				assert.Equals(t, res.Header["Content-Type"], []string{"application/problem+json"})
 			} else {
-				expB, err := json.Marshal(oids)
+				expB, err := json.Marshal(oidURLs)
 				assert.FatalError(t, err)
 				assert.Equals(t, bytes.TrimSpace(body), expB)
 				assert.Equals(t, res.Header["Content-Type"], []string{"application/json"})
@@ -558,7 +566,7 @@ func TestHandler_GetUpdateAccount(t *testing.T) {
 				err:        acme.NewError(acme.ErrorMalformedType, "contact cannot be empty string"),
 			}
 		},
-		"fail/update-error": func(t *testing.T) test {
+		"fail/db.UpdateAccount-error": func(t *testing.T) test {
 			uar := &UpdateAccountRequest{
 				Status: "deactivated",
 			}