TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-28 20:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

safeweb: move http.Serve for HTTP redirects into lib (#11592)

Browse Source 
Refactor the interaction between caller/library when establishing the
HTTP to HTTPS redirects by moving the call to http.Serve into safeweb.
This makes linting for other uses of http.Serve easier without having to
account for false positives created by the old interface.

Updates https://github.com/tailscale/corp/issues/8027

Signed-off-by: Patrick O'Doherty <patrick@tailscale.com>
This commit is contained in:
Patrick O'Doherty 2024-04-02 12:04:24 -07:00 committed by GitHub
parent f384742375
commit 1535d0feca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
safeweb/http.go
View File

@ -242,10 +242,12 @@ func (s *Server) serveBrowser(w http.ResponseWriter, r *http.Request) {
s.csrfProtect(s.BrowserMux).ServeHTTP(w, r) s.csrfProtect(s.BrowserMux).ServeHTTP(w, r)
} }
// RedirectHTTP returns a handler that redirects all incoming HTTP requests to // ServeRedirectHTTP serves a single HTTP handler on the provided listener that
// the provided fully qualified domain name (FQDN). // redirects all incoming HTTP requests to the HTTPS address of the provided
func (s *Server) RedirectHTTP(fqdn string) http.Handler { // fully qualified domain name (FQDN). Callers are responsible for closing the
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // listener.
func (s *Server) ServeRedirectHTTP(ln net.Listener, fqdn string) error {
return http.Serve(ln, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
new := url.URL{ new := url.URL{
Scheme: "https", Scheme: "https",
Host: fqdn, Host: fqdn,
@ -254,7 +256,7 @@ func (s *Server) RedirectHTTP(fqdn string) http.Handler {
} }
http.Redirect(w, r, new.String(), http.StatusMovedPermanently) http.Redirect(w, r, new.String(), http.StatusMovedPermanently)
}) }))
} }
// Serve starts the server and listens on the provided listener. It will block // Serve starts the server and listens on the provided listener. It will block