lordwelch/gokrazy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Honor https-port when redirecting (#79)

Browse Source
This commit is contained in:
andig 2021-01-08 09:10:39 +01:00 committed by GitHub
parent 97987794f9
commit 067330db55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gokrazy.go
View File

@ -190,11 +190,11 @@ func Boot(userBuildTimestamp string) error {
}
func updateListenerPairs(httpPort, httpsPort string, useTLS bool, tlsConfig *tls.Config) error {
if err := updateListeners(httpPort, useTLS, nil); err != nil {
if err := updateListeners(httpPort, httpsPort, useTLS, nil); err != nil {
return err
}
if useTLS {
if err := updateListeners(httpsPort, useTLS, tlsConfig); err != nil {
if err := updateListeners(httpsPort, "", useTLS, tlsConfig); err != nil {
return err
}
}

25
httpsredirect.go
View File

@ -5,15 +5,20 @@ import (
"net/http"
)
func httpsRedirect(w http.ResponseWriter, r *http.Request) {
host, _, _ := net.SplitHostPort(r.RemoteAddr)
ip := net.ParseIP(host)
if ip.IsLoopback() {
http.DefaultServeMux.ServeHTTP(w, r)
return
}
func httpsRedirect(redirectPort string) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
host, _, _ := net.SplitHostPort(r.RemoteAddr)
ip := net.ParseIP(host)
if ip.IsLoopback() {
http.DefaultServeMux.ServeHTTP(w, r)
return
}
r.URL.Host = r.Host
r.URL.Scheme = "https"
http.Redirect(w, r, r.URL.String(), http.StatusFound) // Redirect to https
r.URL.Host = r.Host
if redirectPort != "443" {
r.URL.Host += ":" + redirectPort
}
r.URL.Scheme = "https"
http.Redirect(w, r, r.URL.String(), http.StatusFound) // Redirect to https
}
}

4
listeners.go
View File

@ -141,7 +141,7 @@ var (
)
// tlsConfig: tlsConfig. nil, if the listeners should not use https (e.g. for redirects)
func updateListeners(port string, tlsEnabled bool, tlsConfig *tls.Config) error {
func updateListeners(port, redirectPort string, tlsEnabled bool, tlsConfig *tls.Config) error {
hosts, err := PrivateInterfaceAddrs()
if err != nil {
return err
@ -180,7 +180,7 @@ func updateListeners(port string, tlsEnabled bool, tlsConfig *tls.Config) error
if tlsEnabled && tlsConfig == nil {
// "Redirect" server
srv = &http.Server{
Handler: http.HandlerFunc(httpsRedirect),
Handler: http.HandlerFunc(httpsRedirect(redirectPort)),
TLSConfig: tlsConfig,
}
} else {