github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-01 20:22:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable TLS completely if there is no listener with tls enabled (#1456)

Browse Source 
* Disable TLS completely if there is no listener with tls enabled

* Format code
This commit is contained in:
Mateusz Gajewski 2017-02-19 16:09:35 +01:00 committed by Matt Holt
parent 6083871088
commit 1262ae92e9
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
caddyhttp/httpserver/server.go
View File

@ -93,9 +93,11 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) {
s.tlsConfig = tlsConfigs s.tlsConfig = tlsConfigs
s.Server.TLSConfig = &tls.Config{ if caddytls.HasTLSEnabled(allConfigs) {
GetConfigForClient: s.tlsConfig.GetConfigForClient, s.Server.TLSConfig = &tls.Config{
GetCertificate: s.tlsConfig.GetCertificate, GetConfigForClient: s.tlsConfig.GetConfigForClient,
GetCertificate: s.tlsConfig.GetCertificate,
}
} }
// As of Go 1.7, HTTP/2 is enabled only if NextProtos includes the string "h2" // As of Go 1.7, HTTP/2 is enabled only if NextProtos includes the string "h2"

22
caddytls/config.go
View File

@ -230,14 +230,22 @@ func (cfg *Config) Build(group ConfigGroup) error {
return err return err
} }
cfg.tlsConfig = config if config != nil {
cfg.tlsConfig.GetCertificate = group.GetCertificate cfg.tlsConfig = config
cfg.tlsConfig.GetCertificate = group.GetCertificate
}
return nil return nil
} }
func (cfg *Config) build() (*tls.Config, error) { func (cfg *Config) build() (*tls.Config, error) {
config := new(tls.Config) config := new(tls.Config)
if !cfg.Enabled {
return nil, nil
}
ciphersAdded := make(map[uint16]struct{}) ciphersAdded := make(map[uint16]struct{})
curvesAdded := make(map[tls.CurveID]struct{}) curvesAdded := make(map[tls.CurveID]struct{})
@ -337,6 +345,16 @@ func CheckConfigs(configs []*Config) error {
return nil return nil
} }
func HasTLSEnabled(configs []*Config) bool {
for _, config := range configs {
if config.Enabled {
return true
}
}
return false
}
// ConfigGetter gets a Config keyed by key. // ConfigGetter gets a Config keyed by key.
type ConfigGetter func(c *caddy.Controller) *Config type ConfigGetter func(c *caddy.Controller) *Config