nosql account db unit tests

smallstep · Mar 25, 2021 · 88e6f00 · 88e6f00
1 parent ce13d09
commit 88e6f00
Show file tree

Hide file tree

Showing 2 changed files with 804 additions and 56 deletions.
diff --git a/acme/db/nosql/account.go b/acme/db/nosql/account.go
@@ -26,6 +26,58 @@ func (dba *dbAccount) clone() *dbAccount {
 	return &nu
 }
 
+func (db *DB) getAccountIDByKeyID(ctx context.Context, kid string) (string, error) {
+	id, err := db.db.Get(accountByKeyIDTable, []byte(kid))
+	if err != nil {
+		if nosqlDB.IsErrNotFound(err) {
+			return "", acme.NewError(acme.ErrorMalformedType, "account with key-id %s not found", kid)
+		}
+		return "", errors.Wrapf(err, "error loading key-account index for key %s", kid)
+	}
+	return string(id), nil
+}
+
+// getDBAccount retrieves and unmarshals dbAccount.
+func (db *DB) getDBAccount(ctx context.Context, id string) (*dbAccount, error) {
+	data, err := db.db.Get(accountTable, []byte(id))
+	if err != nil {
+		if nosqlDB.IsErrNotFound(err) {
+			return nil, acme.NewError(acme.ErrorMalformedType, "account %s not found", id)
+		}
+		return nil, errors.Wrapf(err, "error loading account %s", id)
+	}
+
+	dbacc := new(dbAccount)
+	if err = json.Unmarshal(data, dbacc); err != nil {
+		return nil, errors.Wrapf(err, "error unmarshaling account %s into dbAccount", id)
+	}
+	return dbacc, nil
+}
+
+// GetAccount retrieves an ACME account by ID.
+func (db *DB) GetAccount(ctx context.Context, id string) (*acme.Account, error) {
+	dbacc, err := db.getDBAccount(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	return &acme.Account{
+		Status:  dbacc.Status,
+		Contact: dbacc.Contact,
+		Key:     dbacc.Key,
+		ID:      dbacc.ID,
+	}, nil
+}
+
+// GetAccountByKeyID retrieves an ACME account by KeyID (thumbprint of the Account Key -- JWK).
+func (db *DB) GetAccountByKeyID(ctx context.Context, kid string) (*acme.Account, error) {
+	id, err := db.getAccountIDByKeyID(ctx, kid)
+	if err != nil {
+		return nil, err
+	}
+	return db.GetAccount(ctx, id)
+}
+
 // CreateAccount imlements the AcmeDB.CreateAccount interface.
 func (db *DB) CreateAccount(ctx context.Context, acc *acme.Account) error {
 	var err error
@@ -64,36 +116,8 @@ func (db *DB) CreateAccount(ctx context.Context, acc *acme.Account) error {
 	}
 }
 
-// GetAccount retrieves an ACME account by ID.
-func (db *DB) GetAccount(ctx context.Context, id string) (*acme.Account, error) {
-	dbacc, err := db.getDBAccount(ctx, id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &acme.Account{
-		Status:  dbacc.Status,
-		Contact: dbacc.Contact,
-		Key:     dbacc.Key,
-		ID:      dbacc.ID,
-	}, nil
-}
-
-// GetAccountByKeyID retrieves an ACME account by KeyID (thumbprint of the Account Key -- JWK).
-func (db *DB) GetAccountByKeyID(ctx context.Context, kid string) (*acme.Account, error) {
-	id, err := db.getAccountIDByKeyID(ctx, kid)
-	if err != nil {
-		return nil, err
-	}
-	return db.GetAccount(ctx, id)
-}
-
 // UpdateAccount imlements the AcmeDB.UpdateAccount interface.
 func (db *DB) UpdateAccount(ctx context.Context, acc *acme.Account) error {
-	if len(acc.ID) == 0 {
-		return errors.New("id cannot be empty")
-	}
-
 	old, err := db.getDBAccount(ctx, acc.ID)
 	if err != nil {
 		return err
@@ -110,31 +134,3 @@ func (db *DB) UpdateAccount(ctx context.Context, acc *acme.Account) error {
 
 	return db.save(ctx, old.ID, nu, old, "account", accountTable)
 }
-
-func (db *DB) getAccountIDByKeyID(ctx context.Context, kid string) (string, error) {
-	id, err := db.db.Get(accountByKeyIDTable, []byte(kid))
-	if err != nil {
-		if nosqlDB.IsErrNotFound(err) {
-			return "", errors.Wrapf(err, "account with key id %s not found", kid)
-		}
-		return "", errors.Wrapf(err, "error loading key-account index")
-	}
-	return string(id), nil
-}
-
-// getDBAccount retrieves and unmarshals dbAccount.
-func (db *DB) getDBAccount(ctx context.Context, id string) (*dbAccount, error) {
-	data, err := db.db.Get(accountTable, []byte(id))
-	if err != nil {
-		if nosqlDB.IsErrNotFound(err) {
-			return nil, errors.Wrapf(err, "account %s not found", id)
-		}
-		return nil, errors.Wrapf(err, "error loading account %s", id)
-	}
-
-	dbacc := new(dbAccount)
-	if err = json.Unmarshal(data, dbacc); err != nil {
-		return nil, errors.Wrap(err, "error unmarshaling account")
-	}
-	return dbacc, nil
-}