- CRUD REST HTTP server - `/v1` HTTP server prefix - Retrocompatible with older routes (redirects to v1 or handles the requests directly) - DNS, Updater and Openvpn refactored to have a REST-like state with new methods to change their states synchronously - Openvpn, Unbound and Updater status, see #287
50 lines
1.3 KiB
Go
50 lines
1.3 KiB
Go
package server
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/qdm12/gluetun/internal/dns"
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
"github.com/qdm12/gluetun/internal/openvpn"
|
|
"github.com/qdm12/gluetun/internal/updater"
|
|
"github.com/qdm12/golibs/logging"
|
|
)
|
|
|
|
func newHandler(logger logging.Logger, logging bool,
|
|
buildInfo models.BuildInformation,
|
|
openvpnLooper openvpn.Looper,
|
|
unboundLooper dns.Looper,
|
|
updaterLooper updater.Looper,
|
|
) http.Handler {
|
|
handler := &handler{}
|
|
|
|
openvpn := newOpenvpnHandler(openvpnLooper, logger)
|
|
dns := newDNSHandler(unboundLooper, logger)
|
|
updater := newUpdaterHandler(updaterLooper, logger)
|
|
|
|
handler.v0 = newHandlerV0(logger, openvpnLooper, unboundLooper, updaterLooper)
|
|
handler.v1 = newHandlerV1(logger, buildInfo, openvpn, dns, updater)
|
|
|
|
handlerWithLog := withLogMiddleware(handler, logger, logging)
|
|
handler.setLogEnabled = handlerWithLog.setEnabled
|
|
|
|
return handlerWithLog
|
|
}
|
|
|
|
type handler struct {
|
|
v0 http.Handler
|
|
v1 http.Handler
|
|
setLogEnabled func(enabled bool)
|
|
}
|
|
|
|
func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
r.RequestURI = strings.TrimSuffix(r.RequestURI, "/")
|
|
if !strings.HasPrefix(r.RequestURI, "/v1/") && r.RequestURI != "/v1" {
|
|
h.v0.ServeHTTP(w, r)
|
|
return
|
|
}
|
|
r.RequestURI = strings.TrimPrefix(r.RequestURI, "/v1")
|
|
h.v1.ServeHTTP(w, r)
|
|
}
|