Merge pull request #116 from cloudwan/improve_webui_integration

Improve webui integration

Makefile

@@ -20,7 +20,7 @@ deps:
 
 format:
 	@echo "$(OK_COLOR)==> Formatting$(NO_COLOR)"
-	go-bindata -pkg util -o util/go-bindata.go etc/schema/... etc/extensions/... etc/templates/...
+	go-bindata -pkg util -o util/go-bindata.go etc/schema/... etc/extensions/... etc/templates/... public/...
 	go fmt ./...
 
 test:

README.md

@@ -31,7 +31,7 @@ see more [document](./docs/source/installation.rst)
 
 ## WebUI client
 ```
-https://localhost:9443/webui/ (or https://$APPNAME.herokuapp.com/webui/ )
+https://localhost:9443/ (or https://$APPNAME.herokuapp.com/ )
 ```
 
 Login with this ID/password

etc/gohan.yaml

@@ -28,8 +28,8 @@ tls:
     key_file: ./keys/key.pem
     cert_file: ./keys/cert.pem
 # document root of gohan API server
-# Note: only static and schema directoriy will be served
-document_root: "."
+# embedded webui get served if you use "embed" here
+document_root: "embed"
 # list of etcd backend servers
 #etcd:
 #    - "http://127.0.0.1:4001"

etc/heroku.yaml

@@ -28,8 +28,7 @@ tls:
     key_file: ./key.pem
     cert_file: ./cert.pem
 # document root of gohan API server
-# Note: only static and schema directoriy will be served
-document_root: "."
+document_root: "embed"
 # list of etcd backend servers
 #etcd:
 #    - "http://127.0.0.1:4001"

extension/gohanscript/autogen/lib.go

@@ -10,6 +10,46 @@ import (
 )
 
 func init() {
+	gohanscript.RegisterStmtParser("split",
+		func(stmt *gohanscript.Stmt) (func(*gohanscript.VM, *gohanscript.Context) (interface{}, error), error) {
+			return func(vm *gohanscript.VM, context *gohanscript.Context) (interface{}, error) {
+				value, _ := stmt.Arg("value", context).(string)
+				sep, _ := stmt.Arg("sep", context).(string)
+				var err error
+				result1, err := lib.Split(value, sep)
+				return result1, err
+			}, nil
+		})
+	gohanscript.RegisterMiniGoFunc("Split",
+		func(vm *gohanscript.VM, args []interface{}) []interface{} {
+			i := 0
+			value, _ := args[i].(string)
+			i++
+			sep, _ := args[i].(string)
+			i++
+			result1, result2 := lib.Split(value, sep)
+			return []interface{}{result1, result2}
+		})
+	gohanscript.RegisterStmtParser("join",
+		func(stmt *gohanscript.Stmt) (func(*gohanscript.VM, *gohanscript.Context) (interface{}, error), error) {
+			return func(vm *gohanscript.VM, context *gohanscript.Context) (interface{}, error) {
+				value, _ := stmt.Arg("value", context).([]interface{})
+				sep, _ := stmt.Arg("sep", context).(string)
+				var err error
+				result1, err := lib.Join(value, sep)
+				return result1, err
+			}, nil
+		})
+	gohanscript.RegisterMiniGoFunc("Join",
+		func(vm *gohanscript.VM, args []interface{}) []interface{} {
+			i := 0
+			value, _ := args[i].([]interface{})
+			i++
+			sep, _ := args[i].(string)
+			i++
+			result1, result2 := lib.Join(value, sep)
+			return []interface{}{result1, result2}
+		})
 	gohanscript.RegisterStmtParser("uuid",
 		func(stmt *gohanscript.Stmt) (func(*gohanscript.VM, *gohanscript.Context) (interface{}, error), error) {
 			return func(vm *gohanscript.VM, context *gohanscript.Context) (interface{}, error) {
@@ -929,44 +969,4 @@ func init() {
 			result1, result2 := lib.OpenstackEndpoint(client, endpointType, name, region, availability)
 			return []interface{}{result1, result2}
 		})
-	gohanscript.RegisterStmtParser("split",
-		func(stmt *gohanscript.Stmt) (func(*gohanscript.VM, *gohanscript.Context) (interface{}, error), error) {
-			return func(vm *gohanscript.VM, context *gohanscript.Context) (interface{}, error) {
-				value, _ := stmt.Arg("value", context).(string)
-				sep, _ := stmt.Arg("sep", context).(string)
-				var err error
-				result1, err := lib.Split(value, sep)
-				return result1, err
-			}, nil
-		})
-	gohanscript.RegisterMiniGoFunc("Split",
-		func(vm *gohanscript.VM, args []interface{}) []interface{} {
-			i := 0
-			value, _ := args[i].(string)
-			i++
-			sep, _ := args[i].(string)
-			i++
-			result1, result2 := lib.Split(value, sep)
-			return []interface{}{result1, result2}
-		})
-	gohanscript.RegisterStmtParser("join",
-		func(stmt *gohanscript.Stmt) (func(*gohanscript.VM, *gohanscript.Context) (interface{}, error), error) {
-			return func(vm *gohanscript.VM, context *gohanscript.Context) (interface{}, error) {
-				value, _ := stmt.Arg("value", context).([]interface{})
-				sep, _ := stmt.Arg("sep", context).(string)
-				var err error
-				result1, err := lib.Join(value, sep)
-				return result1, err
-			}, nil
-		})
-	gohanscript.RegisterMiniGoFunc("Join",
-		func(vm *gohanscript.VM, args []interface{}) []interface{} {
-			i := 0
-			value, _ := args[i].([]interface{})
-			i++
-			sep, _ := args[i].(string)
-			i++
-			result1, result2 := lib.Join(value, sep)
-			return []interface{}{result1, result2}
-		})
 }

server/middleware/middleware.go

@@ -121,10 +121,16 @@ func Authentication() martini.Handler {
 			return
 		}
 		//TODO(nati) make this configureable
-		if strings.HasPrefix(req.URL.Path, "/webui/") {
+		if strings.HasPrefix(req.URL.Path, "/webui") {
 			c.Next()
 			return
 		}
+
+		if req.URL.Path == "/" || req.URL.Path == "/webui" {
+			http.Redirect(res, req, "/webui/", http.StatusTemporaryRedirect)
+			return
+		}
+
 		if req.URL.Path == "/v2.0/tokens" {
 			c.Next()
 			return

server/server.go

@@ -33,7 +33,7 @@ import (
 	"github.com/cloudwan/gohan/sync/etcd"
 	"github.com/cloudwan/gohan/util"
 	"github.com/go-martini/martini"
-	//Import gohan extension buildins
+	"github.com/martini-contrib/staticbin"
 )
 
 type tls struct {
@@ -266,12 +266,18 @@ func NewServer(configFile string) (*Server, error) {
 			rw.Header().Add("Access-Control-Allow-Methods", "GET,PUT,POST,DELETE")
 		})
 	}
-	server.timelimit = config.GetInt("extention/timelimit", 30)
-	documentRoot := config.GetString("document_root", "./")
-	log.Info("Static file serving from %s", documentRoot)
-	documentRootABS, err := filepath.Abs(documentRoot)
-	server.martini.Use(martini.Static(documentRootABS))
-
+	server.timelimit = config.GetInt("extension/timelimit", 30)
+	documentRoot := config.GetString("document_root", "embed")
+	if documentRoot == "embed" {
+		m.Use(staticbin.Static("public", util.Asset))
+	} else {
+		log.Info("Static file serving from %s", documentRoot)
+		documentRootABS, err := filepath.Abs(documentRoot)
+		if err != nil {
+			return nil, err
+		}
+		server.martini.Use(martini.Static(documentRootABS))
+	}
 	server.mapRoutes()
 	return server, nil
 }

server/server_test.go

@@ -86,8 +86,8 @@ var _ = Describe("Server package test", func() {
 		})
 
 		Context("getting from baseURL", func() {
-			It("should return 404(Not Found)", func() {
-				testURL("GET", baseURL, adminTokenID, nil, http.StatusNotFound)
+			It("should return 200", func() {
+				testURL("GET", baseURL, adminTokenID, nil, http.StatusOK)
 			})
 		})
 
@@ -314,7 +314,7 @@ var _ = Describe("Server package test", func() {
 		It("should work", func() {
 			network := getNetwork("red", "red")
 
-			testURL("GET", baseURL, memberTokenID, nil, http.StatusNotFound)
+			testURL("GET", baseURL, memberTokenID, nil, http.StatusOK)
 			testURL("GET", networkPluralURL, memberTokenID, nil, http.StatusOK)
 			testURL("GET", networkPluralURL, "", nil, http.StatusUnauthorized)
 			testURL("GET", schemaURL, memberTokenID, nil, http.StatusOK)

server/server_test_config.yaml

@@ -5,7 +5,7 @@ schemas:
     - "embed://etc/schema/gohan.json"
     - "../tests/test_schema.yaml"
 address: ":19090"
-document_root: "../etc/"
+document_root: "embed"
 etcd:
     - "http://127.0.0.1:4001"
 keystone:

server/server_test_mysql_config.yaml

@@ -6,7 +6,7 @@ schemas:
     - "../etc/schema/gohan.json"
     - "../tests/test_schema.yaml"
 address: ":19090"
-document_root: "../etc/"
+document_root: "embed"
 etcd:
     - "http://127.0.0.1:4001"
 keystone: