[go: nahoru, domu]
Skip to content
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

Jump to bottom

fix: Base64 decoding to discard newline characters #1941

Merged
merged 7 commits into from
May 16, 2024
+83 −2
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
Commented out the reference implementation in test
  • Loading branch information
@suztomo
suztomo committed May 15, 2024
commit 5cee049d101272170980d4fb4355cd5d6aa01a99
22 changes: 12 additions & 10 deletions google-http-client/src/test/java/com/google/api/client/util/Base64Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@ public void test_decodeBase64_newline_character_invalid_length() {

// This is a reference implementation by Apache Commons Codec. It discards the new line
// characters.
assertEquals(
"abcdef",
new String(
org.apache.commons.codec.binary.Base64.decodeBase64(encodedString),
StandardCharsets.UTF_8));
// assertEquals(
// "abcdef",
// new String(
// org.apache.commons.codec.binary.Base64.decodeBase64(encodedString),
// StandardCharsets.UTF_8));

// This is our implementation
assertEquals("abcdef", new String(Base64.decodeBase64(encodedString), StandardCharsets.UTF_8));
}
Expand All @@ -95,11 +96,12 @@ public void test_decodeBase64_newline_character_between() {

// This is a reference implementation by Apache Commons Codec. It discards the new line
// characters.
assertEquals(
"ab",
new String(
org.apache.commons.codec.binary.Base64.decodeBase64(encodedString),
StandardCharsets.UTF_8));
// assertEquals(
// "ab",
// new String(
// org.apache.commons.codec.binary.Base64.decodeBase64(encodedString),
// StandardCharsets.UTF_8));

// This is our implementation
assertEquals("ab", new String(Base64.decodeBase64(encodedString), StandardCharsets.UTF_8));
}
Expand Down
Loading