peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

redirect to AppURL instead of assuming port 443

Browse Source
This commit is contained in:
fluf@warpmail.net 2018-06-12 18:40:15 +00:00
parent 6bbf48ce03
commit 42411f8ea4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/web.go
View File

@ -80,7 +80,7 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)
Cache: autocert.DirCache(directory), Cache: autocert.DirCache(directory),
Email: email, Email: email,
} }
go http.ListenAndServe(":http", certManager.HTTPHandler(nil)) // all traffic coming into HTTP will be redirect to HTTPS automatically (LE HTTP-01 validatio happens here) go http.ListenAndServe(":http", certManager.HTTPHandler(http.HandlerFunc(runLetsEncryptFallbackHandler))) // all traffic coming into HTTP will be redirect to HTTPS automatically (LE HTTP-01 validatio happens here)
server := &http.Server{ server := &http.Server{
Addr: listenAddr, Addr: listenAddr,
Handler: m, Handler: m,
@ -91,6 +91,15 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)
return server.ListenAndServeTLS("", "") return server.ListenAndServeTLS("", "")
} }
func runLetsEncryptFallbackHandler(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" && r.Method != "HEAD" {
http.Error(w, "Use HTTPS", http.StatusBadRequest)
return
}
target := setting.AppURL + r.URL.RequestURI()
http.Redirect(w, r, target, http.StatusFound)
}
func runWeb(ctx *cli.Context) error { func runWeb(ctx *cli.Context) error {
if ctx.IsSet("config") { if ctx.IsSet("config") {
setting.CustomConf = ctx.String("config") setting.CustomConf = ctx.String("config")