Merge lp:~rvb/gwacl/anon-access into lp:gwacl

[Raphaël Badin]

Allow anon access to the storage API.

This branch changes the gwacl client object so that if the key is the empty string, it will perform anon (i.e. non-authenticated) access.

This is needed because the provider needs to access a public container (i.e. a canonical-maintained container that is publicly readable) to get the tools.
One might argue that the proper way to do this is to split the 'Account' variable into 2: the account used to sign the request and the account to access but this way of doing things is simpler and completely addresses my use case.

This was pre-imp'ed with Gavin.

[Gavin Panella (allenap)]

[1]

Commit message:

  Allow anon access.

It's worth mentioning that this is for the storage API only.

[2]

+    // Access key: access will be done anonymously if the key is the empty
+    // string.

s/will be done anonymously/will be anonymous/

review: Approve

[lp:~rvb/gwacl/anon-access]

129. By Raphaël Badin on 2013-06-24

Fix comment.

[Raphaël Badin (rvb)]

Thanks for the review!

> [1]
>
> Commit message:
>
>  Allow anon access.
>
> It's worth mentioning that this is for the storage API only.

Right, done.

> [2]
>
> +    // Access key: access will be done anonymously if the key is the empty
> +    // string.
>
> s/will be done anonymously/will be anonymous/

Okay, done.

=== modified file 'example/storage/run.go'
--- example/storage/run.go	2013-06-21 03:39:08 +0000
+++ example/storage/run.go	2013-06-24 14:42:33 +0000
@@ -42,7 +42,7 @@
 
 func getParams() (string, error) {
     flag.StringVar(&account, "account", "", "Storage account name")
-    flag.StringVar(&key, "key", "", "A valid storage account key (base64 encoded)")
+    flag.StringVar(&key, "key", "", "A valid storage account key (base64 encoded), defaults to the empty string (i.e. anonymous access)")
     flag.StringVar(&container, "container", "", "Name of the container to use")
     flag.StringVar(&filename, "filename", "", "File containing blob/page to upload/download")
     flag.StringVar(&prefix, "prefix", "", "Prefix to match when listing blobs")
@@ -52,8 +52,8 @@
     flag.StringVar(&pagerange, "pagerange", "", "When uploading to a page blob, this specifies what range in the blob. Use the format 'start-end', e.g. -pagerange 1024-2048")
     flag.Parse()
 
-    if account == "" || key == "" {
-        return "", fmt.Errorf("Must supply account and key parameters")
+    if account == "" {
+        return "", fmt.Errorf("Must supply account parameter")
     }
 
     if len(flag.Args()) != 1 {

=== modified file 'storage_base.go'
--- storage_base.go	2013-06-21 14:09:42 +0000
+++ storage_base.go	2013-06-24 14:42:33 +0000
@@ -183,8 +183,11 @@
 // Don't make any further changes to the request before sending it, or the
 // signature will not be valid.
 func (context *StorageContext) signRequest(req *http.Request) {
-    header := composeAuthHeader(req, context.Account, context.Key)
-    req.Header.Set("Authorization", header)
+    // Only sign the request if the key is not empty.
+    if context.Key != "" {
+        header := composeAuthHeader(req, context.Account, context.Key)
+        req.Header.Set("Authorization", header)
+    }
 }
 
 // StorageContext keeps track of the mandatory parameters required to send a
@@ -192,8 +195,9 @@
 // the client is only created once for all requests.
 type StorageContext struct {
     Account string
-    Key     string
-    client  *http.Client
+    // Access key: access will be anonymous if the key is the empty string.
+    Key    string
+    client *http.Client
 }
 
 // getClient is used when sending a request.  If called with an existing client

=== modified file 'storage_base_test.go'
--- storage_base_test.go	2013-06-21 15:06:12 +0000
+++ storage_base_test.go	2013-06-24 14:42:33 +0000
@@ -195,6 +195,18 @@
     c.Assert(req.Header.Get("Authorization"), Equals, expected)
 }
 
+func (suite *TestSignRequest) TestDoesNotAddHeaderIfEmptyKey(c *C) {
+    req, err := http.NewRequest(
+        "GET", "http://example.com/mypath?Kevin=Perry&foo=bar", nil)
+    c.Assert(err, IsNil)
+    c.Assert(req.Header.Get("Authorization"), Equals, "")
+
+    context := StorageContext{client: nil, Account: "myname", Key: ""}
+    context.signRequest(req)
+
+    c.Assert(req.Header.Get("Authorization"), Equals, "")
+}
+
 type TestRequestHeaders struct{}
 
 var _ = Suite(&TestRequestHeaders{})