From c22598c8ffb91ded01c3d99fea37b613ba2ba536 Mon Sep 17 00:00:00 2001 From: emile Date: Fri, 29 Jan 2016 20:34:17 +0100 Subject: [PATCH] Add multiple entry points support, add entry point redirection --- Makefile | 9 + adapters.go | 8 - cmd.go | 12 +- configuration.go | 139 +++++++- glide.yaml | 3 +- middlewares/rewrite.go | 31 ++ server.go | 307 +++++++++++------- types/types.go | 1 + .../frontend-monitor/frontend-monitor.html | 1 + 9 files changed, 366 insertions(+), 145 deletions(-) create mode 100644 middlewares/rewrite.go diff --git a/Makefile b/Makefile index 0ac639baa..4d376b004 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ TRAEFIK_ENVS := \ -e TESTFLAGS \ -e CIRCLECI + +SRCS = $(shell git ls-files '*.go' | grep -v '^external/') + BIND_DIR := "dist" TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/emilevauge/traefik/$(BIND_DIR)" @@ -78,3 +81,9 @@ generate-webui: mkdir -p static docker run --rm -v "$$PWD/static":'/src/static' traefik-webui gulp echo 'For more informations show `webui/readme.md`' > $$PWD/static/DONT-EDIT-FILES-IN-THIS-DIRECTORY.md + +lint: + $(foreach file,$(SRCS),golint $(file) || exit;) + +fmt: + gofmt -s -l -w $(SRCS) \ No newline at end of file diff --git a/adapters.go b/adapters.go index dcd7e5f84..638863132 100644 --- a/adapters.go +++ b/adapters.go @@ -7,7 +7,6 @@ import ( "net/http" log "github.com/Sirupsen/logrus" - "github.com/gorilla/mux" ) // OxyLogger implements oxy Logger interface with logrus. @@ -33,10 +32,3 @@ func notFoundHandler(w http.ResponseWriter, r *http.Request) { http.NotFound(w, r) //templatesRenderer.HTML(w, http.StatusNotFound, "notFound", nil) } - -// LoadDefaultConfig returns a default gorrilla.mux router from the specified configuration. -func LoadDefaultConfig(globalConfiguration GlobalConfiguration) *mux.Router { - router := mux.NewRouter() - router.NotFoundHandler = http.HandlerFunc(notFoundHandler) - return router -} diff --git a/cmd.go b/cmd.go index 9d7c4f678..b39a1e6f1 100644 --- a/cmd.go +++ b/cmd.go @@ -9,6 +9,7 @@ import ( "strings" "time" + "encoding/json" log "github.com/Sirupsen/logrus" "github.com/emilevauge/traefik/middlewares" "github.com/emilevauge/traefik/provider" @@ -49,6 +50,7 @@ var arguments = struct { boltdb bool }{ GlobalConfiguration{ + EntryPoints: make(EntryPoints), Docker: &provider.Docker{ TLS: &provider.DockerTLS{}, }, @@ -78,7 +80,8 @@ func init() { traefikCmd.PersistentFlags().StringP("graceTimeOut", "g", "10", "Timeout in seconds. Duration to give active requests a chance to finish during hot-reloads") traefikCmd.PersistentFlags().String("accessLogsFile", "log/access.log", "Access logs file") traefikCmd.PersistentFlags().String("traefikLogsFile", "log/traefik.log", "Traefik logs file") - traefikCmd.PersistentFlags().Var(&arguments.Certificates, "certificates", "SSL certificates and keys pair, ie 'tests/traefik.crt,tests/traefik.key'. You may add several certificate/key pairs to terminate HTTPS for multiple domain names using TLS SNI") + traefikCmd.PersistentFlags().Var(&arguments.EntryPoints, "entryPoints", "Entrypoints definition using format: --entryPoints='Name:http Address::8000 Redirect.EntryPoint:https' --entryPoints='Name:https Address::4442 TLS:tests/traefik.crt,tests/traefik.key'") + traefikCmd.PersistentFlags().Var(&arguments.DefaultEntryPoints, "defaultEntryPoints", "Entrypoints to be used by frontends that do not specify any entrypoint") traefikCmd.PersistentFlags().StringP("logLevel", "l", "ERROR", "Log level") traefikCmd.PersistentFlags().DurationVar(&arguments.ProvidersThrottleDuration, "providersThrottleDuration", time.Duration(2*time.Second), "Backends throttle duration: minimum duration between 2 events from providers before applying a new configuration. It avoids unnecessary reloads if multiples events are sent in a short amount of time.") traefikCmd.PersistentFlags().Int("maxIdleConnsPerHost", 0, "If non-zero, controls the maximum idle (keep-alive) to keep per-host. If zero, DefaultMaxIdleConnsPerHost is used") @@ -138,13 +141,13 @@ func init() { viper.BindPFlag("configFile", traefikCmd.PersistentFlags().Lookup("configFile")) viper.BindPFlag("port", traefikCmd.PersistentFlags().Lookup("port")) viper.BindPFlag("graceTimeOut", traefikCmd.PersistentFlags().Lookup("graceTimeOut")) - // viper.BindPFlag("certificates", TraefikCmd.PersistentFlags().Lookup("certificates")) + //viper.BindPFlag("defaultEntryPoints", traefikCmd.PersistentFlags().Lookup("defaultEntryPoints")) viper.BindPFlag("logLevel", traefikCmd.PersistentFlags().Lookup("logLevel")) // TODO: wait for this issue to be corrected: https://github.com/spf13/viper/issues/105 viper.BindPFlag("providersThrottleDuration", traefikCmd.PersistentFlags().Lookup("providersThrottleDuration")) viper.BindPFlag("maxIdleConnsPerHost", traefikCmd.PersistentFlags().Lookup("maxIdleConnsPerHost")) - viper.SetDefault("certificates", &Certificates{}) viper.SetDefault("providersThrottleDuration", time.Duration(2*time.Second)) + viper.SetDefault("logLevel", "ERROR") } func run() { @@ -176,7 +179,8 @@ func run() { } else { log.SetFormatter(&log.TextFormatter{FullTimestamp: true, DisableSorting: true}) } - log.Debugf("Global configuration loaded %+v", globalConfiguration) + jsonConf, _ := json.Marshal(globalConfiguration) + log.Debugf("Global configuration loaded %s", string(jsonConf)) server := NewServer(*globalConfiguration) server.Start() defer server.Close() diff --git a/configuration.go b/configuration.go index 5db36deaf..e02a1fbb5 100644 --- a/configuration.go +++ b/configuration.go @@ -11,17 +11,18 @@ import ( "github.com/emilevauge/traefik/types" "github.com/mitchellh/mapstructure" "github.com/spf13/viper" + "regexp" ) // GlobalConfiguration holds global configuration (with providers, etc.). // It's populated from the traefik configuration file passed as an argument to the binary. type GlobalConfiguration struct { - Port string GraceTimeOut int64 AccessLogsFile string TraefikLogsFile string - Certificates Certificates LogLevel string + EntryPoints EntryPoints + DefaultEntryPoints DefaultEntryPoints ProvidersThrottleDuration time.Duration MaxIdleConnsPerHost int Docker *provider.Docker @@ -34,6 +35,110 @@ type GlobalConfiguration struct { Boltdb *provider.BoltDb } +// DefaultEntryPoints holds default entry points +type DefaultEntryPoints []string + +// String is the method to format the flag's value, part of the flag.Value interface. +// The String method's output will be used in diagnostics. +func (dep *DefaultEntryPoints) String() string { + return fmt.Sprintf("%#v", dep) +} + +// Set is the method to set the flag value, part of the flag.Value interface. +// Set's argument is a string to be parsed to set the flag. +// It's a comma-separated list, so we split it. +func (dep *DefaultEntryPoints) Set(value string) error { + entrypoints := strings.Split(value, ",") + if len(entrypoints) == 0 { + return errors.New("Bad DefaultEntryPoints format: " + value) + } + for _, entrypoint := range entrypoints { + *dep = append(*dep, entrypoint) + } + return nil +} + +// Type is type of the struct +func (dep *DefaultEntryPoints) Type() string { + return fmt.Sprint("defaultentrypoints²") +} + +// EntryPoints holds entry points configuration of the reverse proxy (ip, port, TLS...) +type EntryPoints map[string]*EntryPoint + +// String is the method to format the flag's value, part of the flag.Value interface. +// The String method's output will be used in diagnostics. +func (ep *EntryPoints) String() string { + return "" +} + +// Set is the method to set the flag value, part of the flag.Value interface. +// Set's argument is a string to be parsed to set the flag. +// It's a comma-separated list, so we split it. +func (ep *EntryPoints) Set(value string) error { + regex := regexp.MustCompile("(?:Name:(?P\\S*))\\s*(?:Address:(?P
\\S*))?\\s*(?:TLS:(?P\\S*))?\\s*(?:Redirect.EntryPoint:(?P\\S*))?\\s*(?:Redirect.Regex:(?P\\S*))?\\s*(?:Redirect.Replacement:(?P\\S*))?") + match := regex.FindAllStringSubmatch(value, -1) + if match == nil { + return errors.New("Bad EntryPoints format: " + value) + } + matchResult := match[0] + result := make(map[string]string) + for i, name := range regex.SubexpNames() { + if i != 0 { + result[name] = matchResult[i] + } + } + var tls *TLS + if len(result["TLS"]) > 0 { + certs := Certificates{} + certs.Set(result["TLS"]) + tls = &TLS{ + Certificates: certs, + } + } + var redirect *Redirect + if len(result["RedirectEntryPoint"]) > 0 || len(result["RedirectRegex"]) > 0 || len(result["RedirectReplacement"]) > 0 { + redirect = &Redirect{ + EntryPoint: result["RedirectEntryPoint"], + Regex: result["RedirectRegex"], + Replacement: result["RedirectReplacement"], + } + } + + (*ep)[result["Name"]] = &EntryPoint{ + Address: result["Address"], + TLS: tls, + Redirect: redirect, + } + + return nil +} + +// Type is type of the struct +func (ep *EntryPoints) Type() string { + return fmt.Sprint("entrypoints²") +} + +// EntryPoint holds an entry point configuration of the reverse proxy (ip, port, TLS...) +type EntryPoint struct { + Network string + Address string + TLS *TLS + Redirect *Redirect +} + +// Redirect configures a redirection of an entry point to another, or to an URL +type Redirect struct { + EntryPoint string + Regex string + Replacement string +} + +// TLS configures TLS for an entry point +type TLS struct { + Certificates Certificates +} + // Certificates defines traefik certificates type type Certificates []Certificate @@ -74,14 +179,7 @@ type Certificate struct { // NewGlobalConfiguration returns a GlobalConfiguration with default values. func NewGlobalConfiguration() *GlobalConfiguration { - globalConfiguration := new(GlobalConfiguration) - // default values - globalConfiguration.Port = ":80" - globalConfiguration.GraceTimeOut = 10 - globalConfiguration.LogLevel = "ERROR" - globalConfiguration.ProvidersThrottleDuration = time.Duration(2 * time.Second) - - return globalConfiguration + return new(GlobalConfiguration) } // LoadConfiguration returns a GlobalConfiguration. @@ -101,8 +199,12 @@ func LoadConfiguration() *GlobalConfiguration { if err := viper.ReadInConfig(); err != nil { fmtlog.Fatalf("Error reading file: %s", err) } - if len(arguments.Certificates) > 0 { - viper.Set("certificates", arguments.Certificates) + + if len(arguments.EntryPoints) > 0 { + viper.Set("entryPoints", arguments.EntryPoints) + } + if len(arguments.DefaultEntryPoints) > 0 { + viper.Set("defaultEntryPoints", arguments.DefaultEntryPoints) } if arguments.web { viper.Set("web", arguments.Web) @@ -135,6 +237,19 @@ func LoadConfiguration() *GlobalConfiguration { fmtlog.Fatalf("Error reading file: %s", err) } + if len(configuration.EntryPoints) == 0 { + configuration.EntryPoints = make(map[string]*EntryPoint) + configuration.EntryPoints["http"] = &EntryPoint{ + Address: ":80", + } + configuration.DefaultEntryPoints = []string{"http"} + } + + if configuration.File != nil && len(configuration.File.Filename) == 0 { + // no filename, setting to global config file + configuration.File.Filename = viper.ConfigFileUsed() + } + return configuration } diff --git a/glide.yaml b/glide.yaml index 376b55c35..9a91f4b96 100644 --- a/glide.yaml +++ b/glide.yaml @@ -145,7 +145,7 @@ import: - package: github.com/donovanhide/eventsource ref: d8a3071799b98cacd30b6da92f536050ccfe6da4 - package: github.com/golang/glog - ref: fca8c8854093a154ff1eb580aae10276ad6b1b5f + ref: fca8c8854093a154ff1eb580aae10276ad6b1b5f - package: github.com/spf13/cast ref: ee7b3e0353166ab1f3a605294ac8cd2b77953778 - package: github.com/mitchellh/mapstructure @@ -161,4 +161,5 @@ import: - package: github.com/spf13/cobra subpackages: - /cobra + - package: github.com/vulcand/vulcand/plugin/rewrite diff --git a/middlewares/rewrite.go b/middlewares/rewrite.go new file mode 100644 index 000000000..eaaff6bec --- /dev/null +++ b/middlewares/rewrite.go @@ -0,0 +1,31 @@ +package middlewares + +import ( + log "github.com/Sirupsen/logrus" + "github.com/vulcand/vulcand/plugin/rewrite" + "net/http" +) + +// Rewrite is a middleware that allows redirections +type Rewrite struct { + rewriter *rewrite.Rewrite +} + +// NewRewrite creates a Rewrite middleware +func NewRewrite(regex, replacement string, redirect bool) (*Rewrite, error) { + rewriter, err := rewrite.NewRewrite(regex, replacement, false, redirect) + if err != nil { + return nil, err + } + return &Rewrite{rewriter: rewriter}, nil +} + +// +func (rewrite *Rewrite) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) { + handler, err := rewrite.rewriter.NewHandler(next) + if err != nil { + log.Error("Error in rewrite middleware ", err) + return + } + handler.ServeHTTP(rw, r) +} diff --git a/server.go b/server.go index 5b70fa1fa..530df5107 100644 --- a/server.go +++ b/server.go @@ -5,6 +5,7 @@ package main import ( "crypto/tls" + "encoding/json" "errors" log "github.com/Sirupsen/logrus" "github.com/codegangsta/negroni" @@ -16,12 +17,12 @@ import ( "github.com/mailgun/oxy/cbreaker" "github.com/mailgun/oxy/forward" "github.com/mailgun/oxy/roundrobin" - "github.com/spf13/viper" "net/http" "net/url" "os" "os/signal" "reflect" + "regexp" "sync" "syscall" "time" @@ -31,11 +32,10 @@ var oxyLogger = &OxyLogger{} // Server is the reverse-proxy/load-balancer engine type Server struct { - srv *manners.GracefulServer - configurationRouter *mux.Router + serverEntryPoints map[string]serverEntryPoint configurationChan chan types.ConfigMessage - configurationChanValidated chan types.ConfigMessage - sigs chan os.Signal + configurationValidatedChan chan types.ConfigMessage + signals chan os.Signal stopChan chan bool providers []provider.Provider serverLock sync.Mutex @@ -44,16 +44,22 @@ type Server struct { loggerMiddleware *middlewares.Logger } +type serverEntryPoint struct { + httpServer *manners.GracefulServer + httpRouter *mux.Router +} + // NewServer returns an initialized Server. func NewServer(globalConfiguration GlobalConfiguration) *Server { server := new(Server) + server.serverEntryPoints = make(map[string]serverEntryPoint) server.configurationChan = make(chan types.ConfigMessage, 10) - server.configurationChanValidated = make(chan types.ConfigMessage, 10) - server.sigs = make(chan os.Signal, 1) + server.configurationValidatedChan = make(chan types.ConfigMessage, 10) + server.signals = make(chan os.Signal, 1) server.stopChan = make(chan bool) server.providers = []provider.Provider{} - signal.Notify(server.sigs, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(server.signals, syscall.SIGINT, syscall.SIGTERM) server.currentConfigurations = make(configs) server.globalConfiguration = globalConfiguration server.loggerMiddleware = middlewares.NewLogger(globalConfiguration.AccessLogsFile) @@ -63,38 +69,27 @@ func NewServer(globalConfiguration GlobalConfiguration) *Server { // Start starts the server and blocks until server is shutted down. func (server *Server) Start() { - server.configurationRouter = LoadDefaultConfig(server.globalConfiguration) go server.listenProviders() - go server.enableRouter() + go server.listenConfigurations() server.configureProviders() server.startProviders() go server.listenSignals() - - var er error - server.serverLock.Lock() - server.srv, er = server.prepareServer(server.configurationRouter, server.globalConfiguration, nil, server.loggerMiddleware, metrics) - if er != nil { - log.Fatal("Error preparing server: ", er) - } - go server.startServer(server.srv, server.globalConfiguration) - //TODO change that! - time.Sleep(100 * time.Millisecond) - server.serverLock.Unlock() - <-server.stopChan } // Stop stops the server func (server *Server) Stop() { - server.srv.Close() + for _, serverEntryPoint := range server.serverEntryPoints { + serverEntryPoint.httpServer.Close() + } server.stopChan <- true } // Close destroys the server func (server *Server) Close() { close(server.configurationChan) - close(server.configurationChanValidated) - close(server.sigs) + close(server.configurationValidatedChan) + close(server.signals) close(server.stopChan) server.loggerMiddleware.Close() } @@ -104,19 +99,20 @@ func (server *Server) listenProviders() { lastConfigs := make(map[string]*types.ConfigMessage) for { configMsg := <-server.configurationChan - log.Debugf("Configuration receveived from provider %s: %#v", configMsg.ProviderName, configMsg.Configuration) + jsonConf, _ := json.Marshal(configMsg.Configuration) + log.Debugf("Configuration receveived from provider %s: %s", configMsg.ProviderName, string(jsonConf)) lastConfigs[configMsg.ProviderName] = &configMsg if time.Now().After(lastReceivedConfiguration.Add(time.Duration(server.globalConfiguration.ProvidersThrottleDuration))) { log.Debugf("Last %s config received more than %s, OK", configMsg.ProviderName, server.globalConfiguration.ProvidersThrottleDuration) // last config received more than n s ago - server.configurationChanValidated <- configMsg + server.configurationValidatedChan <- configMsg } else { log.Debugf("Last %s config received less than %s, waiting...", configMsg.ProviderName, server.globalConfiguration.ProvidersThrottleDuration) go func() { <-time.After(server.globalConfiguration.ProvidersThrottleDuration) if time.Now().After(lastReceivedConfiguration.Add(time.Duration(server.globalConfiguration.ProvidersThrottleDuration))) { log.Debugf("Waited for %s config, OK", configMsg.ProviderName) - server.configurationChanValidated <- *lastConfigs[configMsg.ProviderName] + server.configurationValidatedChan <- *lastConfigs[configMsg.ProviderName] } }() } @@ -124,9 +120,9 @@ func (server *Server) listenProviders() { } } -func (server *Server) enableRouter() { +func (server *Server) listenConfigurations() { for { - configMsg := <-server.configurationChanValidated + configMsg := <-server.configurationValidatedChan if configMsg.Configuration == nil { log.Info("Skipping empty Configuration") } else if reflect.DeepEqual(server.currentConfigurations[configMsg.ProviderName], configMsg.Configuration) { @@ -139,22 +135,26 @@ func (server *Server) enableRouter() { } newConfigurations[configMsg.ProviderName] = configMsg.Configuration - newConfigurationRouter, err := server.loadConfig(newConfigurations, server.globalConfiguration) + newServerEntryPoints, err := server.loadConfig(newConfigurations, server.globalConfiguration) if err == nil { server.serverLock.Lock() - server.currentConfigurations = newConfigurations - server.configurationRouter = newConfigurationRouter - oldServer := server.srv - newsrv, err := server.prepareServer(server.configurationRouter, server.globalConfiguration, oldServer, server.loggerMiddleware, metrics) - if err != nil { - log.Fatal("Error preparing server: ", err) - } - go server.startServer(newsrv, server.globalConfiguration) - server.srv = newsrv - time.Sleep(1 * time.Second) - if oldServer != nil { - log.Info("Stopping old server") - oldServer.Close() + for newServerEntryPointName, newServerEntryPoint := range newServerEntryPoints { + currentServerEntryPoint := server.serverEntryPoints[newServerEntryPointName] + server.currentConfigurations = newConfigurations + currentServerEntryPoint.httpRouter = newServerEntryPoint.httpRouter + oldServer := currentServerEntryPoint.httpServer + newsrv, err := server.prepareServer(currentServerEntryPoint.httpRouter, server.globalConfiguration.EntryPoints[newServerEntryPointName], oldServer, server.loggerMiddleware, metrics) + if err != nil { + log.Fatal("Error preparing server: ", err) + } + go server.startServer(newsrv, server.globalConfiguration) + currentServerEntryPoint.httpServer = newsrv + server.serverEntryPoints[newServerEntryPointName] = currentServerEntryPoint + time.Sleep(1 * time.Second) + if oldServer != nil { + log.Info("Stopping old server") + oldServer.Close() + } } server.serverLock.Unlock() } else { @@ -173,10 +173,6 @@ func (server *Server) configureProviders() { server.providers = append(server.providers, server.globalConfiguration.Marathon) } if server.globalConfiguration.File != nil { - if len(server.globalConfiguration.File.Filename) == 0 { - // no filename, setting to global config file - server.globalConfiguration.File.Filename = viper.GetString("configFile") - } server.providers = append(server.providers, server.globalConfiguration.File) } if server.globalConfiguration.Web != nil { @@ -200,7 +196,8 @@ func (server *Server) configureProviders() { func (server *Server) startProviders() { // start providers for _, provider := range server.providers { - log.Infof("Starting provider %v %+v", reflect.TypeOf(provider), provider) + jsonConf, _ := json.Marshal(provider) + log.Infof("Starting provider %v %s", reflect.TypeOf(provider), jsonConf) currentProvider := provider go func() { err := currentProvider.Provide(server.configurationChan) @@ -212,15 +209,18 @@ func (server *Server) startProviders() { } func (server *Server) listenSignals() { - sig := <-server.sigs + sig := <-server.signals log.Infof("I have to go... %+v", sig) log.Info("Stopping server") server.Stop() } // creates a TLS config that allows terminating HTTPS for multiple domains using SNI -func (server *Server) createTLSConfig(certs []Certificate) (*tls.Config, error) { - if len(certs) == 0 { +func (server *Server) createTLSConfig(tlsOption *TLS) (*tls.Config, error) { + if tlsOption == nil { + return nil, nil + } + if len(tlsOption.Certificates) == 0 { return nil, nil } @@ -230,8 +230,8 @@ func (server *Server) createTLSConfig(certs []Certificate) (*tls.Config, error) } var err error - config.Certificates = make([]tls.Certificate, len(certs)) - for i, v := range certs { + config.Certificates = make([]tls.Certificate, len(tlsOption.Certificates)) + for i, v := range tlsOption.Certificates { config.Certificates[i], err = tls.LoadX509KeyPair(v.CertFile, v.KeyFile) if err != nil { return nil, err @@ -244,7 +244,7 @@ func (server *Server) createTLSConfig(certs []Certificate) (*tls.Config, error) } func (server *Server) startServer(srv *manners.GracefulServer, globalConfiguration GlobalConfiguration) { - log.Info("Starting server") + log.Info("Starting server on ", srv.Addr) if srv.TLSConfig != nil { err := srv.ListenAndServeTLSWithConfig(srv.TLSConfig) if err != nil { @@ -259,7 +259,7 @@ func (server *Server) startServer(srv *manners.GracefulServer, globalConfigurati log.Info("Server stopped") } -func (server *Server) prepareServer(router *mux.Router, globalConfiguration GlobalConfiguration, oldServer *manners.GracefulServer, middlewares ...negroni.Handler) (*manners.GracefulServer, error) { +func (server *Server) prepareServer(router *mux.Router, entryPoint *EntryPoint, oldServer *manners.GracefulServer, middlewares ...negroni.Handler) (*manners.GracefulServer, error) { log.Info("Preparing server") // middlewares var negroni = negroni.New() @@ -267,7 +267,7 @@ func (server *Server) prepareServer(router *mux.Router, globalConfiguration Glob negroni.Use(middleware) } negroni.UseHandler(router) - tlsConfig, err := server.createTLSConfig(globalConfiguration.Certificates) + tlsConfig, err := server.createTLSConfig(entryPoint.TLS) if err != nil { log.Fatalf("Error creating TLS config %s", err) return nil, err @@ -276,13 +276,13 @@ func (server *Server) prepareServer(router *mux.Router, globalConfiguration Glob if oldServer == nil { return manners.NewWithServer( &http.Server{ - Addr: globalConfiguration.Port, + Addr: entryPoint.Address, Handler: negroni, TLSConfig: tlsConfig, }), nil } gracefulServer, err := oldServer.HijackListener(&http.Server{ - Addr: globalConfiguration.Port, + Addr: entryPoint.Address, Handler: negroni, TLSConfig: tlsConfig, }, tlsConfig) @@ -293,80 +293,147 @@ func (server *Server) prepareServer(router *mux.Router, globalConfiguration Glob return gracefulServer, nil } +func (server *Server) buildEntryPoints(globalConfiguration GlobalConfiguration) map[string]serverEntryPoint { + serverEntryPoints := make(map[string]serverEntryPoint) + for entryPointName := range globalConfiguration.EntryPoints { + router := server.buildDefaultHTTPRouter() + serverEntryPoints[entryPointName] = serverEntryPoint{ + httpRouter: router, + } + } + return serverEntryPoints +} + // LoadConfig returns a new gorilla.mux Route from the specified global configuration and the dynamic // provider configurations. -func (server *Server) loadConfig(configurations configs, globalConfiguration GlobalConfiguration) (*mux.Router, error) { - router := mux.NewRouter() - router.NotFoundHandler = http.HandlerFunc(notFoundHandler) +func (server *Server) loadConfig(configurations configs, globalConfiguration GlobalConfiguration) (map[string]serverEntryPoint, error) { + serverEntryPoints := server.buildEntryPoints(globalConfiguration) + redirectHandlers := make(map[string]http.Handler) + backends := map[string]http.Handler{} for _, configuration := range configurations { for frontendName, frontend := range configuration.Frontends { - log.Infof("Creating frontend %s", frontendName) + log.Debugf("Creating frontend %s", frontendName) fwd, _ := forward.New(forward.Logger(oxyLogger), forward.PassHostHeader(frontend.PassHostHeader)) - newRoute := router.NewRoute().Name(frontendName) - for routeName, route := range frontend.Routes { - log.Infof("Creating route %s %s:%s", routeName, route.Rule, route.Value) - newRouteReflect, err := invoke(newRoute, route.Rule, route.Value) - if err != nil { - return nil, err - } - newRoute = newRouteReflect[0].Interface().(*mux.Route) + // default endpoints if not defined in frontends + if len(frontend.EntryPoints) == 0 { + frontend.EntryPoints = globalConfiguration.DefaultEntryPoints } - if backends[frontend.Backend] == nil { - log.Infof("Creating backend %s", frontend.Backend) - var lb http.Handler - rr, _ := roundrobin.New(fwd) - if configuration.Backends[frontend.Backend] == nil { - return nil, errors.New("Backend not found: " + frontend.Backend) + for _, entryPointName := range frontend.EntryPoints { + log.Debugf("Wiring frontend %s to entryPoint %s", frontendName, entryPointName) + if _, ok := serverEntryPoints[entryPointName]; !ok { + return nil, errors.New("Undefined entrypoint: " + entryPointName) } - lbMethod, err := types.NewLoadBalancerMethod(configuration.Backends[frontend.Backend].LoadBalancer) - if err != nil { - configuration.Backends[frontend.Backend].LoadBalancer = &types.LoadBalancer{Method: "wrr"} - } - switch lbMethod { - case types.Drr: - log.Infof("Creating load-balancer drr") - rebalancer, _ := roundrobin.NewRebalancer(rr, roundrobin.RebalancerLogger(oxyLogger)) - lb = rebalancer - for serverName, server := range configuration.Backends[frontend.Backend].Servers { - url, err := url.Parse(server.URL) - if err != nil { - return nil, err - } - log.Infof("Creating server %s %s", serverName, url.String()) - rebalancer.UpsertServer(url, roundrobin.Weight(server.Weight)) - } - case types.Wrr: - log.Infof("Creating load-balancer wrr") - lb = middlewares.NewWebsocketUpgrader(rr) - for serverName, server := range configuration.Backends[frontend.Backend].Servers { - url, err := url.Parse(server.URL) - if err != nil { - return nil, err - } - log.Infof("Creating server %s at %s with weight %d", serverName, url.String(), server.Weight) - rr.UpsertServer(url, roundrobin.Weight(server.Weight)) + newRoute := serverEntryPoints[entryPointName].httpRouter.NewRoute().Name(frontendName) + for routeName, route := range frontend.Routes { + log.Debugf("Creating route %s %s:%s", routeName, route.Rule, route.Value) + newRouteReflect, err := invoke(newRoute, route.Rule, route.Value) + if err != nil { + return nil, err } + newRoute = newRouteReflect[0].Interface().(*mux.Route) } - var negroni = negroni.New() - if configuration.Backends[frontend.Backend].CircuitBreaker != nil { - log.Infof("Creating circuit breaker %s", configuration.Backends[frontend.Backend].CircuitBreaker.Expression) - negroni.Use(middlewares.NewCircuitBreaker(lb, configuration.Backends[frontend.Backend].CircuitBreaker.Expression, cbreaker.Logger(oxyLogger))) + entryPoint := globalConfiguration.EntryPoints[entryPointName] + if entryPoint.Redirect != nil { + if redirectHandlers[entryPointName] != nil { + newRoute.Handler(redirectHandlers[entryPointName]) + } else if handler, err := server.loadEntryPointConfig(entryPointName, entryPoint); err != nil { + return nil, err + } else { + newRoute.Handler(handler) + redirectHandlers[entryPointName] = handler + } } else { - negroni.UseHandler(lb) + if backends[frontend.Backend] == nil { + log.Debugf("Creating backend %s", frontend.Backend) + var lb http.Handler + rr, _ := roundrobin.New(fwd) + if configuration.Backends[frontend.Backend] == nil { + return nil, errors.New("Undefined backend: " + frontend.Backend) + } + lbMethod, err := types.NewLoadBalancerMethod(configuration.Backends[frontend.Backend].LoadBalancer) + if err != nil { + configuration.Backends[frontend.Backend].LoadBalancer = &types.LoadBalancer{Method: "wrr"} + } + switch lbMethod { + case types.Drr: + log.Debugf("Creating load-balancer drr") + rebalancer, _ := roundrobin.NewRebalancer(rr, roundrobin.RebalancerLogger(oxyLogger)) + lb = rebalancer + for serverName, server := range configuration.Backends[frontend.Backend].Servers { + url, err := url.Parse(server.URL) + if err != nil { + return nil, err + } + log.Debugf("Creating server %s at %s with weight %d", serverName, url.String(), server.Weight) + rebalancer.UpsertServer(url, roundrobin.Weight(server.Weight)) + } + case types.Wrr: + log.Debugf("Creating load-balancer wrr") + lb = middlewares.NewWebsocketUpgrader(rr) + for serverName, server := range configuration.Backends[frontend.Backend].Servers { + url, err := url.Parse(server.URL) + if err != nil { + return nil, err + } + log.Debugf("Creating server %s at %s with weight %d", serverName, url.String(), server.Weight) + rr.UpsertServer(url, roundrobin.Weight(server.Weight)) + } + } + var negroni = negroni.New() + if configuration.Backends[frontend.Backend].CircuitBreaker != nil { + log.Debugf("Creating circuit breaker %s", configuration.Backends[frontend.Backend].CircuitBreaker.Expression) + negroni.Use(middlewares.NewCircuitBreaker(lb, configuration.Backends[frontend.Backend].CircuitBreaker.Expression, cbreaker.Logger(oxyLogger))) + } else { + negroni.UseHandler(lb) + } + backends[frontend.Backend] = negroni + } else { + log.Debugf("Reusing backend %s", frontend.Backend) + } + newRoute.Handler(backends[frontend.Backend]) + } + err := newRoute.GetError() + if err != nil { + log.Errorf("Error building route: %s", err) } - backends[frontend.Backend] = negroni - } else { - log.Infof("Reusing backend %s", frontend.Backend) - } - // stream.New(backends[frontend.Backend], stream.Retry("IsNetworkError() && Attempts() <= " + strconv.Itoa(globalConfiguration.Replay)), stream.Logger(oxyLogger)) - - newRoute.Handler(backends[frontend.Backend]) - err := newRoute.GetError() - if err != nil { - log.Errorf("Error building route: %s", err) } } } - return router, nil + return serverEntryPoints, nil +} + +func (server *Server) loadEntryPointConfig(entryPointName string, entryPoint *EntryPoint) (http.Handler, error) { + regex := entryPoint.Redirect.Regex + replacement := entryPoint.Redirect.Replacement + if len(entryPoint.Redirect.EntryPoint) > 0 { + regex = "^(?:https?:\\/\\/)?([\\da-z\\.-]+)(?::\\d+)(.*)$" + if server.globalConfiguration.EntryPoints[entryPoint.Redirect.EntryPoint] == nil { + return nil, errors.New("Unkown entrypoint " + entryPoint.Redirect.EntryPoint) + } + protocol := "http" + if server.globalConfiguration.EntryPoints[entryPoint.Redirect.EntryPoint].TLS != nil { + protocol = "https" + } + r, _ := regexp.Compile("(:\\d+)") + match := r.FindStringSubmatch(server.globalConfiguration.EntryPoints[entryPoint.Redirect.EntryPoint].Address) + if len(match) == 0 { + return nil, errors.New("Bad Address format: " + server.globalConfiguration.EntryPoints[entryPoint.Redirect.EntryPoint].Address) + } + replacement = protocol + "://$1" + match[0] + "$2" + } + rewrite, err := middlewares.NewRewrite(regex, replacement, true) + if err != nil { + return nil, err + } + log.Debugf("Creating entryPoint redirect %s -> %s : %s -> %s", entryPointName, entryPoint.Redirect.EntryPoint, regex, replacement) + negroni := negroni.New() + negroni.Use(rewrite) + return negroni, nil +} + +func (server *Server) buildDefaultHTTPRouter() *mux.Router { + router := mux.NewRouter() + router.NotFoundHandler = http.HandlerFunc(notFoundHandler) + return router } diff --git a/types/types.go b/types/types.go index 22abb8dd2..30bfbf483 100644 --- a/types/types.go +++ b/types/types.go @@ -36,6 +36,7 @@ type Route struct { // Frontend holds frontend configuration. type Frontend struct { + EntryPoints []string `json:"entryPoints,omitempty"` Backend string `json:"backend,omitempty"` Routes map[string]Route `json:"routes,omitempty"` PassHostHeader bool `json:"passHostHeader,omitempty"` diff --git a/webui/src/app/sections/providers/frontend-monitor/frontend-monitor.html b/webui/src/app/sections/providers/frontend-monitor/frontend-monitor.html index c5f3970be..48c8e67ba 100644 --- a/webui/src/app/sections/providers/frontend-monitor/frontend-monitor.html +++ b/webui/src/app/sections/providers/frontend-monitor/frontend-monitor.html @@ -17,6 +17,7 @@
+ {{entryPoint}}  Pass Host Header