Skip to content

Commit d74edc1

Browse files
publicca: use RawURLEncoding instead of URLEncoding for unpadded base64 encoding (#15010)
1 parent 70c7077 commit d74edc1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mmv1/templates/terraform/custom_flatten/publicca_b64url_mac_key.go.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.Reso
1515
return ""
1616
}
1717

18-
dec, err := base64.StdEncoding.DecodeString(v.(string))
18+
dec, err := base64.RawStdEncoding.DecodeString(v.(string))
1919
if err != nil {
2020
return ""
2121
}
2222

23-
return base64.URLEncoding.EncodeToString(dec)
23+
return base64.RawURLEncoding.EncodeToString(dec)
2424
}

mmv1/third_party/terraform/verify/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func ValidateBase64String(i interface{}, val string) ([]string, []error) {
290290
}
291291

292292
func ValidateBase64URLString(i interface{}, val string) ([]string, []error) {
293-
_, err := base64.URLEncoding.DecodeString(i.(string))
293+
_, err := base64.RawURLEncoding.DecodeString(i.(string))
294294
if err != nil {
295295
return nil, []error{fmt.Errorf("could not decode %q as a valid base64URL value.", val)}
296296
}

0 commit comments

Comments
 (0)