Merge pull request #14 from github/mgmt

Management UI updates

Author: rubyist

.gitignore

@@ -1,3 +1,4 @@
 dist
+lfs-test-server
 lfs-test-server-out.*
 lfs-test-server-release.*

CONTRIBUTING.md

@@ -23,6 +23,12 @@ would like to make that are not dependent upon each other, consider submitting
 them as separate pull requests.
 - Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 
+## Updating management templates
+0. Install go.rice with `go install github.com/GeertJohan/go.rice`
+0. Run `rice embed-go` after all template changes have been made
+0. Commit the change
+0. Submit a pull request.
+
 ## Updating 3rd party packages
 
 0. Run `godep save` to add new dependencies.

content_store.go

@@ -30,14 +30,14 @@ func NewContentStore(base string) (*ContentStore, error) {
 
 // Get takes a Meta object and retreives the content from the store, returning
 // it as an io.Reader.
-func (s *ContentStore) Get(meta *Meta) (io.Reader, error) {
+func (s *ContentStore) Get(meta *MetaObject) (io.Reader, error) {
 	path := filepath.Join(s.basePath, transformKey(meta.Oid))
 
 	return os.Open(path)
 }
 
 // Put takes a Meta object and an io.Reader and writes the content to the store.
-func (s *ContentStore) Put(meta *Meta, r io.Reader) error {
+func (s *ContentStore) Put(meta *MetaObject, r io.Reader) error {
 	path := filepath.Join(s.basePath, transformKey(meta.Oid))
 	tmpPath := path + ".tmp"
 
@@ -78,7 +78,7 @@ func (s *ContentStore) Put(meta *Meta, r io.Reader) error {
 }
 
 // Exists returns true if the object exists in the content store.
-func (s *ContentStore) Exists(meta *Meta) bool {
+func (s *ContentStore) Exists(meta *MetaObject) bool {
 	path := filepath.Join(s.basePath, transformKey(meta.Oid))
 	if _, err := os.Stat(path); os.IsNotExist(err) {
 		return false

content_store_test.go

@@ -14,7 +14,7 @@ func TestContenStorePut(t *testing.T) {
 	setup()
 	defer teardown()
 
-	m := &Meta{
+	m := &MetaObject{
 		Oid:  "6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72",
 		Size: 12,
 	}
@@ -35,7 +35,7 @@ func TestContenStorePutHashMismatch(t *testing.T) {
 	setup()
 	defer teardown()
 
-	m := &Meta{
+	m := &MetaObject{
 		Oid:  "6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72",
 		Size: 12,
 	}
@@ -56,7 +56,7 @@ func TestContenStorePutSizeMismatch(t *testing.T) {
 	setup()
 	defer teardown()
 
-	m := &Meta{
+	m := &MetaObject{
 		Oid:  "6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72",
 		Size: 14,
 	}
@@ -77,7 +77,7 @@ func TestContenStoreGet(t *testing.T) {
 	setup()
 	defer teardown()
 
-	m := &Meta{
+	m := &MetaObject{
 		Oid:  "6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72",
 		Size: 12,
 	}
@@ -103,7 +103,7 @@ func TestContenStoreGetNonExisting(t *testing.T) {
 	setup()
 	defer teardown()
 
-	_, err := contentStore.Get(&Meta{Oid: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"})
+	_, err := contentStore.Get(&MetaObject{Oid: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"})
 	if err == nil {
 		t.Fatalf("expected to get an error, but content existed")
 	}
@@ -113,7 +113,7 @@ func TestContenStoreExists(t *testing.T) {
 	setup()
 	defer teardown()
 
-	m := &Meta{
+	m := &MetaObject{
 		Oid:  "6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72",
 		Size: 12,
 	}

harbour_test.go

@@ -240,7 +240,7 @@ func TestPut(t *testing.T) {
 		t.Fatalf("expected status 200, got %d", res.StatusCode)
 	}
 
-	r, err := testContentStore.Get(&Meta{Oid: contentOid})
+	r, err := testContentStore.Get(&MetaObject{Oid: contentOid})
 	if err != nil {
 		t.Fatalf("error retreiving from content store: %s", err)
 	}
@@ -361,7 +361,7 @@ func seedMetaStore() error {
 }
 
 func seedContentStore() error {
-	meta := &Meta{Oid: contentOid, Size: contentSize}
+	meta := &MetaObject{Oid: contentOid, Size: contentSize}
 	buf := bytes.NewBuffer([]byte(content))
 	if err := testContentStore.Put(meta, buf); err != nil {
 		return err

main.go

@@ -11,7 +11,7 @@ import (
 const (
 	contentMediaType = "application/vnd.git-lfs"
 	metaMediaType    = contentMediaType + "+json"
-	version          = "0.1.0"
+	version          = "0.1.1"
 )
 
 var (

meta_store.go

@@ -51,12 +51,12 @@ func NewMetaStore(dbFile string) (*MetaStore, error) {
 
 // Get retrieves the Meta information for an object given information in
 // RequestVars
-func (s *MetaStore) Get(v *RequestVars) (*Meta, error) {
+func (s *MetaStore) Get(v *RequestVars) (*MetaObject, error) {
 	if !s.authenticate(v.Authorization) {
 		return nil, newAuthError()
 	}
 
-	var meta Meta
+	var meta MetaObject
 	var value []byte
 
 	err := s.db.View(func(tx *bolt.Tx) error {
@@ -87,7 +87,7 @@ func (s *MetaStore) Get(v *RequestVars) (*Meta, error) {
 }
 
 // Put writes meta information from RequestVars to the store.
-func (s *MetaStore) Put(v *RequestVars) (*Meta, error) {
+func (s *MetaStore) Put(v *RequestVars) (*MetaObject, error) {
 	if !s.authenticate(v.Authorization) {
 		return nil, newAuthError()
 	}
@@ -100,7 +100,7 @@ func (s *MetaStore) Put(v *RequestVars) (*Meta, error) {
 
 	var buf bytes.Buffer
 	enc := gob.NewEncoder(&buf)
-	meta := Meta{Oid: v.Oid, Size: v.Size}
+	meta := MetaObject{Oid: v.Oid, Size: v.Size}
 	err := enc.Encode(meta)
 	if err != nil {
 		return nil, err
@@ -190,6 +190,32 @@ func (s *MetaStore) Users() ([]*MetaUser, error) {
 	return users, err
 }
 
+// Objects returns all MetaObjects in the meta store
+func (s *MetaStore) Objects() ([]*MetaObject, error) {
+	var objects []*MetaObject
+
+	err := s.db.View(func(tx *bolt.Tx) error {
+		bucket := tx.Bucket(objectsBucket)
+		if bucket == nil {
+			return errNoBucket
+		}
+
+		bucket.ForEach(func(k, v []byte) error {
+			var meta MetaObject
+			dec := gob.NewDecoder(bytes.NewBuffer(v))
+			err := dec.Decode(&meta)
+			if err != nil {
+				return err
+			}
+			objects = append(objects, &meta)
+			return nil
+		})
+		return nil
+	})
+
+	return objects, err
+}
+
 // authenticate uses the authorization string to determine whether
 // or not to proceed. This server assumes an HTTP Basic auth format.
 func (s *MetaStore) authenticate(authorization string) bool {

mgmt-css.rice-box.go

@@ -4,37 +4,68 @@ import (
 	"errors"
 	"fmt"
 	"html/template"
+	"io"
 	"net/http"
 
+	"github.com/GeertJohan/go.rice"
 	"github.com/gorilla/mux"
 )
 
+var (
+	cssBox      *rice.Box
+	templateBox *rice.Box
+)
+
+type pageData struct {
+	Name    string
+	Config  *Configuration
+	Users   []*MetaUser
+	Objects []*MetaObject
+}
+
 func (a *App) addMgmt(r *mux.Router) {
 	r.HandleFunc("/mgmt", basicAuth(a.indexHandler)).Methods("GET")
+	r.HandleFunc("/mgmt/objects", basicAuth(a.objectsHandler)).Methods("GET")
+	r.HandleFunc("/mgmt/users", basicAuth(a.usersHandler)).Methods("GET")
 	r.HandleFunc("/mgmt/add", basicAuth(a.addUserHandler)).Methods("POST")
 	r.HandleFunc("/mgmt/del", basicAuth(a.delUserHandler)).Methods("POST")
+
+	cssBox = rice.MustFindBox("mgmt/css")
+	templateBox = rice.MustFindBox("mgmt/templates")
+	r.HandleFunc("/mgmt/css/{file}", basicAuth(cssHandler))
+}
+
+func cssHandler(w http.ResponseWriter, r *http.Request) {
+	file := mux.Vars(r)["file"]
+	f, err := cssBox.Open(file)
+	if err != nil {
+		writeStatus(w, r, 404)
+		return
+	}
+
+	w.Header().Set("Content-Type", "text/css")
+
+	io.Copy(w, f)
+	f.Close()
 }
 
 func basicAuth(h http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if Config.AdminUser == "" || Config.AdminPass == "" {
-			http.Error(w, "Not Found", 404)
-			logRequest(r, 404)
+			writeStatus(w, r, 404)
 			return
 		}
 
 		user, pass, ok := r.BasicAuth()
 		if !ok {
 			w.Header().Set("WWW-Authenticate", "Basic realm=mgmt")
-			http.Error(w, "authorization failed", 401)
-			logRequest(r, 401)
+			writeStatus(w, r, 401)
 			return
 		}
 
 		if user != Config.AdminUser || pass != Config.AdminPass {
 			w.Header().Set("WWW-Authenticate", "Basic realm=mgmt")
-			http.Error(w, "authorization failed", 401)
-			logRequest(r, 401)
+			writeStatus(w, r, 401)
 			return
 		}
 
@@ -44,22 +75,33 @@ func basicAuth(h http.HandlerFunc) http.HandlerFunc {
 }
 
 func (a *App) indexHandler(w http.ResponseWriter, r *http.Request) {
-	t := template.Must(template.New("main").Parse(bodyTemplate))
-	t.New("body").Parse(indexTemplate)
+	if err := render(w, "config.tmpl", pageData{Name: "index", Config: Config}); err != nil {
+		writeStatus(w, r, 404)
+	}
+}
 
-	type lfs struct {
-		Users []*MetaUser
+func (a *App) objectsHandler(w http.ResponseWriter, r *http.Request) {
+	objects, err := a.metaStore.Objects()
+	if err != nil {
+		fmt.Fprintf(w, "Error retrieving objects: %s", err)
+		return
 	}
 
+	if err := render(w, "objects.tmpl", pageData{Name: "objects", Objects: objects}); err != nil {
+		writeStatus(w, r, 404)
+	}
+}
+
+func (a *App) usersHandler(w http.ResponseWriter, r *http.Request) {
 	users, err := a.metaStore.Users()
 	if err != nil {
 		fmt.Fprintf(w, "Error retrieving users: %s", err)
 		return
 	}
 
-	l := &lfs{Users: users}
-
-	t.Execute(w, l)
+	if err := render(w, "users.tmpl", pageData{Name: "users", Users: users}); err != nil {
+		writeStatus(w, r, 404)
+	}
 }
 
 func (a *App) addUserHandler(w http.ResponseWriter, r *http.Request) {
@@ -75,7 +117,7 @@ func (a *App) addUserHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	http.Redirect(w, r, "/mgmt", 302)
+	http.Redirect(w, r, "/mgmt/users", 302)
 }
 
 func (a *App) delUserHandler(w http.ResponseWriter, r *http.Request) {
@@ -90,7 +132,24 @@ func (a *App) delUserHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	http.Redirect(w, r, "/mgmt", 302)
+	http.Redirect(w, r, "/mgmt/users", 302)
+}
+
+func render(w http.ResponseWriter, tmpl string, data pageData) error {
+	bodyString, err := templateBox.String("body.tmpl")
+	if err != nil {
+		return err
+	}
+
+	contentString, err := templateBox.String(tmpl)
+	if err != nil {
+		return err
+	}
+
+	t := template.Must(template.New("main").Parse(bodyString))
+	t.New("content").Parse(contentString)
+
+	return t.Execute(w, data)
 }
 
 func authenticate(r *http.Request) error {
@@ -110,27 +169,3 @@ func authenticate(r *http.Request) error {
 	}
 	return err
 }
-
-var bodyTemplate = `<html>
-<head>
-	<title>Git LFS Server Management</title>
-</head>
-<body>
-{{template "body" .}}
-</body>
-</html>
-`
-
-var indexTemplate = `
-<h2>Users</h2>
-{{range .Users}}
-<div>{{.Name}} <form method="POST" action="/mgmt/del"><input type="hidden" name="name" value="{{.Name}}"/><input type="submit" value="Delete"/></form></div>
-{{end}}
-
-<form method="POST" action="/mgmt/add">
-<label id="name">Name:</label>
-<input type="text" name="name" />
-<input type="password" name="password" />
-<input type="submit" value="Add User" />
-</form>
-`