fix: use random UUID for multipart boundary delimiter #916

dmitry-fa · 2019-12-16T07:47:54Z

Fixes #909
Fixes googleapis/google-cloud-java#6386

googlebot · 2019-12-16T07:48:13Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

googlebot · 2019-12-16T08:16:29Z

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

elharo · 2019-12-30T16:05:00Z

google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java


  public MultipartContent() {
-    super(new HttpMediaType("multipart/related").setParameter("boundary", "__END_OF_PART__"));
+    this("__END_OF_PART__" + java.util.UUID.randomUUID().toString() + "__");


Is there a reason not to import java.util.UUID? e.g a conflict with a similarly named class?

elharo · 2019-12-30T16:05:57Z

google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java

+            {"<xml>Hi</xml>", "application/xml"},
+            {"{x:1,y:2}", "application/json"}
+    };
+    StringBuilder expectedContentSB = new StringBuilder();


no abbreviations per google style, but simply "expectedContent" or even just expected is fine.

expectedContent is used later. renamed to expectedStringBuilder

elharo · 2019-12-30T16:06:22Z

google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java

+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    content.writeTo(out);
+    String expectedContent = expectedContentSB.toString();
+    assertEquals(expectedContent, out.toString());


out.toString needs to specify a locale

fixed in two places. Thanks for catching that.

…en-plugin to v1.6.13 (googleapis#916) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.sonatype.plugins:nexus-staging-maven-plugin](http://www.sonatype.com/) ([source](https://togithub.com/sonatype/nexus-maven-plugins)) | `1.6.12` -> `1.6.13` | [![age](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/compatibility-slim/1.6.12)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/confidence-slim/1.6.12)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>sonatype/nexus-maven-plugins</summary> ### [`v1.6.13`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.12...release-1.6.13) [Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.12...release-1.6.13) </details> --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-auth-library-java).

dmitry-fa requested a review from a team as a code owner December 16, 2019 07:47

googlebot added the cla: no This human has *not* signed the Contributor License Agreement. label Dec 16, 2019

dmitry-fa force-pushed the df67450/google-http-java-client branch from d4b8f7d to 787b159 Compare December 16, 2019 08:16

googlebot added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Dec 16, 2019

fix: use random uuid string as boundary

9971579

dmitry-fa force-pushed the df67450/google-http-java-client branch from 787b159 to 9971579 Compare December 16, 2019 08:23

athakor added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 16, 2019

kokoro-team removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 16, 2019

dmitry-fa changed the title ~~Fixes #909 Use random UUID string as boundary instead of hardcoded '__END_OF_PART__'~~ Fixes #909 and closes googleapis/google-cloud-java/#6386 Dec 16, 2019

dmitry-fa changed the title ~~Fixes #909 and closes googleapis/google-cloud-java/#6386~~ Fixes #909 and closes googleapis/google-cloud-java#6386 Dec 16, 2019

elharo reviewed Dec 30, 2019

View reviewed changes

fix: use random uuid string as boundary

5d8300b

chingor13 changed the title ~~Fixes #909 and closes googleapis/google-cloud-java#6386~~ fix: use random UUID for multipart boundary delimiter Dec 30, 2019

chingor13 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 30, 2019

kokoro-team removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 30, 2019

elharo approved these changes Dec 30, 2019

View reviewed changes

chingor13 merged commit 91c20a3 into googleapis:master Dec 30, 2019

dmitry-fa deleted the df67450/google-http-java-client branch January 15, 2020 09:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: use random UUID for multipart boundary delimiter #916

fix: use random UUID for multipart boundary delimiter #916

dmitry-fa commented Dec 16, 2019 •

edited by chingor13

googlebot commented Dec 16, 2019

googlebot commented Dec 16, 2019

elharo Dec 30, 2019

dmitry-fa Dec 30, 2019

elharo Dec 30, 2019

dmitry-fa Dec 30, 2019

elharo Dec 30, 2019

dmitry-fa Dec 30, 2019

fix: use random UUID for multipart boundary delimiter #916

fix: use random UUID for multipart boundary delimiter #916

Conversation

dmitry-fa commented Dec 16, 2019 • edited by chingor13

googlebot commented Dec 16, 2019

What to do if you already signed the CLA

Individual signers

Corporate signers

googlebot commented Dec 16, 2019

elharo Dec 30, 2019

Choose a reason for hiding this comment

dmitry-fa Dec 30, 2019

Choose a reason for hiding this comment

elharo Dec 30, 2019

Choose a reason for hiding this comment

dmitry-fa Dec 30, 2019

Choose a reason for hiding this comment

elharo Dec 30, 2019

Choose a reason for hiding this comment

dmitry-fa Dec 30, 2019

Choose a reason for hiding this comment

dmitry-fa commented Dec 16, 2019 •

edited by chingor13