WFE/nonce: Add NonceHMACKey field

cmd/boulder-wfe2/main.go

@@ -71,13 +71,23 @@ type Config struct {
 		// local and remote nonce-service instances.
 		RedeemNonceService *cmd.GRPCClientConfig `validate:"required"`
 
+		// NonceHMACKey is a path to a file containing an HMAC key which is a
+		// secret used for deriving the prefix of each nonce instance. It should
+		// contain 256 bits (32 bytes) of random data to be suitable as an
+		// HMAC-SHA256 key (e.g. the output of `openssl rand -hex 32`). In a
+		// multi-DC deployment this value should be the same across all
+		// boulder-wfe and nonce-service instances.
+		NonceHMACKey cmd.HMACKeyConfig `validate:"-"`
+
 		// NoncePrefixKey is a secret used for deriving the prefix of each nonce
 		// instance. It should contain 256 bits of random data to be suitable as
 		// an HMAC-SHA256 key (e.g. the output of `openssl rand -hex 32`). In a
 		// multi-DC deployment this value should be the same across all
 		// boulder-wfe and nonce-service instances.
 		//
-		// TODO(#7632) Update this to use the new HMACKeyConfig.
+		// TODO(#7632): Remove this.
+		//
+		// Deprecated: Use NonceHMACKey instead.
 		NoncePrefixKey cmd.PasswordConfig `validate:"-"`
 
 		// Chains is a list of lists of certificate filenames. Each inner list is
@@ -294,10 +304,16 @@ func main() {
 		cmd.Fail("'getNonceService' must be configured")
 	}
 
-	var noncePrefixKey string
-	if c.WFE.NoncePrefixKey.PasswordFile != "" {
-		noncePrefixKey, err = c.WFE.NoncePrefixKey.Pass()
-		cmd.FailOnError(err, "Failed to load noncePrefixKey")
+	var noncePrefixKey []byte
+	if c.WFE.NonceHMACKey.KeyFile != "" {
+		noncePrefixKey, err = c.WFE.NonceHMACKey.Load()
+		cmd.FailOnError(err, "Failed to load nonceHMACKey file")
+	} else if c.WFE.NoncePrefixKey.PasswordFile != "" {
+		keyString, err := c.WFE.NoncePrefixKey.Pass()
+		cmd.FailOnError(err, "Failed to load noncePrefixKey file")
+		noncePrefixKey = []byte(keyString)
+	} else {
+		cmd.Fail("NonceHMACKey KeyFile or NoncePrefixKey PasswordFile must be set")
 	}
 
 	getNonceConn, err := bgrpc.ClientSetup(c.WFE.GetNonceService, tlsConfig, stats, clk)

cmd/config.go

@@ -572,7 +572,7 @@ func (hc *HMACKeyConfig) Load() ([]byte, error) {
 
 	if len(trimmed) != 32 {
 		return nil, fmt.Errorf(
-			"validating unpauseHMACKey, length must be 32 alphanumeric characters, got %d",
+			"validating HMAC key, length must be 32 alphanumeric characters, got %d",
 			len(trimmed),
 		)
 	}

cmd/nonce-service/main.go

@@ -19,30 +19,32 @@ type Config struct {
 
 		MaxUsed int
 
-		// UseDerivablePrefix indicates whether to use a nonce prefix derived
-		// from the gRPC listening address. If this is false, the nonce prefix
-		// will be the value of the NoncePrefix field. If this is true, the
-		// NoncePrefixKey field is required.
-		// TODO(#6610): Remove this.
-		//
-		// Deprecated: this value is ignored, and treated as though it is always true.
-		UseDerivablePrefix bool `validate:"-"`
+		// NonceHMACKey is a path to a file containing an HMAC key which is a
+		// secret used for deriving the prefix of each nonce instance. It should
+		// contain 256 bits (32 bytes) of random data to be suitable as an
+		// HMAC-SHA256 key (e.g. the output of `openssl rand -hex 32`). In a
+		// multi-DC deployment this value should be the same across all
+		// boulder-wfe and nonce-service instances.
+		NonceHMACKey cmd.HMACKeyConfig `validate:"required_without_all=NoncePrefixKey,structonly"`
 
 		// NoncePrefixKey is a secret used for deriving the prefix of each nonce
 		// instance. It should contain 256 bits (32 bytes) of random data to be
 		// suitable as an HMAC-SHA256 key (e.g. the output of `openssl rand -hex
 		// 32`). In a multi-DC deployment this value should be the same across
 		// all boulder-wfe and nonce-service instances.
 		//
-		// TODO(#7632) Update this to use the new HMACKeyConfig.
-		NoncePrefixKey cmd.PasswordConfig `validate:"required"`
+		// TODO(#7632): Remove this and change `NonceHMACKey`'s validation to
+		// just `required.`
+		//
+		// Deprecated: Use NonceHMACKey instead.
+		NoncePrefixKey cmd.PasswordConfig `validate:"required_without_all=NonceHMACKey,structonly"`
 
 		Syslog        cmd.SyslogConfig
 		OpenTelemetry cmd.OpenTelemetryConfig
 	}
 }
 
-func derivePrefix(key string, grpcAddr string) (string, error) {
+func derivePrefix(key []byte, grpcAddr string) (string, error) {
 	host, port, err := net.SplitHostPort(grpcAddr)
 	if err != nil {
 		return "", fmt.Errorf("parsing gRPC listen address: %w", err)
@@ -84,12 +86,18 @@ func main() {
 		c.NonceService.DebugAddr = *debugAddr
 	}
 
-	if c.NonceService.NoncePrefixKey.PasswordFile == "" {
-		cmd.Fail("NoncePrefixKey PasswordFile must be set")
+	var key []byte
+	if c.NonceService.NonceHMACKey.KeyFile != "" {
+		key, err = c.NonceService.NonceHMACKey.Load()
+		cmd.FailOnError(err, "Failed to load 'nonceHMACKey' file.")
+	} else if c.NonceService.NoncePrefixKey.PasswordFile != "" {
+		keyString, err := c.NonceService.NoncePrefixKey.Pass()
+		cmd.FailOnError(err, "Failed to load 'noncePrefixKey' file.")
+		key = []byte(keyString)
+	} else {
+		cmd.Fail("NonceHMACKey KeyFile or NoncePrefixKey PasswordFile must be set")
 	}
 
-	key, err := c.NonceService.NoncePrefixKey.Pass()
-	cmd.FailOnError(err, "Failed to load 'noncePrefixKey' file.")
 	noncePrefix, err := derivePrefix(key, c.NonceService.GRPC.Address)
 	cmd.FailOnError(err, "Failed to derive nonce prefix")
 

grpc/noncebalancer/noncebalancer.go

@@ -35,7 +35,7 @@ var ErrNoBackendsMatchPrefix = status.New(codes.Unavailable, "no backends match
 var errMissingPrefixCtxKey = errors.New("nonce.PrefixCtxKey value required in RPC context")
 var errMissingHMACKeyCtxKey = errors.New("nonce.HMACKeyCtxKey value required in RPC context")
 var errInvalidPrefixCtxKeyType = errors.New("nonce.PrefixCtxKey value in RPC context must be a string")
-var errInvalidHMACKeyCtxKeyType = errors.New("nonce.HMACKeyCtxKey value in RPC context must be a string")
+var errInvalidHMACKeyCtxKeyType = errors.New("nonce.HMACKeyCtxKey value in RPC context must be a byteslice")
 
 // Balancer implements the base.PickerBuilder interface. It's used to create new
 // balancer.Picker instances. It should only be used by nonce-service clients.
@@ -84,7 +84,7 @@ func (p *Picker) Pick(info balancer.PickInfo) (balancer.PickResult, error) {
 		// This should never happen.
 		return balancer.PickResult{}, errMissingHMACKeyCtxKey
 	}
-	hmacKey, ok := hmacKeyVal.(string)
+	hmacKey, ok := hmacKeyVal.([]byte)
 	if !ok {
 		// This should never happen.
 		return balancer.PickResult{}, errInvalidHMACKeyCtxKeyType

grpc/noncebalancer/noncebalancer_test.go

@@ -4,16 +4,17 @@ import (
 	"context"
 	"testing"
 
-	"github.com/letsencrypt/boulder/nonce"
-	"github.com/letsencrypt/boulder/test"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/base"
 	"google.golang.org/grpc/resolver"
+
+	"github.com/letsencrypt/boulder/nonce"
+	"github.com/letsencrypt/boulder/test"
 )
 
 func TestPickerPicksCorrectBackend(t *testing.T) {
 	_, p, subConns := setupTest(false)
-	prefix := nonce.DerivePrefix(subConns[0].addrs[0].Addr, "Kala namak")
+	prefix := nonce.DerivePrefix(subConns[0].addrs[0].Addr, []byte("Kala namak"))
 
 	testCtx := context.WithValue(context.Background(), nonce.PrefixCtxKey{}, "HNmOnt8w")
 	testCtx = context.WithValue(testCtx, nonce.HMACKeyCtxKey{}, prefix)
@@ -26,7 +27,7 @@ func TestPickerPicksCorrectBackend(t *testing.T) {
 
 func TestPickerMissingPrefixInCtx(t *testing.T) {
 	_, p, subConns := setupTest(false)
-	prefix := nonce.DerivePrefix(subConns[0].addrs[0].Addr, "Kala namak")
+	prefix := nonce.DerivePrefix(subConns[0].addrs[0].Addr, []byte("Kala namak"))
 
 	testCtx := context.WithValue(context.Background(), nonce.HMACKeyCtxKey{}, prefix)
 	info := balancer.PickInfo{Ctx: testCtx}
@@ -73,7 +74,7 @@ func TestPickerInvalidHMACKeyInCtx(t *testing.T) {
 
 func TestPickerNoMatchingSubConnAvailable(t *testing.T) {
 	_, p, subConns := setupTest(false)
-	prefix := nonce.DerivePrefix(subConns[0].addrs[0].Addr, "Kala namak")
+	prefix := nonce.DerivePrefix(subConns[0].addrs[0].Addr, []byte("Kala namak"))
 
 	testCtx := context.WithValue(context.Background(), nonce.PrefixCtxKey{}, "rUsTrUin")
 	testCtx = context.WithValue(testCtx, nonce.HMACKeyCtxKey{}, prefix)

nonce/nonce.go

@@ -55,8 +55,8 @@ type HMACKeyCtxKey struct{}
 // DerivePrefix derives a nonce prefix from the provided listening address and
 // key. The prefix is derived by take the first 8 characters of the base64url
 // encoded HMAC-SHA256 hash of the listening address using the provided key.
-func DerivePrefix(grpcAddr, key string) string {
-	h := hmac.New(sha256.New, []byte(key))
+func DerivePrefix(grpcAddr string, key []byte) string {
+	h := hmac.New(sha256.New, key)
 	h.Write([]byte(grpcAddr))
 	return base64.RawURLEncoding.EncodeToString(h.Sum(nil))[:PrefixLen]
 }

nonce/nonce_test.go

@@ -147,6 +147,6 @@ func TestNoncePrefixValidation(t *testing.T) {
 }
 
 func TestDerivePrefix(t *testing.T) {
-	prefix := DerivePrefix("192.168.1.1:8080", "3b8c758dd85e113ea340ce0b3a99f389d40a308548af94d1730a7692c1874f1f")
-	test.AssertEquals(t, prefix, "P9qQaK4o")
+	prefix := DerivePrefix("192.168.1.1:8080", []byte("3b8c758dd85e113ea340ce0b3a99f389"))
+	test.AssertEquals(t, prefix, "FxMmnuMq")
 }

test/config-next/nonce-a.json

@@ -1,8 +1,8 @@
 {
 	"NonceService": {
 		"maxUsed": 131072,
-		"noncePrefixKey": {
-			"passwordFile": "test/secrets/nonce_prefix_key"
+		"nonceHMACKey": {
+			"keyFile": "test/secrets/nonce_prefix_key"
 		},
 		"syslog": {
 			"stdoutLevel": 6,

test/config-next/nonce-b.json

@@ -1,8 +1,8 @@
 {
 	"NonceService": {
 		"maxUsed": 131072,
-		"noncePrefixKey": {
-			"passwordFile": "test/secrets/nonce_prefix_key"
+		"nonceHMACKey": {
+			"keyFile": "test/secrets/nonce_prefix_key"
 		},
 		"syslog": {
 			"stdoutLevel": 6,

test/config-next/wfe2.json

@@ -68,8 +68,8 @@
 			"noWaitForReady": true,
 			"hostOverride": "nonce.boulder"
 		},
-		"noncePrefixKey": {
-			"passwordFile": "test/secrets/nonce_prefix_key"
+		"nonceHMACKey": {
+			"keyFile": "test/secrets/nonce_prefix_key"
 		},
 		"chains": [
 			[

test/config/nonce-a.json

@@ -1,7 +1,6 @@
 {
 	"NonceService": {
 		"maxUsed": 131072,
-		"useDerivablePrefix": true,
 		"noncePrefixKey": {
 			"passwordFile": "test/secrets/nonce_prefix_key"
 		},

test/config/nonce-b.json

@@ -1,7 +1,6 @@
 {
 	"NonceService": {
 		"maxUsed": 131072,
-		"useDerivablePrefix": true,
 		"noncePrefixKey": {
 			"passwordFile": "test/secrets/nonce_prefix_key"
 		},

test/integration/nonce_test.go

@@ -24,6 +24,7 @@ type nonceBalancerTestConfig struct {
 		GetNonceService    *cmd.GRPCClientConfig
 		RedeemNonceService *cmd.GRPCClientConfig
 		NoncePrefixKey     cmd.PasswordConfig
+		NonceHMACKey       cmd.HMACKeyConfig
 	}
 }
 
@@ -41,8 +42,13 @@ func TestNonceBalancer_NoBackendMatchingPrefix(t *testing.T) {
 	tlsConfig, err := c.NotWFE.TLS.Load(metrics.NoopRegisterer)
 	test.AssertNotError(t, err, "Could not load TLS config")
 
-	rncKey, err := c.NotWFE.NoncePrefixKey.Pass()
-	test.AssertNotError(t, err, "Failed to load noncePrefixKey")
+	var rncKey []byte
+	rncKey, err = c.NotWFE.NonceHMACKey.Load()
+	if err != nil {
+		rncKeyString, err := c.NotWFE.NoncePrefixKey.Pass()
+		test.AssertNotError(t, err, "Failed to load nonceHMACKey or noncePrefixKey")
+		rncKey = []byte(rncKeyString)
+	}
 
 	clk := clock.New()
 

test/integration/testdata/nonce-client.json

@@ -32,8 +32,8 @@
 			"noWaitForReady": true,
 			"hostOverride": "nonce.boulder"
 		},
-		"noncePrefixKey": {
-			"passwordFile": "test/secrets/nonce_prefix_key"
+		"nonceHMACKey": {
+			"keyFile": "test/secrets/nonce_prefix_key"
 		}
     }
 }

test/secrets/nonce_prefix_key

@@ -1 +1 @@
-3b8c758dd85e113ea340ce0b3a99f389d40a308548af94d1730a7692c1874f1f
+3b8c758dd85e113ea340ce0b3a99f389

wfe2/wfe.go

@@ -109,7 +109,7 @@ type WebFrontEndImpl struct {
 	rnc nonce.Redeemer
 	// rncKey is the HMAC key used to derive the prefix of nonce backends used
 	// for nonce redemption.
-	rncKey        string
+	rncKey        []byte
 	accountGetter AccountGetter
 	log           blog.Logger
 	clk           clock.Clock
@@ -194,7 +194,7 @@ func NewWebFrontEndImpl(
 	sac sapb.StorageAuthorityReadOnlyClient,
 	gnc nonce.Getter,
 	rnc nonce.Redeemer,
-	rncKey string,
+	rncKey []byte,
 	accountGetter AccountGetter,
 	limiter *ratelimits.Limiter,
 	txnBuilder *ratelimits.TransactionBuilder,

wfe2/wfe_test.go

@@ -397,7 +397,8 @@ func setupWFE(t *testing.T) (WebFrontEndImpl, clock.FakeClock, requestSigner) {
 	log := blog.NewMock()
 
 	// Use derived nonces.
-	noncePrefix := nonce.DerivePrefix("192.168.1.1:8080", "b8c758dd85e113ea340ce0b3a99f389d40a308548af94d1730a7692c1874f1f")
+	rncKey := []byte("b8c758dd85e113ea340ce0b3a99f3894")
+	noncePrefix := nonce.DerivePrefix("192.168.1.1:8080", rncKey)
 	nonceService, err := nonce.NewNonceService(metrics.NoopRegisterer, 100, noncePrefix)
 	test.AssertNotError(t, err, "making nonceService")
 
@@ -458,7 +459,7 @@ func setupWFE(t *testing.T) (WebFrontEndImpl, clock.FakeClock, requestSigner) {
 		mockSA,
 		gnc,
 		rnc,
-		"rncKey",
+		rncKey,
 		mockSA,
 		limiter,
 		txnBuilder,