rancher/dynamiclistener
1
0
Fork 0
forked from github/dynamiclistener
Code Issues Pull Requests Projects Releases Wiki Activity

Fix go fmt/vet issues

Browse Source
This commit is contained in:
Darren Shepherd 2020-01-30 22:27:52 -07:00
parent a75e84bc81
commit 4e8035fa46
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
listener.go
View File

@ -38,6 +38,9 @@ func NewListener(l net.Listener, storage TLSStorage, caCert *x509.Certificate, c
if len(config.Organization) == 0 {
config.Organization = []string{"dynamic"}
}
if config.TLSConfig == nil {
config.TLSConfig = &tls.Config{}
}
dynamicListener := &listener{
factory: &factory.TLS{
@ -51,6 +54,9 @@ func NewListener(l net.Listener, storage TLSStorage, caCert *x509.Certificate, c
sans: config.SANs,
tlsConfig: config.TLSConfig,
}
if dynamicListener.tlsConfig == nil {
dynamicListener.tlsConfig = &tls.Config{}
}
dynamicListener.tlsConfig.GetCertificate = dynamicListener.getCertificate
if setter, ok := storage.(SetFactory); ok {
@ -61,7 +67,7 @@ func NewListener(l net.Listener, storage TLSStorage, caCert *x509.Certificate, c
config.ExpirationDaysCheck = 30
}
tlsListener := tls.NewListener(dynamicListener.WrapExpiration(config.ExpirationDaysCheck), &dynamicListener.tlsConfig)
tlsListener := tls.NewListener(dynamicListener.WrapExpiration(config.ExpirationDaysCheck), dynamicListener.tlsConfig)
return tlsListener, dynamicListener.cacheHandler(), nil
}
@ -78,7 +84,7 @@ func (c *cancelClose) Close() error {
type Config struct {
CN string
Organization []string
TLSConfig tls.Config
TLSConfig *tls.Config
SANs []string
ExpirationDaysCheck int
}
@ -90,7 +96,7 @@ type listener struct {
factory TLSFactory
storage TLSStorage
version string
tlsConfig tls.Config
tlsConfig *tls.Config
cert *tls.Certificate
sans []string
init sync.Once

8
server/server.go
View File

@ -44,6 +44,10 @@ func ListenAndServe(ctx context.Context, httpsPort, httpPort int, handler http.H
opts = &ListenOpts{}
}
if opts.TLSListenerConfig.TLSConfig == nil {
opts.TLSListenerConfig.TLSConfig = &tls.Config{}
}
logger := logrus.StandardLogger()
errorLog := log.New(logger.WriterLevel(logrus.DebugLevel), "", log.LstdFlags)
@ -108,7 +112,7 @@ func getTLSListener(ctx context.Context, tcp net.Listener, opts ListenOpts) (net
}
if len(opts.TLSListenerConfig.TLSConfig.Certificates) > 0 {
return tls.NewListener(tcp, &opts.TLSListenerConfig.TLSConfig), nil, nil
return tls.NewListener(tcp, opts.TLSListenerConfig.TLSConfig), nil, nil
}
if len(opts.AcmeDomains) > 0 {
@ -210,5 +214,5 @@ func acmeListener(tcp net.Listener, opts ListenOpts) net.Listener {
return manager.GetCertificate(hello)
}
return tls.NewListener(tcp, &opts.TLSListenerConfig.TLSConfig)
return tls.NewListener(tcp, opts.TLSListenerConfig.TLSConfig)
}

1
storage/file/file.go
View File

@ -39,4 +39,3 @@ func (s *storage) Update(secret *v1.Secret) error {
return json.NewEncoder(f).Encode(secret)
}