Fix bugs in GoogleStorageAuthentication (Issue 68)

Yaniv Inbar · Yaniv Inbar · commit 90bc88100b90 · 2010-12-20T13:07:29.000-05:00
diff --git a/google-api-client/src/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthentication.java b/google-api-client/src/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthentication.java
@@ -137,6 +137,9 @@ public void intercept(HttpRequest request) throws IOException {
           messageBuf.append('/').append(bucket);
         }
       }
+      if (url.pathParts != null) {
+        messageBuf.append(url.getRawPath());
+      }
       if (url.get("acl") != null) {
         messageBuf.append("?acl");
       } else if (url.get("location") != null) {
@@ -148,7 +151,6 @@ public void intercept(HttpRequest request) throws IOException {
       } else if (url.get("torrent") != null) {
         messageBuf.append("?torrent");
       }
-      messageBuf.append(url.getRawPath());
       try {
         request.headers.authorization =
             "GOOG1 " + accessKey + ":" + HmacSha.sign(secret, messageBuf.toString());
diff --git a/google-api-client/test/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthenticationTest.java b/google-api-client/test/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthenticationTest.java
@@ -1,21 +1,20 @@
 /*
  * Copyright (c) 2010 Google Inc.
- * 
- * 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
- * 
+ *
+ * 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
+ *
+ * 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.googleapis.auth.storage;
 
+import com.google.api.client.auth.HmacSha;
 import com.google.api.client.googleapis.GoogleHeaders;
 import com.google.api.client.googleapis.GoogleTransport;
 import com.google.api.client.http.HttpExecuteIntercepter;
@@ -25,31 +24,48 @@
 
 import junit.framework.TestCase;
 
-import java.io.IOException;
 import java.util.Arrays;
 
 /**
  * Tests {@link GoogleStorageAuthentication}.
- * 
+ *
  * @author Yaniv Inbar
  */
 public class GoogleStorageAuthenticationTest extends TestCase {
 
-  public GoogleStorageAuthenticationTest() {
-  }
+  private static final String ACCESS_KEY = "GOOGTS7C7FUP3AIRVJTE";
+  private static final String SECRET = "abc";
 
   public GoogleStorageAuthenticationTest(String name) {
     super(name);
   }
 
-  public void test() throws IOException {
+  public void test() throws Exception {
+    subtest("http://travel-maps.commondatastorage.googleapis.com/europe/france/paris.jpg",
+        "PUT\n" + "\n" + "image/jpg\n" + "Mon, 15 Feb  2010 21:30:39 GMT\n"
+            + "x-goog-acl:public-read\n" + "x-goog-meta-reviewer:bob,jane\n"
+            + "/travel-maps/europe/france/paris.jpg");
+    subtest("http://travel-maps.commondatastorage.googleapis.com/europe/france/paris.jpg?acl",
+        "PUT\n" + "\n" + "image/jpg\n" + "Mon, 15 Feb  2010 21:30:39 GMT\n"
+            + "x-goog-acl:public-read\n" + "x-goog-meta-reviewer:bob,jane\n"
+            + "/travel-maps/europe/france/paris.jpg?acl");
+    subtest("http://travel-maps.commondatastorage.googleapis.com?acl",
+        "PUT\n" + "\n" + "image/jpg\n" + "Mon, 15 Feb  2010 21:30:39 GMT\n"
+            + "x-goog-acl:public-read\n" + "x-goog-meta-reviewer:bob,jane\n" + "/travel-maps?acl");
+    subtest("http://travel-maps.commondatastorage.googleapis.com",
+        "PUT\n" + "\n" + "image/jpg\n" + "Mon, 15 Feb  2010 21:30:39 GMT\n"
+            + "x-goog-acl:public-read\n" + "x-goog-meta-reviewer:bob,jane\n" + "/travel-maps");
+    subtest("http://travel-maps.commondatastorage.googleapis.com/",
+        "PUT\n" + "\n" + "image/jpg\n" + "Mon, 15 Feb  2010 21:30:39 GMT\n"
+            + "x-goog-acl:public-read\n" + "x-goog-meta-reviewer:bob,jane\n" + "/travel-maps/");
+  }
+
+  private void subtest(String url, String messageToSign) throws Exception {
     HttpTransport transport = GoogleTransport.create();
-    GoogleStorageAuthentication.authorize(transport, "GOOGTS7C7FUP3AIRVJTE",
-        "abc");
+    GoogleStorageAuthentication.authorize(transport, ACCESS_KEY, SECRET);
     HttpExecuteIntercepter intercepter = transport.intercepters.get(1);
     HttpRequest request = transport.buildPutRequest();
-    request
-        .setUrl("http://travel-maps.commondatastorage.googleapis.com/europe/france/paris.jpg");
+    request.setUrl(url);
     GoogleHeaders headers = (GoogleHeaders) request.headers;
     headers.date = "Mon, 15 Feb  2010 21:30:39 GMT";
     MockHttpContent content = new MockHttpContent();
@@ -59,7 +75,7 @@ public void test() throws IOException {
     headers.googAcl = "public-read";
     headers.set("x-goog-meta-reviewer", Arrays.asList("bob", "jane"));
     intercepter.intercept(request);
-    assertEquals("GOOG1 GOOGTS7C7FUP3AIRVJTE:ovyTUuOaD+E6l/Xu+eOAhZ/8LKk=",
+    assertEquals(messageToSign, "GOOG1 " + ACCESS_KEY + ":" + HmacSha.sign(SECRET, messageToSign),
         request.headers.authorization);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ public void intercept(HttpRequest request) throws IOException {`
`137`	`137`	`messageBuf.append('/').append(bucket);`
`138`	`138`	`}`
`139`	`139`	`}`
	`140`	`+ if (url.pathParts != null) {`
	`141`	`+ messageBuf.append(url.getRawPath());`
	`142`	`+ }`
`140`	`143`	`if (url.get("acl") != null) {`
`141`	`144`	`messageBuf.append("?acl");`
`142`	`145`	`} else if (url.get("location") != null) {`
`@@ -148,7 +151,6 @@ public void intercept(HttpRequest request) throws IOException {`
`148`	`151`	`} else if (url.get("torrent") != null) {`
`149`	`152`	`messageBuf.append("?torrent");`
`150`	`153`	`}`
`151`		`- messageBuf.append(url.getRawPath());`
`152`	`154`	`try {`
`153`	`155`	`request.headers.authorization =`
`154`	`156`	`"GOOG1 " + accessKey + ":" + HmacSha.sign(secret, messageBuf.toString());`