diff --git a/.gitignore b/.gitignore
index bb390eaf..e92da80c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ cover*.out
coverage.html
*.deb
tmp/
+statik/*
\ No newline at end of file
diff --git a/Makefile b/Makefile
index cae6554e..fbd3f410 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ COMBINED_GOPATH=$(GODEP_PATH):$(ORIGINAL_PATH)
.PHONY: packages deb test linux darwin windows
build:
+ statik -src=./dashboard
GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version=git-$(shell git rev-parse --short HEAD)" -o $(SERVER_NAME) ./cmd
GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version=git-$(shell git rev-parse --short HEAD)" -o $(CLI_NAME) ./cli
@@ -26,6 +27,7 @@ clean:
rm -f $(SERVER_NAME)
rm -f $(CLI_NAME)
rm -f *.deb
+ rm -f statik/*
test:
echo "Testing with" `go version`
diff --git a/api.go b/api.go
index 02edd9aa..5b08ef81 100644
--- a/api.go
+++ b/api.go
@@ -7,23 +7,40 @@ import (
"net"
"net/http"
"os"
- "strings"
+ _ "github.com/Shopify/toxiproxy/statik"
"github.com/Shopify/toxiproxy/toxics"
"github.com/gorilla/mux"
+ "github.com/rakyll/statik/fs"
"github.com/sirupsen/logrus"
)
type ApiServer struct {
Collection *ProxyCollection
+ Dashboard http.File
}
func NewServer() *ApiServer {
return &ApiServer{
Collection: NewProxyCollection(),
+ Dashboard: LoadDashboard(),
}
}
+func LoadDashboard() http.File {
+ statikFS, e := fs.New()
+ if e != nil {
+ log.Fatal(e)
+ }
+
+ file, e := statikFS.Open("/index.html")
+ if e != nil {
+ log.Fatal(e)
+ }
+
+ return file
+}
+
func (server *ApiServer) PopulateConfig(filename string) {
file, err := os.Open(filename)
if err != nil {
@@ -49,11 +66,7 @@ func (server *ApiServer) PopulateConfig(filename string) {
func StopBrowsersMiddleware(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- if strings.HasPrefix(r.UserAgent(), "Mozilla/") {
- http.Error(w, "User agent not allowed", 403)
- } else {
- h.ServeHTTP(w, r)
- }
+ h.ServeHTTP(w, r)
})
}
@@ -73,6 +86,7 @@ func (server *ApiServer) Listen(host string, port string) {
r.HandleFunc("/proxies/{proxy}/toxics/{toxic}", server.ToxicDelete).Methods("DELETE")
r.HandleFunc("/version", server.Version).Methods("GET")
+ r.HandleFunc("/", server.ServeDashboard).Methods("GET")
http.Handle("/", StopBrowsersMiddleware(r))
@@ -389,6 +403,18 @@ func (server *ApiServer) Version(response http.ResponseWriter, request *http.Req
}
}
+func (server *ApiServer) ServeDashboard(response http.ResponseWriter, request *http.Request) {
+ f := server.Dashboard
+
+ info, e := f.Stat()
+ if e != nil {
+ log.Fatal(e)
+ }
+
+ response.Header().Set("Content-Type", "text/html;charset=utf-8")
+ http.ServeContent(response, request, info.Name(), info.ModTime(), f)
+}
+
type ApiError struct {
Message string `json:"error"`
StatusCode int `json:"status"`
diff --git a/api_test.go b/api_test.go
index 306c49bf..e174fffe 100644
--- a/api_test.go
+++ b/api_test.go
@@ -36,32 +36,15 @@ func WithServer(t *testing.T, f func(string)) {
f("http://localhost:8475")
}
-func TestBrowserGets403(t *testing.T) {
+func TestDashboardIsAccessible(t *testing.T) {
WithServer(t, func(addr string) {
client := http.Client{}
- req, _ := http.NewRequest("GET", "http://localhost:8475/proxies", nil)
- req.Header.Add("User-Agent", "Mozilla/5.0 (Linux; Android 4.4.2); Nexus 5 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Mobile Safari/537.36 OPR/20.0.1396.72047")
-
- resp, _ := client.Do(req)
-
- if resp.StatusCode != 403 {
- t.Fatal("Browser-like UserAgent was not denied access to Toxiproxy")
- }
- })
-}
-
-func TestNonBrowserGets200(t *testing.T) {
- WithServer(t, func(addr string) {
- client := http.Client{}
-
- req, _ := http.NewRequest("GET", "http://localhost:8475/proxies", nil)
- req.Header.Add("User-Agent", "Wget/2.1")
-
+ req, _ := http.NewRequest("GET", "http://localhost:8475/", nil)
resp, _ := client.Do(req)
- if resp.StatusCode == 403 {
- t.Fatal("Non-Browser-like UserAgent was denied access to Toxiproxy")
+ if resp.StatusCode != 200 {
+ t.Fatal("Dashboard is not accessible at /")
}
})
}
diff --git a/dashboard/index.html b/dashboard/index.html
new file mode 100644
index 00000000..815e482d
--- /dev/null
+++ b/dashboard/index.html
@@ -0,0 +1,1028 @@
+
+
+
+ Toxiproxy
+
+
+
+
+
+
+
+
+
+