Merge branch 'v1.7' into master

server/server.go

@@ -6,7 +6,6 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	stdlog "log"
 	"net"
 	"net/http"
@@ -244,7 +243,9 @@ func (s *Server) Start() {
 		s.listenConfigurations(stop)
 	})
 	s.startProvider()
-	go s.listenSignals()
+	s.routinesPool.Go(func(stop chan bool) {
+		s.listenSignals(stop)
+	})
 }
 
 // StartWithContext starts the server and Stop/Close it when context is Done
@@ -427,7 +428,7 @@ func (s *Server) createTLSConfig(entryPointName string, tlsOption *traefiktls.TL
 	if len(tlsOption.ClientCA.Files) > 0 {
 		pool := x509.NewCertPool()
 		for _, caFile := range tlsOption.ClientCA.Files {
-			data, err := ioutil.ReadFile(caFile)
+			data, err := caFile.Read()
 			if err != nil {
 				return nil, err
 			}

server/server_configuration.go

@@ -424,8 +424,10 @@ func (s *Server) throttleProviderConfigReload(throttle time.Duration, publish ch
 			case <-stop:
 				return
 			case nextConfig := <-ring.Out():
-				publish <- nextConfig.(types.ConfigMessage)
-				time.Sleep(throttle)
+				if config, ok := nextConfig.(types.ConfigMessage); ok {
+					publish <- config
+					time.Sleep(throttle)
+				}
 			}
 		}
 	})
@@ -515,6 +517,8 @@ func (s *Server) postLoadConfiguration() {
 						domains, err := rls.ParseDomains(route.Rule)
 						if err != nil {
 							log.Errorf("Error parsing domains: %v", err)
+						} else if len(domains) == 0 {
+							log.Debugf("No domain parsed in rule %q", route.Rule)
 						} else {
 							s.globalConfiguration.ACME.LoadCertificateForDomains(domains)
 						}

server/server_loadbalancer.go

@@ -5,7 +5,6 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -280,7 +279,7 @@ func createHTTPTransport(globalConfiguration configuration.GlobalConfiguration)
 	return transport, nil
 }
 
-func createRootCACertPool(rootCAs traefiktls.RootCAs) *x509.CertPool {
+func createRootCACertPool(rootCAs traefiktls.FilesOrContents) *x509.CertPool {
 	roots := x509.NewCertPool()
 
 	for _, cert := range rootCAs {
@@ -308,7 +307,7 @@ func createClientTLSConfig(entryPointName string, tlsOption *traefiktls.TLS) (*t
 	if len(tlsOption.ClientCA.Files) > 0 {
 		pool := x509.NewCertPool()
 		for _, caFile := range tlsOption.ClientCA.Files {
-			data, err := ioutil.ReadFile(caFile)
+			data, err := caFile.Read()
 			if err != nil {
 				return nil, err
 			}

server/server_middlewares.go

@@ -104,6 +104,15 @@ func (s *Server) buildMiddlewares(frontendName string, frontend *types.Frontend,
 		middle = append(middle, handler)
 	}
 
+	// TLSClientHeaders
+	tlsClientHeadersMiddleware := middlewares.NewTLSClientHeaders(frontend)
+	if tlsClientHeadersMiddleware != nil {
+		log.Debugf("Adding TLSClientHeaders middleware for frontend %s", frontendName)
+
+		handler := s.tracingMiddleware.NewNegroniHandlerWrapper("TLSClientHeaders", tlsClientHeadersMiddleware, false)
+		middle = append(middle, handler)
+	}
+
 	return middle, buildModifyResponse(secureMiddleware, headerMiddleware), postConfig, nil
 }
 

server/server_signals.go

@@ -13,21 +13,25 @@ func (s *Server) configureSignals() {
 	signal.Notify(s.signals, syscall.SIGUSR1)
 }
 
-func (s *Server) listenSignals() {
+func (s *Server) listenSignals(stop chan bool) {
 	for {
-		sig := <-s.signals
-		switch sig {
-		case syscall.SIGUSR1:
-			log.Infof("Closing and re-opening log files for rotation: %+v", sig)
+		select {
+		case <-stop:
+			return
+		case sig := <-s.signals:
+			switch sig {
+			case syscall.SIGUSR1:
+				log.Infof("Closing and re-opening log files for rotation: %+v", sig)
 
-			if s.accessLoggerMiddleware != nil {
-				if err := s.accessLoggerMiddleware.Rotate(); err != nil {
-					log.Errorf("Error rotating access log: %v", err)
+				if s.accessLoggerMiddleware != nil {
+					if err := s.accessLoggerMiddleware.Rotate(); err != nil {
+						log.Errorf("Error rotating access log: %v", err)
+					}
 				}
-			}
 
-			if err := log.RotateFile(); err != nil {
-				log.Errorf("Error rotating traefik log: %v", err)
+				if err := log.RotateFile(); err != nil {
+					log.Errorf("Error rotating traefik log: %v", err)
+				}
 			}
 		}
 	}

server/server_signals_windows.go

@@ -4,4 +4,4 @@ package server
 
 func (s *Server) configureSignals() {}
 
-func (s *Server) listenSignals() {}
+func (s *Server) listenSignals(stop chan bool) {}