add ability to serve under subdirectory

3 files changed, 9 insertions, 8 deletions

diff --git a/config/config.go b/config/config.go
index a371beb..85c73f0 100644
--- a/config/config.go
+++ b/config/config.go
@@ -21,6 +21,7 @@ type Endpoint struct {
 
 type Config struct {
 	ListenAddress string
+	PathPrefix string
 	AssetDirectory string
 	LoginTimeout int
 	Users []User
diff --git a/main.go b/main.go
index b61e237..6e37f43 100644
--- a/main.go
+++ b/main.go
@@ -25,21 +25,21 @@ func main() {
 	users := getUsers(conf)
 
 	// add phlox endpoints
-	http.HandleFunc("/phlox/login", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc(conf.PathPrefix + "/phlox/login", func(w http.ResponseWriter, r *http.Request) {
 		Login(w, r, users, sessions, pages)
 	})
 
-	http.HandleFunc("/phlox/logout", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc(conf.PathPrefix + "/phlox/logout", func(w http.ResponseWriter, r *http.Request) {
 		Logout(w, r, sessions)
 	})
 
-	http.HandleFunc("/phlox/asset/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc(conf.PathPrefix + "/phlox/asset/", func(w http.ResponseWriter, r *http.Request) {
 		filename := strings.TrimPrefix(r.URL.Path, "/phlox/asset/")
 		path := filepath.Join(conf.AssetDirectory, filename)
 		http.ServeFile(w, r, path)
 	})
 
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc(conf.PathPrefix + "/", func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path == "/" {
 			w.Header().Add("Location", "/phlox/login")
 			w.WriteHeader(http.StatusTemporaryRedirect)
@@ -50,7 +50,7 @@ func main() {
 
 	// add reverse proxy endpoints
 	for _, e := range conf.Endpoints {
-		addEndpoint(sessions, pages, e)
+		addEndpoint(conf, sessions, pages, e)
 	}
 
 	// timer for inactivity log out
diff --git a/proxy.go b/proxy.go
index 4442fb9..50260f2 100644
--- a/proxy.go
+++ b/proxy.go
@@ -19,7 +19,7 @@ type Endpoint struct {
 }
 
 
-func addEndpoint(s *auth.Sessions, pages page.Pages, e config.Endpoint) {
+func addEndpoint(conf config.Config, s *auth.Sessions, pages page.Pages, e config.Endpoint) {
 	log.Infof("proxying endpoint %v to %v", e.Path, e.Address)
 	origin, err := url.Parse(e.Address)
 	if err != nil {
@@ -31,12 +31,12 @@ func addEndpoint(s *auth.Sessions, pages page.Pages, e config.Endpoint) {
 		Origin: origin,
 	}
 
-	http.HandleFunc(e.Path, func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc(conf.PathPrefix + e.Path, func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Location", e.Path + "/")
 		w.WriteHeader(http.StatusPermanentRedirect)
 	})
 
-	http.HandleFunc(e.Path + "/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc(conf.PathPrefix + e.Path + "/", func(w http.ResponseWriter, r *http.Request) {
 		log.Infof("REQ: %v", r.URL.Path)
 		proxy(w, r, s, pages, end)
 	})