Skip to content

Commit

Permalink
review: minor changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ldez @traefiker
ldez authored and traefiker committed Jun 27, 2019
1 parent 249fefd commit 0622215
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 66 deletions.
2 changes: 1 addition & 1 deletion integration/https_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ func modifyCertificateConfFileContent(c *check.C, certFileName, confFileName, en
if len(certFileName) > 0 {
tlsConf := config.Configuration{
TLS: &config.TLSConfiguration{
Certificates: []*traefiktls.Configuration{{
Certificates: []*traefiktls.CertAndStores{{
Certificate: traefiktls.Certificate{
CertFile: traefiktls.FileOrContent("fixtures/https/" + certFileName + ".cert"),
KeyFile: traefiktls.FileOrContent("fixtures/https/" + certFileName + ".key"),
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/dyn_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ type Configuration struct {

// TLSConfiguration contains all the configuration parameters of a TLS connection.
type TLSConfiguration struct {
Certificates []*traefiktls.Configuration `json:"-" label:"-" yaml:"certificates"`
Certificates []*traefiktls.CertAndStores `json:"-" label:"-" yaml:"certificates"`
Options map[string]traefiktls.Options
Stores map[string]traefiktls.Store
}
Expand Down
6 changes: 2 additions & 4 deletions pkg/provider/acme/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,14 +589,12 @@ func (p *Provider) refreshCertificates() {
Middlewares: map[string]*config.Middleware{},
Services: map[string]*config.Service{},
},
TLS: &config.TLSConfiguration{
Certificates: []*traefiktls.Configuration{},
},
TLS: &config.TLSConfiguration{},
},
}

for _, cert := range p.certificates {
certConf := &traefiktls.Configuration{
certConf := &traefiktls.CertAndStores{
Certificate: traefiktls.Certificate{
CertFile: traefiktls.FileOrContent(cert.Certificate),
KeyFile: traefiktls.FileOrContent(cert.Key),
Expand Down
7 changes: 3 additions & 4 deletions pkg/provider/file/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ func (p *Provider) loadFileConfig(filename string, parseTemplate bool) (*config.
return configuration, nil
}

func flattenCertificates(tlsConfig *config.TLSConfiguration) []*tls.Configuration {
var certs []*tls.Configuration
func flattenCertificates(tlsConfig *config.TLSConfiguration) []*tls.CertAndStores {
var certs []*tls.CertAndStores
for _, cert := range tlsConfig.Certificates {
content, err := cert.Certificate.CertFile.Read()
if err != nil {
Expand Down Expand Up @@ -238,7 +238,7 @@ func (p *Provider) loadFileConfigFromDirectory(ctx context.Context, directory st
}
}

configTLSMaps := make(map[*tls.Configuration]struct{})
configTLSMaps := make(map[*tls.CertAndStores]struct{})

for _, item := range fileList {
if item.IsDir() {
Expand Down Expand Up @@ -302,7 +302,6 @@ func (p *Provider) loadFileConfigFromDirectory(ctx context.Context, directory st
}
}

// FIXME nil
for _, conf := range c.TLS.Certificates {
if _, exists := configTLSMaps[conf]; exists {
logger.Warnf("TLS configuration %v already configured, skipping", conf)
Expand Down
18 changes: 9 additions & 9 deletions pkg/provider/kubernetes/crd/kubernetes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ func buildTLSOptions(ctx context.Context, client Client) map[string]tls.Options
return tlsOptions
}

func (p *Provider) loadIngressRouteConfiguration(ctx context.Context, client Client, tlsConfigs map[string]*tls.Configuration) *config.HTTPConfiguration {
func (p *Provider) loadIngressRouteConfiguration(ctx context.Context, client Client, tlsConfigs map[string]*tls.CertAndStores) *config.HTTPConfiguration {
conf := &config.HTTPConfiguration{
Routers: map[string]*config.Router{},
Middlewares: map[string]*config.Middleware{},
Expand Down Expand Up @@ -465,7 +465,7 @@ func (p *Provider) loadIngressRouteConfiguration(ctx context.Context, client Cli
return conf
}

func (p *Provider) loadIngressRouteTCPConfiguration(ctx context.Context, client Client, tlsConfigs map[string]*tls.Configuration) *config.TCPConfiguration {
func (p *Provider) loadIngressRouteTCPConfiguration(ctx context.Context, client Client, tlsConfigs map[string]*tls.CertAndStores) *config.TCPConfiguration {
conf := &config.TCPConfiguration{
Routers: map[string]*config.TCPRouter{},
Services: map[string]*config.TCPService{},
Expand Down Expand Up @@ -565,7 +565,7 @@ func (p *Provider) loadIngressRouteTCPConfiguration(ctx context.Context, client
}

func (p *Provider) loadConfigurationFromCRD(ctx context.Context, client Client) *config.Configuration {
tlsConfigs := make(map[string]*tls.Configuration)
tlsConfigs := make(map[string]*tls.CertAndStores)
conf := &config.Configuration{
HTTP: p.loadIngressRouteConfiguration(ctx, client, tlsConfigs),
TCP: p.loadIngressRouteTCPConfiguration(ctx, client, tlsConfigs),
Expand Down Expand Up @@ -606,7 +606,7 @@ func shouldProcessIngress(ingressClass string, ingressClassAnnotation string) bo
(len(ingressClass) == 0 && ingressClassAnnotation == traefikDefaultIngressClass)
}

func getTLSHTTP(ctx context.Context, ingressRoute *v1alpha1.IngressRoute, k8sClient Client, tlsConfigs map[string]*tls.Configuration) error {
func getTLSHTTP(ctx context.Context, ingressRoute *v1alpha1.IngressRoute, k8sClient Client, tlsConfigs map[string]*tls.CertAndStores) error {
if ingressRoute.Spec.TLS == nil {
return nil
}
Expand All @@ -628,7 +628,7 @@ func getTLSHTTP(ctx context.Context, ingressRoute *v1alpha1.IngressRoute, k8sCli
return nil
}

func getTLSTCP(ctx context.Context, ingressRoute *v1alpha1.IngressRouteTCP, k8sClient Client, tlsConfigs map[string]*tls.Configuration) error {
func getTLSTCP(ctx context.Context, ingressRoute *v1alpha1.IngressRouteTCP, k8sClient Client, tlsConfigs map[string]*tls.CertAndStores) error {
if ingressRoute.Spec.TLS == nil {
return nil
}
Expand All @@ -650,7 +650,7 @@ func getTLSTCP(ctx context.Context, ingressRoute *v1alpha1.IngressRouteTCP, k8sC
return nil
}

func getTLS(k8sClient Client, secretName, namespace string) (*tls.Configuration, error) {
func getTLS(k8sClient Client, secretName, namespace string) (*tls.CertAndStores, error) {
secret, exists, err := k8sClient.GetSecret(namespace, secretName)
if err != nil {
return nil, fmt.Errorf("failed to fetch secret %s/%s: %v", namespace, secretName, err)
Expand All @@ -664,22 +664,22 @@ func getTLS(k8sClient Client, secretName, namespace string) (*tls.Configuration,
return nil, err
}

return &tls.Configuration{
return &tls.CertAndStores{
Certificate: tls.Certificate{
CertFile: tls.FileOrContent(cert),
KeyFile: tls.FileOrContent(key),
},
}, nil
}

func getTLSConfig(tlsConfigs map[string]*tls.Configuration) []*tls.Configuration {
func getTLSConfig(tlsConfigs map[string]*tls.CertAndStores) []*tls.CertAndStores {
var secretNames []string
for secretName := range tlsConfigs {
secretNames = append(secretNames, secretName)
}
sort.Strings(secretNames)

var configs []*tls.Configuration
var configs []*tls.CertAndStores
for _, secretName := range secretNames {
configs = append(configs, tlsConfigs[secretName])
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/provider/kubernetes/crd/kubernetes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func TestLoadIngressRouteTCPs(t *testing.T) {
paths: []string{"tcp/services.yml", "tcp/with_tls.yml"},
expected: &config.Configuration{
TLS: &config.TLSConfiguration{
Certificates: []*tls.Configuration{
Certificates: []*tls.CertAndStores{
{
Certificate: tls.Certificate{
CertFile: tls.FileOrContent("-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----"),
Expand Down Expand Up @@ -955,7 +955,7 @@ func TestLoadIngressRoutes(t *testing.T) {
paths: []string{"services.yml", "with_tls.yml"},
expected: &config.Configuration{
TLS: &config.TLSConfiguration{
Certificates: []*tls.Configuration{
Certificates: []*tls.CertAndStores{
{
Certificate: tls.Certificate{
CertFile: tls.FileOrContent("-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----"),
Expand Down
10 changes: 5 additions & 5 deletions pkg/provider/kubernetes/ingress/kubernetes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl

ingresses := client.GetIngresses()

tlsConfigs := make(map[string]*tls.Configuration)
tlsConfigs := make(map[string]*tls.CertAndStores)
for _, ingress := range ingresses {
ctx = log.With(ctx, log.Str("ingress", ingress.Name), log.Str("namespace", ingress.Namespace))

Expand Down Expand Up @@ -356,7 +356,7 @@ func shouldProcessIngress(ingressClass string, ingressClassAnnotation string) bo
(len(ingressClass) == 0 && ingressClassAnnotation == traefikDefaultIngressClass)
}

func getTLS(ctx context.Context, ingress *v1beta1.Ingress, k8sClient Client, tlsConfigs map[string]*tls.Configuration) error {
func getTLS(ctx context.Context, ingress *v1beta1.Ingress, k8sClient Client, tlsConfigs map[string]*tls.CertAndStores) error {
for _, t := range ingress.Spec.TLS {
if t.SecretName == "" {
log.FromContext(ctx).Debugf("Skipping TLS sub-section: No secret name provided")
Expand All @@ -378,7 +378,7 @@ func getTLS(ctx context.Context, ingress *v1beta1.Ingress, k8sClient Client, tls
return err
}

tlsConfigs[configKey] = &tls.Configuration{
tlsConfigs[configKey] = &tls.CertAndStores{
Certificate: tls.Certificate{
CertFile: tls.FileOrContent(cert),
KeyFile: tls.FileOrContent(key),
Expand All @@ -390,14 +390,14 @@ func getTLS(ctx context.Context, ingress *v1beta1.Ingress, k8sClient Client, tls
return nil
}

func getTLSConfig(tlsConfigs map[string]*tls.Configuration) []*tls.Configuration {
func getTLSConfig(tlsConfigs map[string]*tls.CertAndStores) []*tls.CertAndStores {
var secretNames []string
for secretName := range tlsConfigs {
secretNames = append(secretNames, secretName)
}
sort.Strings(secretNames)

var configs []*tls.Configuration
var configs []*tls.CertAndStores
for _, secretName := range secretNames {
configs = append(configs, tlsConfigs[secretName])
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/provider/kubernetes/ingress/kubernetes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ func TestLoadConfigurationFromIngresses(t *testing.T) {
},
},
TLS: &config.TLSConfiguration{
Certificates: []*tls.Configuration{
Certificates: []*tls.CertAndStores{
{
Certificate: tls.Certificate{
CertFile: tls.FileOrContent("-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----"),
Expand Down Expand Up @@ -975,7 +975,7 @@ func TestGetTLS(t *testing.T) {
desc string
ingress *v1beta1.Ingress
client Client
result map[string]*tls.Configuration
result map[string]*tls.CertAndStores
errResult string
}{
{
Expand Down Expand Up @@ -1082,7 +1082,7 @@ func TestGetTLS(t *testing.T) {
},
},
},
result: map[string]*tls.Configuration{
result: map[string]*tls.CertAndStores{
"testing/test-secret": {
Certificate: tls.Certificate{
CertFile: tls.FileOrContent("tls-crt"),
Expand All @@ -1101,7 +1101,7 @@ func TestGetTLS(t *testing.T) {
desc: "return nil when no secret is defined",
ingress: testIngressWithoutSecret,
client: clientMock{},
result: map[string]*tls.Configuration{},
result: map[string]*tls.CertAndStores{},
},
}

Expand All @@ -1110,7 +1110,7 @@ func TestGetTLS(t *testing.T) {
t.Run(test.desc, func(t *testing.T) {
t.Parallel()

tlsConfigs := map[string]*tls.Configuration{}
tlsConfigs := map[string]*tls.CertAndStores{}
err := getTLS(context.Background(), test.ingress, test.client, tlsConfigs)

if test.errResult != "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/router/tcp/router_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func TestRuntimeConfiguration(t *testing.T) {
MinVersion: "VersionTLS11",
},
},
[]*tls.Configuration{})
[]*tls.CertAndStores{})

routerManager := NewManager(conf, serviceManager,
nil, nil, tlsManager)
Expand Down
1 change: 0 additions & 1 deletion pkg/server/server_configuration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func (s *Server) loadConfigurationTCP(configurations config.Configurations) map[

conf := mergeConfiguration(configurations)

// FIXME nil
s.tlsManager.UpdateConfigs(conf.TLS.Stores, conf.TLS.Options, conf.TLS.Certificates)

rtConf := config.NewRuntimeConfig(conf)
Expand Down
5 changes: 2 additions & 3 deletions pkg/tls/tls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ type Store struct {
DefaultCertificate *Certificate
}

// Configuration allows mapping a TLS certificate to a list of entry points.
// FIXME better name?
type Configuration struct {
// CertAndStores allows mapping a TLS certificate to a list of entry points.
type CertAndStores struct {
Certificate `yaml:",inline"`
Stores []string
}
4 changes: 2 additions & 2 deletions pkg/tls/tlsmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type Manager struct {
storesConfig map[string]Store
stores map[string]*CertificateStore
configs map[string]Options
certs []*Configuration
certs []*CertAndStores
TLSAlpnGetter func(string) (*tls.Certificate, error)
lock sync.RWMutex
}
Expand All @@ -29,7 +29,7 @@ func NewManager() *Manager {
}

// UpdateConfigs updates the TLS* configuration options
func (m *Manager) UpdateConfigs(stores map[string]Store, configs map[string]Options, certs []*Configuration) {
func (m *Manager) UpdateConfigs(stores map[string]Store, configs map[string]Options, certs []*CertAndStores) {
m.lock.Lock()
defer m.lock.Unlock()

Expand Down
47 changes: 19 additions & 28 deletions pkg/tls/tlsmanager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,12 @@ f9Oeos0UUothgiDktdQHxdNEwLjQf7lJJBzV+5OtwswCWA==
)

func TestTLSInStore(t *testing.T) {
dynamicConfigs :=
[]*Configuration{
{
Certificate: Certificate{
CertFile: localhostCert,
KeyFile: localhostKey,
},
},
}
dynamicConfigs := []*CertAndStores{{
Certificate: Certificate{
CertFile: localhostCert,
KeyFile: localhostKey,
},
}}

tlsManager := NewManager()
tlsManager.UpdateConfigs(nil, nil, dynamicConfigs)
Expand All @@ -66,15 +63,12 @@ func TestTLSInStore(t *testing.T) {
}

func TestTLSInvalidStore(t *testing.T) {
dynamicConfigs :=
[]*Configuration{
{
Certificate: Certificate{
CertFile: localhostCert,
KeyFile: localhostKey,
},
},
}
dynamicConfigs := []*CertAndStores{{
Certificate: Certificate{
CertFile: localhostCert,
KeyFile: localhostKey,
},
}}

tlsManager := NewManager()
tlsManager.UpdateConfigs(map[string]Store{
Expand All @@ -93,15 +87,13 @@ func TestTLSInvalidStore(t *testing.T) {
}

func TestManager_Get(t *testing.T) {
dynamicConfigs :=
[]*Configuration{
{
Certificate: Certificate{
CertFile: localhostCert,
KeyFile: localhostKey,
},
},
}
dynamicConfigs := []*CertAndStores{{
Certificate: Certificate{
CertFile: localhostCert,
KeyFile: localhostKey,
},
}}

tlsConfigs := map[string]Options{
"foo": {MinVersion: "VersionTLS12"},
"bar": {MinVersion: "VersionTLS11"},
Expand Down Expand Up @@ -153,5 +145,4 @@ func TestManager_Get(t *testing.T) {
assert.Equal(t, config.MinVersion, test.expectedMinVersion)
})
}

}

0 comments on commit 0622215

Please sign in to comment.