Merge pull request #8 from secrethub/feature/overridable-html-page

Add flag to override served page
secrethub · May 18, 2020 · 224707f · 224707f
2 parents bab6de6 + 64c65b1
commit 224707f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/app/page.go b/app/page.go
@@ -1,6 +1,6 @@
 package app
 
-const page = `
+const defaultPage = `
 <!doctype html>
 <html lang="en">
 <head>

diff --git a/app/serve.go b/app/serve.go
@@ -3,6 +3,7 @@ package app
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 )
@@ -13,17 +14,28 @@ type Server struct {
 
 	appUsername string
 	appPassword string
+
+	page []byte
 }
 
-func NewServer(host string, port int) *Server {
+func NewServer(host string, port int, pagePath string) *Server {
 	username := os.Getenv("DEMO_USERNAME")
 	password := os.Getenv("DEMO_PASSWORD")
 
+	page := []byte(defaultPage)
+	if pagePath != "" {
+		altPage, err := ioutil.ReadFile(pagePath)
+		if err == nil {
+			page = altPage
+		}
+	}
+
 	return &Server{
 		host:        host,
 		port:        port,
 		appUsername: username,
 		appPassword: password,
+		page:        page,
 	}
 }
 
@@ -36,7 +48,7 @@ func (s *Server) Serve() error {
 }
 
 func (s *Server) ServeIndex(w http.ResponseWriter, r *http.Request) {
-	_, err := w.Write([]byte(page))
+	_, err := w.Write(s.page)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 	}

diff --git a/cli/serve.go b/cli/serve.go
@@ -14,6 +14,8 @@ type ServeCommand struct {
 
 	host string
 	port int
+
+	altPage string
 }
 
 func NewServeCommand(io ui.IO) *ServeCommand {
@@ -28,12 +30,13 @@ func (cmd *ServeCommand) Register(r command.Registerer) {
 
 	clause.Flag("host", "The host to serve the webpage on").Short('h').Default("127.0.0.1").StringVar(&cmd.host)
 	clause.Flag("port", "The port to serve the webpage on").Default("8080").IntVar(&cmd.port)
+	clause.Flag("alt-page", "Path to alternative page file to serve").StringVar(&cmd.altPage)
 
 	command.BindAction(clause, cmd.Run)
 }
 
 // Run handles the command with the options as specified in the command.
 func (cmd *ServeCommand) Run() error {
 	fmt.Fprintf(cmd.io.Stdout(), "Serving example app on http://%s:%d\n", cmd.host, cmd.port)
-	return app.NewServer(cmd.host, cmd.port).Serve()
+	return app.NewServer(cmd.host, cmd.port, cmd.altPage).Serve()
 }