Change Wire DB operations into using a runtime type assertion

Author: hslatman

acme/challenge.go

@@ -393,6 +393,10 @@ type wireOidcPayload struct {
 }
 
 func wireOIDC01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose.JSONWebKey, payload []byte) error {
+	wireDB, ok := db.(WireDB)
+	if !ok {
+		return NewErrorISE("db %T is not a WireDB", db)
+	}
 	prov, ok := ProvisionerFromContext(ctx)
 	if !ok {
 		return NewErrorISE("missing provisioner")
@@ -472,7 +476,7 @@ func wireOIDC01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose.JSO
 		return WrapErrorISE(err, "error updating challenge")
 	}
 
-	orders, err := db.GetAllOrdersByAccountID(ctx, ch.AccountID)
+	orders, err := wireDB.GetAllOrdersByAccountID(ctx, ch.AccountID)
 	if err != nil {
 		return WrapErrorISE(err, "could not retrieve current order by account id")
 	}
@@ -481,7 +485,7 @@ func wireOIDC01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose.JSO
 	}
 
 	order := orders[len(orders)-1]
-	if err := db.CreateOidcToken(ctx, order, transformedIDToken); err != nil {
+	if err := wireDB.CreateOidcToken(ctx, order, transformedIDToken); err != nil {
 		return WrapErrorISE(err, "failed storing OIDC id token")
 	}
 
@@ -523,6 +527,10 @@ type wireDpopPayload struct {
 }
 
 func wireDPOP01Validate(ctx context.Context, ch *Challenge, db DB, accountJWK *jose.JSONWebKey, payload []byte) error {
+	wireDB, ok := db.(WireDB)
+	if !ok {
+		return NewErrorISE("db %T is not a WireDB", db)
+	}
 	prov, ok := ProvisionerFromContext(ctx)
 	if !ok {
 		return NewErrorISE("missing provisioner")
@@ -586,7 +594,7 @@ func wireDPOP01Validate(ctx context.Context, ch *Challenge, db DB, accountJWK *j
 		return WrapErrorISE(err, "error updating challenge")
 	}
 
-	orders, err := db.GetAllOrdersByAccountID(ctx, ch.AccountID)
+	orders, err := wireDB.GetAllOrdersByAccountID(ctx, ch.AccountID)
 	if err != nil {
 		return WrapErrorISE(err, "could not find current order by account id")
 	}
@@ -595,7 +603,7 @@ func wireDPOP01Validate(ctx context.Context, ch *Challenge, db DB, accountJWK *j
 	}
 
 	order := orders[len(orders)-1]
-	if err := db.CreateDpopToken(ctx, order, map[string]any(*dpop)); err != nil {
+	if err := wireDB.CreateDpopToken(ctx, order, map[string]any(*dpop)); err != nil {
 		return WrapErrorISE(err, "failed storing DPoP token")
 	}
 

acme/challenge_test.go

@@ -962,14 +962,16 @@ MCowBQYDK2VwAyEA5c+4NKZSNQcR1T8qN6SjwgdPZQ0Ge12Ylx/YeGAJ35k=
 				payload: payload,
 				ctx:     ctx,
 				jwk:     jwk,
-				db: &MockDB{
-					MockUpdateChallenge: func(ctx context.Context, updch *Challenge) error {
-						assert.Equal(t, "chID", updch.ID)
-						assert.Equal(t, "token", updch.Token)
-						assert.Equal(t, StatusValid, updch.Status)
-						assert.Equal(t, ChallengeType("wire-oidc-01"), updch.Type)
-						assert.Equal(t, string(valueBytes), updch.Value)
-						return nil
+				db: &MockWireDB{
+					MockDB: MockDB{
+						MockUpdateChallenge: func(ctx context.Context, updch *Challenge) error {
+							assert.Equal(t, "chID", updch.ID)
+							assert.Equal(t, "token", updch.Token)
+							assert.Equal(t, StatusValid, updch.Status)
+							assert.Equal(t, ChallengeType("wire-oidc-01"), updch.Type)
+							assert.Equal(t, string(valueBytes), updch.Value)
+							return nil
+						},
 					},
 					MockGetAllOrdersByAccountID: func(ctx context.Context, accountID string) ([]string, error) {
 						assert.Equal(t, "accID", accountID)
@@ -1111,14 +1113,16 @@ MCowBQYDK2VwAyEA5c+4NKZSNQcR1T8qN6SjwgdPZQ0Ge12Ylx/YeGAJ35k=
 				payload: payload,
 				ctx:     ctx,
 				jwk:     jwk,
-				db: &MockDB{
-					MockUpdateChallenge: func(ctx context.Context, updch *Challenge) error {
-						assert.Equal(t, "chID", updch.ID)
-						assert.Equal(t, "token", updch.Token)
-						assert.Equal(t, StatusValid, updch.Status)
-						assert.Equal(t, ChallengeType("wire-dpop-01"), updch.Type)
-						assert.Equal(t, string(valueBytes), updch.Value)
-						return nil
+				db: &MockWireDB{
+					MockDB: MockDB{
+						MockUpdateChallenge: func(ctx context.Context, updch *Challenge) error {
+							assert.Equal(t, "chID", updch.ID)
+							assert.Equal(t, "token", updch.Token)
+							assert.Equal(t, StatusValid, updch.Status)
+							assert.Equal(t, ChallengeType("wire-dpop-01"), updch.Type)
+							assert.Equal(t, string(valueBytes), updch.Value)
+							return nil
+						},
 					},
 					MockGetAllOrdersByAccountID: func(ctx context.Context, accountID string) ([]string, error) {
 						assert.Equal(t, "accID", accountID)