Deprecate StoreRevokerInfo flag (#6567)

Fixes #5238
letsencrypt · Jan 9, 2023 · cfa524a · cfa524a
1 parent 8d43397
commit cfa524a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/features/featureflag_string.go b/features/featureflag_string.go
diff --git a/features/features.go b/features/features.go
@@ -35,6 +35,7 @@ const (
 	MozRevocationReasons
 	SHA1CSRs
 	RejectDuplicateCSRExtensions
+	StoreRevokerInfo
 
 	//   Currently in-use features
 	// Check CAA and respect validationmethods parameter.
@@ -50,9 +51,6 @@ const (
 	// MandatoryPOSTAsGET forbids legacy unauthenticated GET requests for ACME
 	// resources.
 	MandatoryPOSTAsGET
-	// StoreRevokerInfo enables storage of the revoker and a bool indicating if the row
-	// was checked for extant unrevoked certificates in the blockedKeys table.
-	StoreRevokerInfo
 	// ECDSAForAll enables all accounts, regardless of their presence in the CA's
 	// ecdsaAllowedAccounts config value, to get issuance from ECDSA issuers.
 	ECDSAForAll

diff --git a/sa/sa.go b/sa/sa.go
@@ -754,7 +754,7 @@ func (ssa *SQLStorageAuthority) AddBlockedKey(ctx context.Context, req *sapb.Add
 		sourceInt,
 		req.Comment,
 	}
-	if features.Enabled(features.StoreRevokerInfo) && req.RevokedBy != 0 {
+	if req.RevokedBy != 0 {
 		cols += ", revokedBy"
 		qs += ", ?"
 		vals = append(vals, req.RevokedBy)

diff --git a/sa/sa_test.go b/sa/sa_test.go
@@ -2432,11 +2432,7 @@ func TestBlockedKeyRevokedBy(t *testing.T) {
 	sa, _, cleanUp := initSA(t)
 	defer cleanUp()
 
-	err := features.Set(map[string]bool{"StoreRevokerInfo": true})
-	test.AssertNotError(t, err, "failed to set features")
-	defer features.Reset()
-
-	_, err = sa.AddBlockedKey(context.Background(), &sapb.AddBlockedKeyRequest{
+	_, err := sa.AddBlockedKey(context.Background(), &sapb.AddBlockedKeyRequest{
 		KeyHash: []byte{1},
 		Added:   1,
 		Source:  "API",