Skip to content

Commit 9a054a0

Browse files
JesseLovelaceJesseLovelace
committed
---
yaml --- r: 20895 b: refs/heads/v4support c: d3acaf1 h: refs/heads/master i: 20893: ce24981 20891: 4b048ce 20887: 20d77c8 20879: 1af8432 20863: d0f7b21
1 parent ecf4338 commit 9a054a0

4 files changed

Lines changed: 13 additions & 15 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,4 +179,4 @@ refs/heads/igorbernstein2-patch-1: f62464ee14df1e44a3b173cdc3976563d1b3078b
179179
refs/heads/mrschmidt-collectiongroup: a6d948bf3731a7e1ce1fcd3db8ab733a3c9b17de
180180
refs/heads/release-google-cloud-java-v0.83.0: 4b55ec1b81b3886ede61ae868391a3cdf7eed90e
181181
refs/heads/release-google-cloud-java-v0.83.1-SNAPSHOT: 8d6db7ee534d12b1df38d8cf314871df76f87577
182-
refs/heads/v4support: 85a0dc23e3ec5150a30039178843e9efc52ee5bf
182+
refs/heads/v4support: d3acaf114c3719ac4686101fcaac686731177642

‎branches/v4support/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ private Map<String, String> getLowercaseHeaders(
108108

109109
String lowercaseHeaderName = headerName.toLowerCase();
110110

111-
// If present and we're V2, remove the x-goog-encryption-key and x-goog-encryption-key-sha256
112-
// headers. (CSEK headers are allowed for V4)
111+
// If present and we're V2, remove the x-goog-encryption-key and x-goog-encryption-key-sha256 headers.
112+
// (CSEK headers are allowed for V4)
113113
if (Storage.SignUrlOption.SignatureVersion.V2.equals(signatureVersion)
114114
&& ("x-goog-encryption-key".equals(lowercaseHeaderName)
115115
|| "x-goog-encryption-key-sha256".equals(lowercaseHeaderName))) {

‎branches/v4support/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ public class CanonicalExtensionHeadersSerializerTest {
3131

3232
@Before
3333
public void setUp() {
34-
v2Serializer =
35-
new CanonicalExtensionHeadersSerializer(Storage.SignUrlOption.SignatureVersion.V2);
36-
v4Serializer =
37-
new CanonicalExtensionHeadersSerializer(Storage.SignUrlOption.SignatureVersion.V4);
34+
v2Serializer = new CanonicalExtensionHeadersSerializer(Storage.SignUrlOption.SignatureVersion.V2);
35+
v4Serializer = new CanonicalExtensionHeadersSerializer(Storage.SignUrlOption.SignatureVersion.V4);
3836
}
3937

4038
@Test

‎branches/v4support/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,29 +74,29 @@ public void constructUnsignedPayloadWithExtensionHeaders() {
7474
public void constructV4UnsignedPayload() {
7575
Builder builder = new SignatureInfo.Builder(HttpMethod.PUT, 10L, URI.create(RESOURCE));
7676

77+
7778
builder.setSignatureVersion(Storage.SignUrlOption.SignatureVersion.V4);
7879
builder.setAccountEmail("[email protected]");
7980
builder.setTimestamp(100L);
8081

8182
String unsignedPayload = builder.build().constructUnsignedPayload();
8283

83-
assertTrue(
84-
unsignedPayload.startsWith(
85-
"GOOG4-RSA-SHA256\n" + "19691231T040000Z\n" + "19691231/auto/storage/goog4_request\n"));
84+
assertTrue(unsignedPayload.startsWith("GOOG4-RSA-SHA256\n" +
85+
"19691231T040000Z\n" +
86+
"19691231/auto/storage/goog4_request\n"));
8687
}
8788

88-
@Test
89-
public void constructV4QueryString() {
89+
@Test public void constructV4QueryString() {
9090
Builder builder = new SignatureInfo.Builder(HttpMethod.PUT, 10L, URI.create(RESOURCE));
9191

92+
9293
builder.setSignatureVersion(Storage.SignUrlOption.SignatureVersion.V4);
9394
builder.setAccountEmail("[email protected]");
9495
builder.setTimestamp(100L);
9596

9697
String queryString = builder.build().constructV4QueryString();
97-
assertEquals(
98-
"X-Goog-Algorithm=GOOG4-RSA-SHA256&X-Goog-Credential=me%40google.com%2F19691231%2F"
98+
assertEquals("X-Goog-Algorithm=GOOG4-RSA-SHA256&X-Goog-Credential=me%40google.com%2F19691231%2F"
9999
+ "auto%2Fstorage%2Fgoog4_request&X-Goog-Date=19691231T040000Z&X-Goog-Expires=10&X-Goog-SignedHeaders=host",
100-
queryString);
100+
queryString);
101101
}
102102
}

0 commit comments

Comments
 (0)