3d1b6bc861
- This route has nothing to do with openvpn specifically - Remove the `ed` in `portforwarded` to accomodate future routes such as changing the state of port forwarding - maintaining retrocompatibility with `/v1/openvpn/portforwarded` - maintaining retrocompatibility with `/openvpn/portforwarded` - Moved to its own handler `/v1/portforward` instead of `/v1/vpn/portforward` to reduce the complexity of the vpn handler
67 lines
1.7 KiB
Go
67 lines
1.7 KiB
Go
package server
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
)
|
|
|
|
func newHandlerV1(w warner, buildInfo models.BuildInformation,
|
|
vpn, openvpn, dns, updater, publicip, portForward http.Handler,
|
|
) http.Handler {
|
|
return &handlerV1{
|
|
warner: w,
|
|
buildInfo: buildInfo,
|
|
vpn: vpn,
|
|
openvpn: openvpn,
|
|
dns: dns,
|
|
updater: updater,
|
|
publicip: publicip,
|
|
portForward: portForward,
|
|
}
|
|
}
|
|
|
|
type handlerV1 struct {
|
|
warner warner
|
|
buildInfo models.BuildInformation
|
|
vpn http.Handler
|
|
openvpn http.Handler
|
|
dns http.Handler
|
|
updater http.Handler
|
|
publicip http.Handler
|
|
portForward http.Handler
|
|
}
|
|
|
|
func (h *handlerV1) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
switch {
|
|
case r.RequestURI == "/version" && r.Method == http.MethodGet:
|
|
h.getVersion(w)
|
|
case strings.HasPrefix(r.RequestURI, "/vpn"):
|
|
h.vpn.ServeHTTP(w, r)
|
|
case strings.HasPrefix(r.RequestURI, "/openvpn"):
|
|
h.openvpn.ServeHTTP(w, r)
|
|
case strings.HasPrefix(r.RequestURI, "/dns"):
|
|
h.dns.ServeHTTP(w, r)
|
|
case strings.HasPrefix(r.RequestURI, "/updater"):
|
|
h.updater.ServeHTTP(w, r)
|
|
case strings.HasPrefix(r.RequestURI, "/publicip"):
|
|
h.publicip.ServeHTTP(w, r)
|
|
case strings.HasPrefix(r.RequestURI, "/portforward"):
|
|
h.portForward.ServeHTTP(w, r)
|
|
default:
|
|
errString := fmt.Sprintf("%s %s not found", r.Method, r.RequestURI)
|
|
http.Error(w, errString, http.StatusBadRequest)
|
|
}
|
|
}
|
|
|
|
func (h *handlerV1) getVersion(w http.ResponseWriter) {
|
|
encoder := json.NewEncoder(w)
|
|
if err := encoder.Encode(h.buildInfo); err != nil {
|
|
h.warner.Warn(err.Error())
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
}
|
|
}
|