Skip to content

Commit 86decd5

Browse files
publicca: use RawURLEncoding instead of URLEncoding for unpadded base64 encoding (#15010) (#24283)
[upstream:d74edc196d16052716bebf3038fbe191c17a1d7b] Signed-off-by: Modular Magician <[email protected]>
1 parent 0f3bec0 commit 86decd5

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.changelog/15010.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
publicca: use `RawURLEncoding` instead of `URLEncoding` for unpadded base64 encoding
3+
```

google/services/publicca/resource_public_ca_external_account_key.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ func flattenPublicCAExternalAccountKeyB64urlMacKey(v interface{}, d *schema.Reso
191191
return ""
192192
}
193193

194-
dec, err := base64.StdEncoding.DecodeString(v.(string))
194+
dec, err := base64.RawStdEncoding.DecodeString(v.(string))
195195
if err != nil {
196196
return ""
197197
}
198198

199-
return base64.URLEncoding.EncodeToString(dec)
199+
return base64.RawURLEncoding.EncodeToString(dec)
200200
}
201201

202202
func resourcePublicCAExternalAccountKeyPostCreateSetComputedFields(d *schema.ResourceData, meta interface{}, res map[string]interface{}) error {

google/verify/validation.go

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

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

0 commit comments

Comments
 (0)