From 8737530a7d9ec2b4aa0313cd9ef33f084b165656 Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Sun, 27 Mar 2016 01:05:17 +0100 Subject: [PATCH] Refactor frontends rules Signed-off-by: Emile Vauge --- docs/index.md | 2 +- glide.lock | 6 +- glide.yaml | 2 +- integration/docker_test.go | 3 +- integration/fixtures/file/simple.toml | 6 +- integration/fixtures/https/https_sni.toml | 6 +- .../{StripPrefix.go => stripPrefix.go} | 5 + provider/consul_catalog.go | 2 +- provider/consul_catalog_test.go | 7 +- provider/docker.go | 33 ++---- provider/docker_test.go | 100 +++++------------- provider/marathon.go | 12 +-- provider/marathon_test.go | 42 ++------ provider/provider.go | 9 ++ rules.go | 92 ++++++++++++++++ server.go | 75 +++++-------- templates/consul_catalog.tmpl | 3 +- templates/docker.tmpl | 1 - templates/kv.tmpl | 1 - templates/marathon.tmpl | 1 - tests/whoami.json | 3 +- types/types.go | 3 +- .../frontend-monitor/frontend-monitor.html | 4 +- webui/src/index.html | 2 +- 24 files changed, 198 insertions(+), 222 deletions(-) rename middlewares/{StripPrefix.go => stripPrefix.go} (81%) create mode 100644 rules.go diff --git a/docs/index.md b/docs/index.md index 188104170..c28542796 100644 --- a/docs/index.md +++ b/docs/index.md @@ -792,7 +792,7 @@ Labels can be used on containers to override default behaviour: - `traefik.protocol=https`: override the default `http` protocol - `traefik.weight=10`: assign this weight to the container - `traefik.enable=false`: disable this container in Træfɪk -- `traefik.frontend.rule=Host`: override the default frontend rule (Default: Host). See [frontends](#frontends). +- `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}`). See [frontends](#frontends). - `traefik.frontend.value=test.example.com`: override the default frontend value (Default: `{containerName}.{domain}`) See [frontends](#frontends). Must be associated with label traefik.frontend.rule. - `traefik.frontend.passHostHeader=true`: forward client `Host` header to the backend. - `traefik.frontend.entryPoints=http,https`: assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`. diff --git a/glide.lock b/glide.lock index 07939a6a6..22a3d782f 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 21d4e8dc80c87101568a719ecf01d1af9a1b58f03c5c9dc864a8cb1005ddc160 -updated: 2016-03-29T21:50:20.577439177+02:00 +hash: a8cca3f2e5bde6b96d0c195402b14606877bc8630cd7f2f06e65e0884c6a008b +updated: 2016-03-29T23:24:08.772606184+02:00 imports: - name: github.com/alecthomas/template version: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0 @@ -264,7 +264,7 @@ imports: subpackages: - bson - name: gopkg.in/square/go-jose.v1 - version: 7d9df93c5ee8a09ed250b3b2360972fa29b4bb3c + version: 40d457b439244b546f023d056628e5184136899b subpackages: - cipher - json diff --git a/glide.yaml b/glide.yaml index 77db5e230..40d65a62e 100644 --- a/glide.yaml +++ b/glide.yaml @@ -44,7 +44,7 @@ import: ref: 6b4e7dc5e3143b85ea77909c72caf89416fc2915 - package: github.com/gambol99/go-marathon ref: ade11d1dc2884ee1f387078fc28509559b6235d1 - - package: github.com/mailgun/predicate + - package: github.com/vulcand/predicate ref: cb0bff91a7ab7cf7571e661ff883fc997bc554a3 - package: github.com/thoas/stats ref: 54ed61c2b47e263ae2f01b86837b0c4bd1da28e8 diff --git a/integration/docker_test.go b/integration/docker_test.go index 5293dbb4a..f06406acb 100644 --- a/integration/docker_test.go +++ b/integration/docker_test.go @@ -133,8 +133,7 @@ func (s *DockerSuite) TestDockerContainersWithLabels(c *check.C) { defer os.Remove(file) // Start a container with some labels labels := map[string]string{ - "traefik.frontend.rule": "Host", - "traefik.frontend.value": "my.super.host", + "traefik.frontend.rule": "Host:my.super.host", } s.startContainerWithLabels(c, "swarm:1.0.0", labels, "manage", "token://blabla") diff --git a/integration/fixtures/file/simple.toml b/integration/fixtures/file/simple.toml index bcdc07c6e..e9cb7cc67 100644 --- a/integration/fixtures/file/simple.toml +++ b/integration/fixtures/file/simple.toml @@ -33,10 +33,8 @@ logLevel = "DEBUG" [frontends.frontend1] backend = "backend2" [frontends.frontend1.routes.test_1] - rule = "Host" - value = "test.localhost" + rule = "Host:test.localhost" [frontends.frontend2] backend = "backend1" [frontends.frontend2.routes.test_2] - rule = "Path" - value = "/test" + rule = "Path:/test" diff --git a/integration/fixtures/https/https_sni.toml b/integration/fixtures/https/https_sni.toml index 2a1fa04a9..66f737a36 100644 --- a/integration/fixtures/https/https_sni.toml +++ b/integration/fixtures/https/https_sni.toml @@ -27,10 +27,8 @@ defaultEntryPoints = ["https"] [frontends.frontend1] backend = "backend1" [frontends.frontend1.routes.test_1] - rule = "Host" - value = "snitest.com" + rule = "Host:snitest.com" [frontends.frontend2] backend = "backend2" [frontends.frontend2.routes.test_2] - rule = "Host" - value = "snitest.org" + rule = "Host:snitest.org" diff --git a/middlewares/StripPrefix.go b/middlewares/stripPrefix.go similarity index 81% rename from middlewares/StripPrefix.go rename to middlewares/stripPrefix.go index 244d2862a..92eb7a5f1 100644 --- a/middlewares/StripPrefix.go +++ b/middlewares/stripPrefix.go @@ -20,3 +20,8 @@ func (s *StripPrefix) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.NotFound(w, r) } } + +// SetHandler sets handler +func (s *StripPrefix) SetHandler(Handler http.Handler) { + s.Handler = Handler +} diff --git a/provider/consul_catalog.go b/provider/consul_catalog.go index c77d2dd23..01c823058 100644 --- a/provider/consul_catalog.go +++ b/provider/consul_catalog.go @@ -89,7 +89,7 @@ func (provider *ConsulCatalog) getBackend(node *api.ServiceEntry) string { } func (provider *ConsulCatalog) getFrontendValue(service string) string { - return service + "." + provider.Domain + return "Host:" + service + "." + provider.Domain } func (provider *ConsulCatalog) buildConfig(catalog []catalogUpdate) *types.Configuration { diff --git a/provider/consul_catalog_test.go b/provider/consul_catalog_test.go index c5086e627..9cf309838 100644 --- a/provider/consul_catalog_test.go +++ b/provider/consul_catalog_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/consul/api" ) -func TestConsulCatalogGetFrontendValue(t *testing.T) { +func TestConsulCatalogGetFrontendRule(t *testing.T) { provider := &ConsulCatalog{ Domain: "localhost", } @@ -19,7 +19,7 @@ func TestConsulCatalogGetFrontendValue(t *testing.T) { }{ { service: "foo", - expected: "foo.localhost", + expected: "Host:foo.localhost", }, } @@ -78,8 +78,7 @@ func TestConsulCatalogBuildConfig(t *testing.T) { Backend: "backend-test", Routes: map[string]types.Route{ "route-host-test": { - Rule: "Host", - Value: "test.localhost", + Rule: "Host:test.localhost", }, }, }, diff --git a/provider/docker.go b/provider/docker.go index 58939554f..ee81e45ba 100644 --- a/provider/docker.go +++ b/provider/docker.go @@ -2,7 +2,6 @@ package provider import ( "errors" - "fmt" "strconv" "strings" "text/template" @@ -108,7 +107,6 @@ func (provider *Docker) loadDockerConfig(containersInspected []docker.Container) "getProtocol": provider.getProtocol, "getPassHostHeader": provider.getPassHostHeader, "getEntryPoints": provider.getEntryPoints, - "getFrontendValue": provider.getFrontendValue, "getFrontendRule": provider.getFrontendRule, "replace": replace, } @@ -154,31 +152,18 @@ func containerFilter(container docker.Container) bool { return false } - labels, err := getLabels(container, []string{"traefik.frontend.rule", "traefik.frontend.value"}) - if len(labels) != 0 && err != nil { - log.Debugf("Filtering bad labeled container %s", container.Name) - return false - } + // labels, err := getLabels(container, []string{"traefik.frontend.rule"}) + // if len(labels) != 0 && err != nil { + // log.Debugf("Filtering bad labeled container %s", container.Name) + // return false + // } return true } func (provider *Docker) getFrontendName(container docker.Container) string { // Replace '.' with '-' in quoted keys because of this issue https://github.com/BurntSushi/toml/issues/78 - frontendName := fmt.Sprintf("%s-%s", provider.getFrontendRule(container), provider.getFrontendValue(container)) - frontendName = strings.Replace(frontendName, "[", "", -1) - frontendName = strings.Replace(frontendName, "]", "", -1) - - return strings.Replace(frontendName, ".", "-", -1) -} - -// GetFrontendValue returns the frontend value for the specified container, using -// it's label. It returns a default one if the label is not present. -func (provider *Docker) getFrontendValue(container docker.Container) string { - if label, err := getLabel(container, "traefik.frontend.value"); err == nil { - return label - } - return getEscapedName(container.Name) + "." + provider.Domain + return normalize(provider.getFrontendRule(container)) } // GetFrontendRule returns the frontend rule for the specified container, using @@ -187,14 +172,14 @@ func (provider *Docker) getFrontendRule(container docker.Container) string { if label, err := getLabel(container, "traefik.frontend.rule"); err == nil { return label } - return "Host" + return "Host:" + getEscapedName(container.Name) + "." + provider.Domain } func (provider *Docker) getBackend(container docker.Container) string { if label, err := getLabel(container, "traefik.backend"); err == nil { return label } - return getEscapedName(container.Name) + return normalize(container.Name) } func (provider *Docker) getPort(container docker.Container) string { @@ -211,7 +196,7 @@ func (provider *Docker) getWeight(container docker.Container) string { if label, err := getLabel(container, "traefik.weight"); err == nil { return label } - return "0" + return "1" } func (provider *Docker) getDomain(container docker.Container) string { diff --git a/provider/docker_test.go b/provider/docker_test.go index 2c51c0670..0dfb585f3 100644 --- a/provider/docker_test.go +++ b/provider/docker_test.go @@ -30,18 +30,18 @@ func TestDockerGetFrontendName(t *testing.T) { Name: "bar", Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.rule": "Header", + "traefik.frontend.rule": "Headers:User-Agent,bat/0.1.0", }, }, }, - expected: "Header-bar-docker-localhost", + expected: "Headers-User-Agent-bat-0-1-0", }, { container: docker.Container{ Name: "test", Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.value": "foo.bar", + "traefik.frontend.rule": "Host:foo.bar", }, }, }, @@ -52,24 +52,22 @@ func TestDockerGetFrontendName(t *testing.T) { Name: "test", Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.value": "foo.bar", - "traefik.frontend.rule": "Header", + "traefik.frontend.rule": "Path:/test", }, }, }, - expected: "Header-foo-bar", + expected: "Path-test", }, { container: docker.Container{ Name: "test", Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.value": "[foo.bar]", - "traefik.frontend.rule": "Header", + "traefik.frontend.rule": "PathPrefix:/test2", }, }, }, - expected: "Header-foo-bar", + expected: "PathPrefix-test2", }, } @@ -81,7 +79,7 @@ func TestDockerGetFrontendName(t *testing.T) { } } -func TestDockerGetFrontendValue(t *testing.T) { +func TestDockerGetFrontendRule(t *testing.T) { provider := &Docker{ Domain: "docker.localhost", } @@ -95,60 +93,36 @@ func TestDockerGetFrontendValue(t *testing.T) { Name: "foo", Config: &docker.Config{}, }, - expected: "foo.docker.localhost", + expected: "Host:foo.docker.localhost", }, { container: docker.Container{ Name: "bar", Config: &docker.Config{}, }, - expected: "bar.docker.localhost", + expected: "Host:bar.docker.localhost", }, { container: docker.Container{ Name: "test", Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.value": "foo.bar", + "traefik.frontend.rule": "Host:foo.bar", }, }, }, - expected: "foo.bar", - }, - } - - for _, e := range containers { - actual := provider.getFrontendValue(e.container) - if actual != e.expected { - t.Fatalf("expected %q, got %q", e.expected, actual) - } - } -} - -func TestDockerGetFrontendRule(t *testing.T) { - provider := &Docker{} - - containers := []struct { - container docker.Container - expected string - }{ - { - container: docker.Container{ - Name: "foo", - Config: &docker.Config{}, - }, - expected: "Host", + expected: "Host:foo.bar", }, { container: docker.Container{ Name: "test", Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.rule": "foo", + "traefik.frontend.rule": "Path:/test", }, }, }, - expected: "foo", + expected: "Path:/test", }, } @@ -281,7 +255,7 @@ func TestDockerGetWeight(t *testing.T) { Name: "foo", Config: &docker.Config{}, }, - expected: "0", + expected: "1", }, { container: docker.Container{ @@ -535,7 +509,7 @@ func TestDockerTraefikFilter(t *testing.T) { container: docker.Container{ Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.rule": "Host", + "traefik.frontend.rule": "Host:foo.bar", }, }, NetworkSettings: &docker.NetworkSettings{ @@ -544,22 +518,7 @@ func TestDockerTraefikFilter(t *testing.T) { }, }, }, - expected: false, - }, - { - container: docker.Container{ - Config: &docker.Config{ - Labels: map[string]string{ - "traefik.frontend.value": "foo.bar", - }, - }, - NetworkSettings: &docker.NetworkSettings{ - Ports: map[docker.Port][]docker.PortBinding{ - "80/tcp": {}, - }, - }, - }, - expected: false, + expected: true, }, { container: docker.Container{ @@ -634,8 +593,7 @@ func TestDockerTraefikFilter(t *testing.T) { container: docker.Container{ Config: &docker.Config{ Labels: map[string]string{ - "traefik.frontend.rule": "Host", - "traefik.frontend.value": "foo.bar", + "traefik.frontend.rule": "Host:foo.bar", }, }, NetworkSettings: &docker.NetworkSettings{ @@ -651,7 +609,7 @@ func TestDockerTraefikFilter(t *testing.T) { for _, e := range containers { actual := containerFilter(e.container) if actual != e.expected { - t.Fatalf("expected %v, got %v", e.expected, actual) + t.Fatalf("expected %v for %+v, got %+v", e.expected, e, actual) } } } @@ -690,8 +648,7 @@ func TestDockerLoadDockerConfig(t *testing.T) { EntryPoints: []string{}, Routes: map[string]types.Route{ `"route-frontend-Host-test-docker-localhost"`: { - Rule: "Host", - Value: "test.docker.localhost", + Rule: "Host:test.docker.localhost", }, }, }, @@ -700,7 +657,8 @@ func TestDockerLoadDockerConfig(t *testing.T) { "backend-test": { Servers: map[string]types.Server{ "server-test": { - URL: "http://127.0.0.1:80", + URL: "http://127.0.0.1:80", + Weight: 1, }, }, CircuitBreaker: nil, @@ -741,7 +699,7 @@ func TestDockerLoadDockerConfig(t *testing.T) { "80/tcp": {}, }, Networks: map[string]docker.ContainerNetwork{ - "bridgde": { + "bridge": { IPAddress: "127.0.0.1", }, }, @@ -754,8 +712,7 @@ func TestDockerLoadDockerConfig(t *testing.T) { EntryPoints: []string{"http", "https"}, Routes: map[string]types.Route{ `"route-frontend-Host-test1-docker-localhost"`: { - Rule: "Host", - Value: "test1.docker.localhost", + Rule: "Host:test1.docker.localhost", }, }, }, @@ -764,8 +721,7 @@ func TestDockerLoadDockerConfig(t *testing.T) { EntryPoints: []string{}, Routes: map[string]types.Route{ `"route-frontend-Host-test2-docker-localhost"`: { - Rule: "Host", - Value: "test2.docker.localhost", + Rule: "Host:test2.docker.localhost", }, }, }, @@ -774,10 +730,12 @@ func TestDockerLoadDockerConfig(t *testing.T) { "backend-foobar": { Servers: map[string]types.Server{ "server-test1": { - URL: "http://127.0.0.1:80", + URL: "http://127.0.0.1:80", + Weight: 1, }, "server-test2": { - URL: "http://127.0.0.1:80", + URL: "http://127.0.0.1:80", + Weight: 1, }, }, CircuitBreaker: nil, diff --git a/provider/marathon.go b/provider/marathon.go index 787b8e8fd..2f75e0ba1 100644 --- a/provider/marathon.go +++ b/provider/marathon.go @@ -96,7 +96,6 @@ func (provider *Marathon) loadMarathonConfig() *types.Configuration { "getProtocol": provider.getProtocol, "getPassHostHeader": provider.getPassHostHeader, "getEntryPoints": provider.getEntryPoints, - "getFrontendValue": provider.getFrontendValue, "getFrontendRule": provider.getFrontendRule, "getFrontendBackend": provider.getFrontendBackend, "replace": replace, @@ -309,22 +308,13 @@ func (provider *Marathon) getEntryPoints(application marathon.Application) []str return []string{} } -// getFrontendValue returns the frontend value for the specified application, using -// it's label. It returns a default one if the label is not present. -func (provider *Marathon) getFrontendValue(application marathon.Application) string { - if label, err := provider.getLabel(application, "traefik.frontend.value"); err == nil { - return label - } - return getEscapedName(application.ID) + "." + provider.Domain -} - // getFrontendRule returns the frontend rule for the specified application, using // it's label. It returns a default one (Host) if the label is not present. func (provider *Marathon) getFrontendRule(application marathon.Application) string { if label, err := provider.getLabel(application, "traefik.frontend.rule"); err == nil { return label } - return "Host" + return "Host:" + getEscapedName(application.ID) + "." + provider.Domain } func (provider *Marathon) getBackend(task marathon.Task, applications []marathon.Application) string { diff --git a/provider/marathon_test.go b/provider/marathon_test.go index 32fd00698..def8d5595 100644 --- a/provider/marathon_test.go +++ b/provider/marathon_test.go @@ -86,8 +86,7 @@ func TestMarathonLoadConfig(t *testing.T) { EntryPoints: []string{}, Routes: map[string]types.Route{ `route-host-test`: { - Rule: "Host", - Value: "test.docker.localhost", + Rule: "Host:test.docker.localhost", }, }, }, @@ -831,7 +830,7 @@ func TestMarathonGetEntryPoints(t *testing.T) { } } -func TestMarathonGetFrontendValue(t *testing.T) { +func TestMarathonGetFrontendRule(t *testing.T) { provider := &Marathon{ Domain: "docker.localhost", } @@ -842,50 +841,21 @@ func TestMarathonGetFrontendValue(t *testing.T) { }{ { application: marathon.Application{}, - expected: ".docker.localhost", + expected: "Host:.docker.localhost", }, { application: marathon.Application{ ID: "test", }, - expected: "test.docker.localhost", + expected: "Host:test.docker.localhost", }, { application: marathon.Application{ Labels: map[string]string{ - "traefik.frontend.value": "foo.bar", + "traefik.frontend.rule": "Host:foo.bar", }, }, - expected: "foo.bar", - }, - } - - for _, a := range applications { - actual := provider.getFrontendValue(a.application) - if actual != a.expected { - t.Fatalf("expected %q, got %q", a.expected, actual) - } - } -} - -func TestMarathonGetFrontendRule(t *testing.T) { - provider := &Marathon{} - - applications := []struct { - application marathon.Application - expected string - }{ - { - application: marathon.Application{}, - expected: "Host", - }, - { - application: marathon.Application{ - Labels: map[string]string{ - "traefik.frontend.rule": "Header", - }, - }, - expected: "Header", + expected: "Host:foo.bar", }, } diff --git a/provider/provider.go b/provider/provider.go index 0213b5034..a1c0c660e 100644 --- a/provider/provider.go +++ b/provider/provider.go @@ -9,6 +9,7 @@ import ( "github.com/BurntSushi/toml" "github.com/containous/traefik/autogen" "github.com/containous/traefik/types" + "unicode" ) // Provider defines methods of a provider. @@ -67,3 +68,11 @@ func replace(s1 string, s2 string, s3 string) string { func getEscapedName(name string) string { return strings.Replace(strings.TrimPrefix(name, "/"), "/", "-", -1) } + +func normalize(name string) string { + fargs := func(c rune) bool { + return !unicode.IsLetter(c) && !unicode.IsNumber(c) + } + // get function + return strings.Join(strings.FieldsFunc(name, fargs), "-") +} diff --git a/rules.go b/rules.go new file mode 100644 index 000000000..8d43a884c --- /dev/null +++ b/rules.go @@ -0,0 +1,92 @@ +package main + +import ( + "errors" + "github.com/gorilla/mux" + "reflect" + "strings" +) + +// Rules holds rule parsing and configuration +type Rules struct { + route *serverRoute +} + +func (r *Rules) host(host string) *mux.Route { + return r.route.route.Host(host) +} + +func (r *Rules) path(path string) *mux.Route { + return r.route.route.Path(path) +} + +func (r *Rules) pathPrefix(path string) *mux.Route { + return r.route.route.PathPrefix(path) +} + +func (r *Rules) pathStrip(path string) *mux.Route { + r.route.stripPrefix = path + return r.route.route.Path(path) +} + +func (r *Rules) pathPrefixStrip(path string) *mux.Route { + r.route.stripPrefix = path + return r.route.route.PathPrefix(path) +} + +func (r *Rules) methods(methods ...string) *mux.Route { + return r.route.route.Methods(methods...) +} + +func (r *Rules) headers(headers ...string) *mux.Route { + return r.route.route.Headers(headers...) +} + +func (r *Rules) headersRegexp(headers ...string) *mux.Route { + return r.route.route.HeadersRegexp(headers...) +} + +// Parse parses rules expressions +func (r *Rules) Parse(expression string) (*mux.Route, error) { + functions := map[string]interface{}{ + "Host": r.host, + "Path": r.path, + "PathStrip": r.pathStrip, + "PathPrefix": r.pathPrefix, + "PathPrefixStrip": r.pathPrefixStrip, + "Methods": r.methods, + "Headers": r.headers, + "HeadersRegexp": r.headersRegexp, + } + f := func(c rune) bool { + return c == ':' || c == '=' + } + // get function + parsedFunctions := strings.FieldsFunc(expression, f) + if len(parsedFunctions) != 2 { + return nil, errors.New("Error parsing rule: " + expression) + } + parsedFunction, ok := functions[parsedFunctions[0]] + if !ok { + return nil, errors.New("Error parsing rule: " + expression + ". Unknow function: " + parsedFunctions[0]) + } + + fargs := func(c rune) bool { + return c == ',' || c == ';' + } + // get function + parsedArgs := strings.FieldsFunc(parsedFunctions[1], fargs) + if len(parsedArgs) == 0 { + return nil, errors.New("Error parsing args from rule: " + expression) + } + + inputs := make([]reflect.Value, len(parsedArgs)) + for i := range parsedArgs { + inputs[i] = reflect.ValueOf(parsedArgs[i]) + } + method := reflect.ValueOf(parsedFunction) + if method.IsValid() { + return method.Call(inputs)[0].Interface().(*mux.Route), nil + } + return nil, errors.New("Method not found: " + parsedFunctions[0]) +} diff --git a/server.go b/server.go index 4f3f28489..73d82b4f5 100644 --- a/server.go +++ b/server.go @@ -55,6 +55,11 @@ type serverEntryPoint struct { httpRouter *middlewares.HandlerSwitcher } +type serverRoute struct { + route *mux.Route + stripPrefix string +} + // NewServer returns an initialized Server. func NewServer(globalConfiguration GlobalConfiguration) *Server { server := new(Server) @@ -354,23 +359,22 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo if _, ok := serverEntryPoints[entryPointName]; !ok { return nil, errors.New("Undefined entrypoint: " + entryPointName) } - newRoute := serverEntryPoints[entryPointName].httpRouter.GetHandler().NewRoute().Name(frontendName) + newServerRoute := &serverRoute{route: serverEntryPoints[entryPointName].httpRouter.GetHandler().NewRoute().Name(frontendName)} for routeName, route := range frontend.Routes { - log.Debugf("Creating route %s %s:%s", routeName, route.Rule, route.Value) - route, err := getRoute(newRoute, route.Rule, route.Value) + log.Debugf("Creating route %s %s", routeName, route.Rule) + err := getRoute(newServerRoute, route) if err != nil { return nil, err } - newRoute = route } entryPoint := globalConfiguration.EntryPoints[entryPointName] if entryPoint.Redirect != nil { if redirectHandlers[entryPointName] != nil { - newRoute.Handler(redirectHandlers[entryPointName]) + newServerRoute.route.Handler(redirectHandlers[entryPointName]) } else if handler, err := server.loadEntryPointConfig(entryPointName, entryPoint); err != nil { return nil, err } else { - newRoute.Handler(handler) + newServerRoute.route.Handler(handler) redirectHandlers[entryPointName] = handler } } else { @@ -448,9 +452,9 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo } else { log.Debugf("Reusing backend %s", frontend.Backend) } - server.wireFrontendBackend(frontend.Routes, newRoute, backends[frontend.Backend]) + server.wireFrontendBackend(newServerRoute, backends[frontend.Backend]) } - err := newRoute.GetError() + err := newServerRoute.route.GetError() if err != nil { log.Errorf("Error building route: %s", err) } @@ -460,29 +464,15 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo return serverEntryPoints, nil } -func (server *Server) wireFrontendBackend(routes map[string]types.Route, newRoute *mux.Route, handler http.Handler) { +func (server *Server) wireFrontendBackend(serverRoute *serverRoute, handler http.Handler) { // strip prefix - var strip bool - for _, route := range routes { - switch route.Rule { - case "PathStrip": - newRoute.Handler(&middlewares.StripPrefix{ - Prefix: route.Value, - Handler: handler, - }) - strip = true - break - case "PathPrefixStrip": - newRoute.Handler(&middlewares.StripPrefix{ - Prefix: route.Value, - Handler: handler, - }) - strip = true - break - } - } - if !strip { - newRoute.Handler(handler) + if len(serverRoute.stripPrefix) > 0 { + serverRoute.route.Handler(&middlewares.StripPrefix{ + Prefix: serverRoute.stripPrefix, + Handler: handler, + }) + } else { + serverRoute.route.Handler(handler) } } @@ -522,32 +512,21 @@ func (server *Server) buildDefaultHTTPRouter() *mux.Router { return router } -func getRoute(any interface{}, rule string, value ...interface{}) (*mux.Route, error) { - switch rule { - case "PathStrip": - rule = "Path" - case "PathPrefixStrip": - rule = "PathPrefix" +func getRoute(serverRoute *serverRoute, route types.Route) error { + rules := Rules{route: serverRoute} + newRoute, err := rules.Parse(route.Rule) + if err != nil { + return err } - inputs := make([]reflect.Value, len(value)) - for i := range value { - inputs[i] = reflect.ValueOf(value[i]) - } - method := reflect.ValueOf(any).MethodByName(rule) - if method.IsValid() { - return method.Call(inputs)[0].Interface().(*mux.Route), nil - } - return nil, errors.New("Method not found: " + rule) + serverRoute.route = newRoute + return nil } func sortedFrontendNamesForConfig(configuration *types.Configuration) []string { keys := []string{} - for key := range configuration.Frontends { keys = append(keys, key) } - sort.Strings(keys) - return keys } diff --git a/templates/consul_catalog.tmpl b/templates/consul_catalog.tmpl index 65a7a0d3c..a51cd341b 100644 --- a/templates/consul_catalog.tmpl +++ b/templates/consul_catalog.tmpl @@ -8,6 +8,5 @@ backend = "backend-{{.}}" passHostHeader = false [frontends.frontend-{{.}}.routes.route-host-{{.}}] - rule = "Host" - value = "{{getFrontendValue .}}" + rule = "{{getFrontendValue .}}" {{end}} diff --git a/templates/docker.tmpl b/templates/docker.tmpl index 7826acc56..f43bef8b4 100644 --- a/templates/docker.tmpl +++ b/templates/docker.tmpl @@ -13,5 +13,4 @@ {{end}}] [frontends."frontend-{{$frontend}}".routes."route-frontend-{{$frontend}}"] rule = "{{getFrontendRule $container}}" - value = "{{getFrontendValue $container}}" {{end}} diff --git a/templates/kv.tmpl b/templates/kv.tmpl index 9fd770d24..97793784f 100644 --- a/templates/kv.tmpl +++ b/templates/kv.tmpl @@ -37,6 +37,5 @@ {{range $routes}} [frontends.{{$frontend}}.routes.{{Last .}}] rule = "{{Get "" . "/rule"}}" - value = "{{Get "" . "/value"}}" {{end}} {{end}} diff --git a/templates/marathon.tmpl b/templates/marathon.tmpl index ba60b5012..d2243cf47 100644 --- a/templates/marathon.tmpl +++ b/templates/marathon.tmpl @@ -14,5 +14,4 @@ {{end}}] [frontends.frontend{{.ID | replace "/" "-"}}.routes.route-host{{.ID | replace "/" "-"}}] rule = "{{getFrontendRule .}}" - value = "{{getFrontendValue .}}" {{end}} diff --git a/tests/whoami.json b/tests/whoami.json index 138a2264d..daebbfa26 100644 --- a/tests/whoami.json +++ b/tests/whoami.json @@ -25,6 +25,7 @@ ], "labels": { "traefik.weight": "1", - "traefik.protocole": "http" + "traefik.protocole": "http", + "traefik.frontend.rule" : "Headers:Host,test.localhost" } } diff --git a/types/types.go b/types/types.go index 30bfbf483..51c093699 100644 --- a/types/types.go +++ b/types/types.go @@ -30,8 +30,7 @@ type Server struct { // Route holds route configuration. type Route struct { - Rule string `json:"rule,omitempty"` - Value string `json:"value,omitempty"` + Rule string `json:"rule,omitempty"` } // Frontend holds frontend configuration. 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 48c8e67ba..6881c4bd8 100644 --- a/webui/src/app/sections/providers/frontend-monitor/frontend-monitor.html +++ b/webui/src/app/sections/providers/frontend-monitor/frontend-monitor.html @@ -7,12 +7,10 @@ Route Rule - Value {{routeId}} - {{route.rule}} - {{route.value}} + {{route.rule}} diff --git a/webui/src/index.html b/webui/src/index.html index fbb832c71..20d356187 100644 --- a/webui/src/index.html +++ b/webui/src/index.html @@ -30,7 +30,7 @@