From 5ca754ab5f08d56de72a824be14c8fe95d2ee912 Mon Sep 17 00:00:00 2001
From: afg <afg984@gmail.com>
Date: Tue, 28 Aug 2018 07:40:04 +0800
Subject: [PATCH] Serve additional static files on the HTTP port

---
 pixiecore/cli/cli.go   | 24 ++++++++++++++++++------
 pixiecore/http.go      |  5 +++++
 pixiecore/pixiecore.go |  4 ++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pixiecore/cli/cli.go b/pixiecore/cli/cli.go
index 9a40aaf..8bfe285 100644
--- a/pixiecore/cli/cli.go
+++ b/pixiecore/cli/cli.go
@@ -74,6 +74,8 @@ func serverConfigFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolP("log-timestamps", "t", false, "Add a timestamp to each log line")
 	cmd.Flags().StringP("listen-addr", "l", "0.0.0.0", "IPv4 address to listen on")
 	cmd.Flags().IntP("port", "p", 80, "Port to listen on for HTTP")
+	cmd.Flags().String("static-dir", "", "Static directory to serve on the HTTP port")
+	cmd.Flags().String("static-prefix", "/_/static/", "HTTP URL prefix to serve --static-dir")
 	cmd.Flags().Int("status-port", 0, "HTTP port for status information (can be the same as --port)")
 	cmd.Flags().Bool("dhcp-no-bind", false, "Handle DHCP traffic without binding to the DHCP server port")
 	cmd.Flags().String("ipxe-bios", "", "Path to an iPXE binary for BIOS/UNDI")
@@ -146,6 +148,14 @@ func serverFromFlags(cmd *cobra.Command) *pixiecore.Server {
 	if err != nil {
 		fatalf("Error reading flag: %s", err)
 	}
+	httpStaticDir, err := cmd.Flags().GetString("static-dir")
+	if err != nil {
+		fatalf("Error reading flag: %s", err)
+	}
+	httpStaticPrefix, err := cmd.Flags().GetString("static-prefix")
+	if err != nil {
+		fatalf("Error reading flag: %s", err)
+	}
 	httpStatusPort, err := cmd.Flags().GetInt("status-port")
 	if err != nil {
 		fatalf("Error reading flag: %s", err)
@@ -180,12 +190,14 @@ func serverFromFlags(cmd *cobra.Command) *pixiecore.Server {
 	}
 
 	ret := &pixiecore.Server{
-		Ipxe:           map[pixiecore.Firmware][]byte{},
-		Log:            logWithStdFmt,
-		HTTPPort:       httpPort,
-		HTTPStatusPort: httpStatusPort,
-		DHCPNoBind:     dhcpNoBind,
-		UIAssetsDir:    uiAssetsDir,
+		Ipxe:             map[pixiecore.Firmware][]byte{},
+		Log:              logWithStdFmt,
+		HTTPPort:         httpPort,
+		HTTPStaticDir:    httpStaticDir,
+		HTTPStaticPrefix: httpStaticPrefix,
+		HTTPStatusPort:   httpStatusPort,
+		DHCPNoBind:       dhcpNoBind,
+		UIAssetsDir:      uiAssetsDir,
 	}
 	for fwtype, bs := range Ipxe {
 		ret.Ipxe[fwtype] = bs
diff --git a/pixiecore/http.go b/pixiecore/http.go
index cfc0e98..c093c66 100644
--- a/pixiecore/http.go
+++ b/pixiecore/http.go
@@ -42,6 +42,11 @@ func (s *Server) serveHTTP(mux *http.ServeMux) {
 	mux.HandleFunc("/_/ipxe", s.handleIpxe)
 	mux.HandleFunc("/_/file", s.handleFile)
 	mux.HandleFunc("/_/booting", s.handleBooting)
+	if s.HTTPStaticDir != "" {
+		s.debug("HTTP", "serving %q at %s", s.HTTPStaticDir, s.HTTPStaticPrefix)
+		mux.Handle(s.HTTPStaticPrefix,
+			http.StripPrefix(s.HTTPStaticPrefix, http.FileServer(http.Dir(s.HTTPStaticDir))))
+	}
 }
 
 func (s *Server) handleIpxe(w http.ResponseWriter, r *http.Request) {
diff --git a/pixiecore/pixiecore.go b/pixiecore/pixiecore.go
index a9c831f..6e7d63a 100644
--- a/pixiecore/pixiecore.go
+++ b/pixiecore/pixiecore.go
@@ -159,6 +159,10 @@ type Server struct {
 	Address string
 	// HTTP port for boot services.
 	HTTPPort int
+	// Directory to serve static files on the HTTP server.
+	HTTPStaticDir string
+	// URL Prefix to serve the static directory on the HTTP server.
+	HTTPStaticPrefix string
 	// HTTP port for human-readable information. Can be the same as
 	// HTTPPort.
 	HTTPStatusPort int