mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-06-02 21:49:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2263 from lodge93/bugfix/redirect-http-to-https-when-ssl-is-enabled

Browse source 
Redirect HTTP to HTTPS when SSL is enabled.
This commit is contained in:
Brad Rydzewski 2017-11-15 21:10:37 -08:00 committed by GitHub
parent 8eacbe382b 8476c90bbf
commit b891e14eca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/drone-server/server.go
View file

@ -536,7 +536,7 @@ func server(c *cli.Context) error {
// start the server with tls enabled
if c.String("server-cert") != "" {
g.Go(func() error {
return http.ListenAndServe(":http", handler)
return http.ListenAndServe(":http", http.HandlerFunc(redirect))
})
g.Go(func() error {
serve := &http.Server{
@ -565,7 +565,7 @@ func server(c *cli.Context) error {
// start the server with lets encrypt enabled
// listen on ports 443 and 80
g.Go(func() error {
return http.ListenAndServe(":http", handler)
return http.ListenAndServe(":http", http.HandlerFunc(redirect))
})
g.Go(func() error {
@ -675,6 +675,18 @@ func (a *authorizer) authorize(ctx context.Context) error {
return errors.New("missing agent token")
}
func redirect(w http.ResponseWriter, req *http.Request) {
var serverHost string = droneserver.Config.Server.Host
serverHost = strings.TrimPrefix(serverHost, "http://")
serverHost = strings.TrimPrefix(serverHost, "https://")
req.URL.Scheme = "https"
req.URL.Host = serverHost
w.Header().Set("Strict-Transport-Security", "max-age=31536000")
http.Redirect(w, req, req.URL.String(), http.StatusMovedPermanently)
}
func cacheDir() string {
const base = "golang-autocert"
if xdg := os.Getenv("XDG_CACHE_HOME"); xdg != "" {