fixup! refactor dbcrypt: add Ciphers to wrap multiple AES256

johnstcn · johnstcn · commit ae6f623de2a1 · 2023-08-29T11:22:12.000Z
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -72,6 +72,9 @@ func (r *RootCmd) server() *clibase.Cmd {
 		}
 
 		if encKeys := options.DeploymentValues.ExternalTokenEncryptionKeys.Value(); len(encKeys) != 0 {
+			if len(encKeys) > 2 {
+				return nil, nil, xerrors.Errorf("only 2 external-token-encryption-keys are supported")
+			}
 			cs := make([]dbcrypt.Cipher, 0, len(encKeys))
 			for idx, ek := range encKeys {
 				dk, err := base64.StdEncoding.DecodeString(ek)

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,9 @@ func (r RootCmd) server() clibase.Cmd {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if encKeys := options.DeploymentValues.ExternalTokenEncryptionKeys.Value(); len(encKeys) != 0 {`
	`75`	`+ if len(encKeys) > 2 {`
	`76`	`+ return nil, nil, xerrors.Errorf("only 2 external-token-encryption-keys are supported")`
	`77`	`+ }`
`75`	`78`	`cs := make([]dbcrypt.Cipher, 0, len(encKeys))`
`76`	`79`	`for idx, ek := range encKeys {`
`77`	`80`	`dk, err := base64.StdEncoding.DecodeString(ek)`