allow to run in subpath

README.md

@@ -24,6 +24,7 @@ Run by calling the executable with the following parameters (env or command line
 - `password`: Password that is used to connect via POP3 (required)
 - `token`: Token that is required to submit via webhook (required)")
 - `http-interface`: The address to listen on for HTTP requests. Default: `localhost:8080`
+- `base-path`: The base HTTP path the webhook should run under. Default: `/`
 - `pop-interface`: Interface (host:port) to listen on. Default: `localhost:1100`
 - `mail-dir`: Directory to store the mail in. Required unless in-memory-only is set
 - `in-memory-only`: Set to `true` to not persist the messages to disk. Default: `false`

cmd/pop3-webhook-server/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/gorilla/mux"
 	"github.com/namsral/flag"
 	"github.com/DevelHell/popgun"
 	"github.com/linkyard/pop3-webhook-server/internal/backends"
@@ -16,6 +17,7 @@ var user = flag.String("user", "mail", "Username that can be used to connect via
 var password = flag.String("password", "", "Password that is used to connect via POP3 (required)")
 var token = flag.String("token", "", "Token that is required to submit via webhook (required)")
 var httpAddr = flag.String("http-interface", "localhost:8080", "The address to listen on for HTTP requests.")
+var basePath = flag.String("base-path", "", "Path the http interface is available under. Default: ''")
 var popAddr = flag.String("pop-interface", "localhost:1100", "Interface (host:port) to listen on")
 var maildir = flag.String("mail-dir", "", "Directory to store the mail in (required unless --in-memory-only)")
 var inmem = flag.String("in-memory-only", "false", "Set to true to not persist the messages to disk (default: false)")
@@ -76,8 +78,10 @@ func main() {
 	}
 
 	httpHandler := webhook.NewReceiveMailHandler(*token, &mailStore)
-	log.Infof("Started http server on %s (use /mail/v1/store)", *httpAddr)
-	err = http.ListenAndServe(*httpAddr, httpHandler.Handler())
+	router := mux.NewRouter().StrictSlash(false)
+	httpHandler.Register(router.PathPrefix(*basePath).Subrouter())
+	log.Infof("Started http server on %s (use %s/store)", *httpAddr, *basePath)
+	err = http.ListenAndServe(*httpAddr, router)
 	if err != nil {
 		log.Fatal(err)
 		os.Exit(1)

internal/webhook/http.go

@@ -49,6 +49,7 @@ func jsonResponse(f func(request *http.Request) (interface{}, httpError)) func(h
 		var writeErr error
 		if err == nil {
 			log.Debugf("Request to %s was successful", req.RequestURI)
+			resp.Header().Set("Content-Type", "application/json")
 			resp.WriteHeader(200)
 			writeErr = json.NewEncoder(resp).Encode(result)
 		} else {
@@ -58,6 +59,7 @@ func jsonResponse(f func(request *http.Request) (interface{}, httpError)) func(h
 				Code:   err.ErrorCode(),
 				Detail: err.Detail(),
 			}
+			resp.Header().Set("Content-Type", "application/json")
 			resp.WriteHeader(err.ErrorCode())
 			writeErr = json.NewEncoder(resp).Encode(result)
 		}

internal/webhook/mailhook.go

@@ -26,10 +26,34 @@ func NewReceiveMailHandler(token string, mailStore *MailStore) ReceiveMailHandle
 	}
 }
 
-func (r ReceiveMailHandler) Handler() *mux.Router {
-	router := mux.NewRouter().StrictSlash(false)
+func (r ReceiveMailHandler) Register(router *mux.Router)  {
+	router.HandleFunc("/", jsonResponse(index))
+	router.HandleFunc("/health", jsonResponse(status))
 	router.HandleFunc("/store", jsonResponse(r.store))
-	return router
+	router.PathPrefix("/").HandlerFunc(jsonResponse(notFound))
+}
+
+func index(_ *http.Request) (interface{}, httpError) {
+	return indexResponse{Info: "Hello from pop3-webhook-server. Use POST on store to submit a message"}, nil
+}
+
+type indexResponse struct {
+	Info string `json:"info"`
+}
+
+func status(_ *http.Request) (interface{}, httpError) {
+	return statusResponse{Status: "ok"}, nil
+}
+
+type statusResponse struct {
+	Status string `json:"status"`
+}
+
+func notFound(_ *http.Request) (interface{}, httpError) {
+	return nil, clientError{
+		detail:    "not found",
+		errorCode: 404,
+	}
 }
 
 func (r ReceiveMailHandler) store(req *http.Request) (interface{}, httpError) {