-
Notifications
You must be signed in to change notification settings - Fork 448
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: decode uri path components correctly (#913)
* feat: decode uri path components correctly The old implementation was incorrecly treating '+' as a space. Now the only things that get decoded in the path are uri escaped sequences. Fixes #398 * tweak javadoc * remove hardcoded string
- Loading branch information
Showing
5 changed files
with
106 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
google-http-client/src/test/java/com/google/api/client/util/escape/CharEscapersTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright 2019 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
* in compliance with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License | ||
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
* or implied. See the License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
|
||
package com.google.api.client.util.escape; | ||
|
||
import junit.framework.TestCase; | ||
|
||
public class CharEscapersTest extends TestCase { | ||
|
||
public void testDecodeUriPath() { | ||
subtestDecodeUriPath(null, null); | ||
subtestDecodeUriPath("", ""); | ||
subtestDecodeUriPath("abc", "abc"); | ||
subtestDecodeUriPath("a+b%2Bc", "a+b+c"); | ||
subtestDecodeUriPath("Go%3D%23%2F%25%26%20?%3Co%3Egle", "Go=#/%& ?<o>gle"); | ||
} | ||
|
||
private void subtestDecodeUriPath(String input, String expected) { | ||
String actual = CharEscapers.decodeUriPath(input); | ||
assertEquals(expected, actual); | ||
} | ||
|
||
public void testDecodeUri_IllegalArgumentException() { | ||
subtestDecodeUri_IllegalArgumentException("abc%-1abc"); | ||
subtestDecodeUri_IllegalArgumentException("%JJ"); | ||
subtestDecodeUri_IllegalArgumentException("abc%0"); | ||
} | ||
|
||
private void subtestDecodeUri_IllegalArgumentException(String input) { | ||
boolean thrown = false; | ||
try { | ||
CharEscapers.decodeUriPath(input); | ||
} catch (IllegalArgumentException e) { | ||
thrown = true; | ||
} | ||
assertTrue(thrown); | ||
} | ||
} |
1 comment
on commit 7d4a048
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This commit added incompatibility with Android API 17 because java.nio.charset.StandardCharsets;
It is possible fix it without using that? I know it is old Android, but still there is lot of tablets with that version of Android.
Thanks
This change breaks accessing objects using the
google-api-services-storage
with whitespace in object names. Input parameterencodedPath
is like/storage/v1/b/test.cyberduck.ch/o/msIwJ6Ac+ZQ8U7otu
. Google Storage API does not accept+
but key names must be percent encoded. In googleapis/java-storage#57