From b60c4664c772679e68fe781867315ebbc8140fe8 Mon Sep 17 00:00:00 2001 From: Patrick O'Doherty Date: Wed, 27 Mar 2024 11:44:17 -0700 Subject: [PATCH] safeweb: return http.Handler from safeweb.RedirectHTTP (#11538) Updates #cleanup Change the return type of the safeweb.RedirectHTTP method to a handler that can be passed directly to http.Serve without any http.HandlerFunc wrapping necessary. Signed-off-by: Patrick O'Doherty --- safeweb/http.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/safeweb/http.go b/safeweb/http.go index 9c6d33e1e..11cc20d5b 100644 --- a/safeweb/http.go +++ b/safeweb/http.go @@ -199,8 +199,8 @@ func NewServer(config Config) (*Server, error) { // RedirectHTTP returns a handler that redirects all incoming HTTP requests to // the provided fully qualified domain name (FQDN). -func (s *Server) RedirectHTTP(fqdn string) func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { +func (s *Server) RedirectHTTP(fqdn string) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { new := url.URL{ Scheme: "https", Host: fqdn, @@ -209,7 +209,7 @@ func (s *Server) RedirectHTTP(fqdn string) func(w http.ResponseWriter, r *http.R } http.Redirect(w, r, new.String(), http.StatusMovedPermanently) - } + }) } // Serve starts the server and listens on the provided listener. It will block