feat: fix post policy escape bug, update conformance tests #924
Conversation
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
product-auto-label
bot
added
the
api: storage
google-cla
bot
added
the
cla: yes
elharo
reviewed
Jul 23, 2021
| if (c >= 128) { // is a unicode character | ||
| escapedJson.append(String.format("\\u%04x", (int) c)); | ||
| } else { | ||
| switch (c) { | ||
| case '\\': | ||
| escapedJson.append("\\\\"); | ||
| // The JsonObject/JsonArray operations above handle quote escapes, so leave any "/"" |
There was a problem hiding this comment.
is forward slash meant here? Looks like it should be a backslash
There was a problem hiding this comment.
Should be, will fix
| StringBuilder escapedPolicy = new StringBuilder(); | ||
|
|
||
| // Java automatically unescapes the unicode escapes in the conformance tests, so we need to | ||
| // manually re-escape them | ||
| for (char c : expectedPolicy.toCharArray()) { | ||
| char[] expectedPolicyArray = expectedPolicy.toCharArray(); |
There was a problem hiding this comment.
This appears to be reproducing the algorithm in the test. That risks copying bugs from one place to another, and verifying the buggy behavior. Can you make the expected output a literal?
There was a problem hiding this comment.
Yeah, they both happen to need to do the same thing (escaping certain characters). Sorry, I'm unsure what you mean by "make it a literal," can you elaborate?
| @@ -93,7 +93,7 @@ | |||
| <dependency> | |||
| <groupId>com.google.cloud</groupId> | |||
| <artifactId>google-cloud-conformance-tests</artifactId> | |||
| <version>0.0.11</version> | |||
| <version>0.1.1</version> | |||
There was a problem hiding this comment.
Does this verify the change?
There was a problem hiding this comment.
Yeah, in fact the failures caused by it is what brought the bug to my attention (#510)
1 task
BenWhitehead
approved these changes
Aug 19, 2021
BenWhitehead
added
the
do not merge
JesseLovelace
removed
the
do not merge
gcf-merge-on-green bot
pushed a commit
that referenced
this pull request
Aug 24, 2021
🤖 I have created a release \*beep\* \*boop\* --- ## [2.1.0](https://github.com/googleapis/java-storage/compare/v2.0.2...v2.1.0) (2021-08-24) ### Features * fix post policy escape bug, update conformance tests ([#924](https://github.com/googleapis/java-storage/issues/924)) ([d8329c3](https://github.com/googleapis/java-storage/commit/d8329c34fe19fd8c6bba5579aa3c55490c1d4e6f)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.1.0 ([#976](https://github.com/googleapis/java-storage/issues/976)) ([5cac14d](https://github.com/googleapis/java-storage/commit/5cac14d7785ef3798c379d17cd44500958d9cc6a)) * update kms.version to v0.91.2 ([#977](https://github.com/googleapis/java-storage/issues/977)) ([1c60e6e](https://github.com/googleapis/java-storage/commit/1c60e6e6a34f662478043989b5b0bddea32cc5bf)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
V4 Post Policy had an issue where quotes in the json policy would get double escaped (
"would became\\"instead of\"), this fixes that issue and updates the conformance tests to the latest version