Move middleware to allow GET /health to work without authentication

This commit is contained in:
Melon 2025-01-27 21:40:55 +00:00
parent d48dec6125
commit 8c5145849b
Signed by: melon
GPG Key ID: 6C9D970C50D26A25

View File

@ -76,12 +76,12 @@ func NewHttpServer(conf Conf, wd string) *http.Server {
} }
r := http.NewServeMux() r := http.NewServeMux()
r.Handle("/", handler) r.Handle("/", principle.Middleware(handler))
r.Handle("GET /ok", http.HandlerFunc(func(rw http.ResponseWriter, _ *http.Request) { r.Handle("GET /health", http.HandlerFunc(func(rw http.ResponseWriter, _ *http.Request) {
http.Error(rw, "Daisy API Endpoint", http.StatusOK) http.Error(rw, "Health OK", http.StatusOK)
})) }))
r.Handle("/.well-known/carddav", cardHandler) r.Handle("/.well-known/carddav", principle.Middleware(cardHandler))
r.Handle("/{user}/contacts/", cardHandler) r.Handle("/{user}/contacts/", principle.Middleware(cardHandler))
r2 := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { r2 := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
t := time.Now() t := time.Now()
@ -92,7 +92,7 @@ func NewHttpServer(conf Conf, wd string) *http.Server {
return &http.Server{ return &http.Server{
Addr: conf.Listen, Addr: conf.Listen,
Handler: principle.Middleware(r2), Handler: r2,
ReadTimeout: time.Minute, ReadTimeout: time.Minute,
ReadHeaderTimeout: time.Minute, ReadHeaderTimeout: time.Minute,
WriteTimeout: time.Minute, WriteTimeout: time.Minute,