Merge pull request #1554 from smallstep/fix-redacted-types

Fix redacted types in SCEP provisioner
smallstep · Sep 25, 2023 · 8fdcbd3 · 8fdcbd3
2 parents f505acb + 33bdae4
commit 8fdcbd3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/api/api.go b/api/api.go
@@ -245,10 +245,10 @@ func scepFromProvisioner(p *provisioner.SCEP) *models.SCEP {
 		IncludeRoot:                   p.IncludeRoot,
 		ExcludeIntermediate:           p.ExcludeIntermediate,
 		MinimumPublicKeyLength:        p.MinimumPublicKeyLength,
-		DecrypterCertificate:          redacted,
-		DecrypterKeyPEM:               redacted,
+		DecrypterCertificate:          []byte(redacted),
+		DecrypterKeyPEM:               []byte(redacted),
 		DecrypterKeyURI:               redacted,
-		DecrypterKeyPassword:          redacted,
+		DecrypterKeyPassword:          []byte(redacted),
 		EncryptionAlgorithmIdentifier: p.EncryptionAlgorithmIdentifier,
 		Options:                       p.Options,
 		Claims:                        p.Claims,

diff --git a/api/api_test.go b/api/api_test.go
@@ -1623,10 +1623,10 @@ func TestProvisionersResponse_MarshalJSON(t *testing.T) {
 				"includeRoot":                   true,
 				"excludeIntermediate":           true,
 				"challenge":                     "*** REDACTED ***",
-				"decrypterCertificate":          "*** REDACTED ***",
+				"decrypterCertificate":          []byte("*** REDACTED ***"),
 				"decrypterKey":                  "*** REDACTED ***",
-				"decrypterKeyPEM":               "*** REDACTED ***",
-				"decrypterKeyPassword":          "*** REDACTED ***",
+				"decrypterKeyPEM":               []byte("*** REDACTED ***"),
+				"decrypterKeyPassword":          []byte("*** REDACTED ***"),
 				"minimumPublicKeyLength":        2048,
 				"encryptionAlgorithmIdentifier": 2,
 			},

diff --git a/api/models/scep.go b/api/models/scep.go
@@ -25,10 +25,10 @@ type SCEP struct {
 	IncludeRoot                   bool                 `json:"includeRoot"`
 	ExcludeIntermediate           bool                 `json:"excludeIntermediate"`
 	MinimumPublicKeyLength        int                  `json:"minimumPublicKeyLength"`
-	DecrypterCertificate          string               `json:"decrypterCertificate"`
-	DecrypterKeyPEM               string               `json:"decrypterKeyPEM"`
+	DecrypterCertificate          []byte               `json:"decrypterCertificate"`
+	DecrypterKeyPEM               []byte               `json:"decrypterKeyPEM"`
 	DecrypterKeyURI               string               `json:"decrypterKey"`
-	DecrypterKeyPassword          string               `json:"decrypterKeyPassword"`
+	DecrypterKeyPassword          []byte               `json:"decrypterKeyPassword"`
 	EncryptionAlgorithmIdentifier int                  `json:"encryptionAlgorithmIdentifier"`
 	Options                       *provisioner.Options `json:"options,omitempty"`
 	Claims                        *provisioner.Claims  `json:"claims,omitempty"`