Merge lp:~mattyw/sharinfoo/head-sha into lp:sharinfoo

[Matthew Williams]

Added support for a call to HEAD which will return the sha256 of the file contents.

The return will be base64 encoded

Added support for a call to HEAD which will return the sha256 of the file contents.

The return will be base64 encoded

[lp:~mattyw/sharinfoo/head-sha]

22. By Matthew Williams on 2014-01-13

added -sha to the client, added test for it

[Casey Marshall (cmars)]

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-01-10 12:08:44 +0000
+++ Makefile	2014-01-13 14:34:35 +0000
@@ -1,7 +1,7 @@
 check: install
 	shfood &
-	go test ./...
-	python ./tests/client_test.py
+	-go test ./...
+	-python ./tests/client_test.py
 	killall shfood
 
 install:

=== modified file 'client/client.go'
--- client/client.go	2014-01-10 11:49:42 +0000
+++ client/client.go	2014-01-13 14:34:35 +0000
@@ -201,5 +201,30 @@
 	}
 	_, err = io.Copy(os.Stdout, resp.Body)
 	return err
-	panic("no impl")
+}
+
+func Sha(addr, path string) (string, error) {
+	authString, err := loadAuth()
+	if err != nil {
+		return "", err
+	}
+	u := url.URL{
+		Scheme: "http",
+		Host:   addr,
+		Path:   path,
+	}
+	req, err := http.NewRequest("HEAD", u.String(), nil)
+	if err != nil {
+		return "", err
+	}
+	req.Header.Add("Authorization", authString)
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", err
+	}
+	if resp.StatusCode != 200 {
+		return "", fmt.Errorf(resp.Status)
+	}
+	sha := resp.Header.Get("Content-sha256")
+	return sha, nil
 }

=== modified file 'client/client_test.go'
--- client/client_test.go	2014-01-09 16:41:03 +0000
+++ client/client_test.go	2014-01-13 14:34:35 +0000
@@ -1,6 +1,8 @@
 package client
 
 import (
+	"crypto/sha256"
+	"encoding/base64"
 	"encoding/json"
 	. "launchpad.net/gocheck"
 	"testing"
@@ -8,7 +10,10 @@
 
 func Test(t *testing.T) { TestingT(t) }
 
-var addr = "localhost:8080"
+var (
+	addr   = "localhost:8080"
+	hasher = sha256.New()
+)
 
 type ClientSuite struct{}
 
@@ -43,3 +48,16 @@
 	err = Delete(addr, path)
 	c.Assert(err, IsNil)
 }
+
+func (s *ClientSuite) TestHead(c *C) {
+	data := []byte("hello there")
+	path := "/test-data"
+	err := Put(addr, path, data)
+	c.Assert(err, IsNil)
+	hasher.Write(data)
+	expected := base64.URLEncoding.EncodeToString(hasher.Sum(nil))
+
+	sha, err := Sha(addr, path)
+	c.Assert(err, IsNil)
+	c.Assert(sha, Equals, expected)
+}

=== modified file 'cmd/shfoo/main.go'
--- cmd/shfoo/main.go	2014-01-10 11:49:42 +0000
+++ cmd/shfoo/main.go	2014-01-13 14:34:35 +0000
@@ -34,6 +34,7 @@
 var with *string = flag.String("with", "", "Share read-access with user")
 var addr *string = flag.String("http", "localhost:8080", "Remote sharinfoo address")
 var access *string = flag.String("access", "", "Get list of users with access to this path")
+var sha *string = flag.String("sha", "", "Get the sha256 of the file")
 
 func die(err error) {
 	log.Println(err)
@@ -68,6 +69,12 @@
 		}
 		os.Stdout.Write(output)
 		fmt.Println("")
+	case *sha != "":
+		output, err := client.Sha(*addr, *sha)
+		if err != nil {
+			die(err)
+		}
+		fmt.Println(output)
 	default:
 		err = fmt.Errorf("No action specified")
 	}

=== modified file 'server.go'
--- server.go	2014-01-09 16:31:27 +0000
+++ server.go	2014-01-13 14:34:35 +0000
@@ -17,6 +17,8 @@
 package sharinfoo
 
 import (
+	"crypto/sha256"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -114,6 +116,30 @@
 		if err != nil {
 			log.Println(err)
 		}
+	case "HEAD":
+		hasher := sha256.New()
+		access, err := fs.store.Access(userId, path)
+		if err != nil {
+			respError(w, err)
+			return
+		}
+		if !access.CanRead() {
+			respForbidden(w)
+			return
+		}
+		content, err := fs.store.Get(path)
+		if err != nil {
+			respError(w, err)
+			return
+		}
+		_, err = io.Copy(hasher, content)
+		if err != nil {
+			respError(w, err)
+			return
+		}
+		sha := base64.URLEncoding.EncodeToString(hasher.Sum(nil))
+		w.Header().Add("Content-sha256", sha)
+		w.WriteHeader(http.StatusOK)
 	case "DELETE":
 		access, err := fs.store.Access(userId, path)
 		if err != nil {

=== modified file 'tests/client_test.py'
--- tests/client_test.py	2014-01-10 12:37:33 +0000
+++ tests/client_test.py	2014-01-13 14:34:35 +0000
@@ -4,6 +4,8 @@
 import sys
 import json
 import unittest
+import hashlib
+import base64
 
 sample_data = "sample.txt"
 test_data = "test.txt"
@@ -32,6 +34,12 @@
     subprocess.check_call(["shfoo", "-delete", "/%s" % path])
 
 
+def sha_command(path):
+    out = subprocess.Popen(["shfoo", "-sha", "/%s" % path],
+            stdout=subprocess.PIPE)
+    return out.stdout.read().strip()
+
+
 def access_command(path):
     out = subprocess.Popen(["shfoo", "-access", "/%s" % path],
             stdout=subprocess.PIPE)
@@ -67,5 +75,11 @@
         out = access_command(test_data)
         self.assertEquals(out[1]["[e-mail]"], True)
 
+    def test_sha(self):
+        sha = hashlib.sha256(open(sample_data).read()).digest()
+        expected = base64.urlsafe_b64encode(sha)
+        out = sha_command(test_data)
+        self.assertEquals(out, expected)
+
 if __name__ == '__main__':
     unittest.main()