Skip to content

fix: Base64 decoding to discard newline characters #1941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 16, 2024
Merged

fix: Base64 decoding to discard newline characters #1941

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cdc5b28
fix: Base64 decoding to discard newline characters
suztomo May 15, 2024
0a4bd64
implementation
suztomo May 15, 2024
67b40c8
Added explanation of the 2nd argument of withSeparator
suztomo May 15, 2024
5cee049
Commented out the reference implementation in test
suztomo May 15, 2024
4e2d7b7
adding test case for "+" character and new line character
suztomo May 15, 2024
2c5772d
clarified comment
suztomo May 16, 2024
be28670
test case with the slash character
suztomo May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clarified comment
  • Loading branch information
@suztomo
suztomo committed May 16, 2024
commit 2c5772d791ff07ed4b7670287b5413c1e406fd02
4 changes: 2 additions & 2 deletions google-http-client/src/main/java/com/google/api/client/util/Base64.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
public class Base64 {
// Guava's Base64 (https://datatracker.ietf.org/doc/html/rfc4648#section-4) decoders. When
// decoding, they discard the new line character so that the behavior matches what we had with
// Apache Commons Codec's decodeBase64. When encoding, they would insert a new line character
// every 64 (the 2nd argument of withSeparator method) characters. They are not used for encoding.
// Apache Commons Codec's decodeBase64.
// The 2nd argument of the withSeparator method, "64", does not have any effect in decoding.
private static final BaseEncoding BASE64_DECODER = BaseEncoding.base64().withSeparator("\n", 64);
private static final BaseEncoding BASE64URL_DECODER =
BaseEncoding.base64Url().withSeparator("\n", 64);
Expand Down