mirror of
https://github.com/caddyserver/caddy.git
synced 2025-01-27 23:03:37 -05:00
Don't use auto HTTPS for servers with only HTTP port listeners
This commit is contained in:
parent
284fb3a98c
commit
869fbac632
2 changed files with 21 additions and 0 deletions
|
@ -188,6 +188,11 @@ func (app *App) automaticHTTPS() error {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// skip if all listeners use the HTTP port
|
||||||
|
if !srv.listenersUseAnyPortOtherThan(app.HTTPPort) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
// find all qualifying domain names, de-duplicated
|
// find all qualifying domain names, de-duplicated
|
||||||
domainSet := make(map[string]struct{})
|
domainSet := make(map[string]struct{})
|
||||||
for _, route := range srv.Routes {
|
for _, route := range srv.Routes {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
@ -98,6 +99,21 @@ func (s *Server) executeCompositeRoute(w http.ResponseWriter, r *http.Request, s
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Server) listenersUseAnyPortOtherThan(otherPort int) bool {
|
||||||
|
for _, lnAddr := range s.Listen {
|
||||||
|
_, addrs, err := parseListenAddr(lnAddr)
|
||||||
|
if err == nil {
|
||||||
|
for _, a := range addrs {
|
||||||
|
_, port, err := net.SplitHostPort(a)
|
||||||
|
if err == nil && port != strconv.Itoa(otherPort) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
type httpErrorConfig struct {
|
type httpErrorConfig struct {
|
||||||
Routes RouteList `json:"routes,omitempty"`
|
Routes RouteList `json:"routes,omitempty"`
|
||||||
// TODO: some way to configure the logging of errors, probably? standardize
|
// TODO: some way to configure the logging of errors, probably? standardize
|
||||||
|
|
Loading…
Add table
Reference in a new issue