review: add ipv6 for dashboard insecure redirect

traefik · Jun 16, 2020 · 1195864 · 1195864
1 parent 64426bd
commit 1195864
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/integration/testdata/rawdata-consul.json b/integration/testdata/rawdata-consul.json
@@ -86,7 +86,7 @@
     },
     "dashboard_redirect@internal": {
       "redirectRegex": {
-        "regex": "^(http:\\/\\/[^:\\/]+(:\\d+)?)\\/$",
+        "regex": "^(http:\\/\\/(\\[[\\w:.]+\\]|[\\w\\._-]+)(:\\d+)?)\\/$",
         "replacement": "${1}/dashboard/",
         "permanent": true
       },

diff --git a/integration/testdata/rawdata-etcd.json b/integration/testdata/rawdata-etcd.json
@@ -86,7 +86,7 @@
     },
     "dashboard_redirect@internal": {
       "redirectRegex": {
-        "regex": "^(http:\\/\\/[^:\\/]+(:\\d+)?)\\/$",
+        "regex": "^(http:\\/\\/(\\[[\\w:.]+\\]|[\\w\\._-]+)(:\\d+)?)\\/$",
         "replacement": "${1}/dashboard/",
         "permanent": true
       },

diff --git a/integration/testdata/rawdata-ingress.json b/integration/testdata/rawdata-ingress.json
@@ -54,7 +54,7 @@
 	"middlewares": {
 		"dashboard_redirect@internal": {
 			"redirectRegex": {
-				"regex": "^(http:\\/\\/[^:\\/]+(:\\d+)?)\\/$",
+				"regex": "^(http:\\/\\/(\\[[\\w:.]+\\]|[\\w\\._-]+)(:\\d+)?)\\/$",
 				"replacement": "${1}/dashboard/",
 				"permanent": true
 			},

diff --git a/integration/testdata/rawdata-redis.json b/integration/testdata/rawdata-redis.json
@@ -86,7 +86,7 @@
     },
     "dashboard_redirect@internal": {
       "redirectRegex": {
-        "regex": "^(http:\\/\\/[^:\\/]+(:\\d+)?)\\/$",
+        "regex": "^(http:\\/\\/(\\[[\\w:.]+\\]|[\\w\\._-]+)(:\\d+)?)\\/$",
         "replacement": "${1}/dashboard/",
         "permanent": true
       },

diff --git a/integration/testdata/rawdata-zk.json b/integration/testdata/rawdata-zk.json
@@ -86,7 +86,7 @@
     },
     "dashboard_redirect@internal": {
       "redirectRegex": {
-        "regex": "^(http:\\/\\/[^:\\/]+(:\\d+)?)\\/$",
+        "regex": "^(http:\\/\\/(\\[[\\w:.]+\\]|[\\w\\._-]+)(:\\d+)?)\\/$",
         "replacement": "${1}/dashboard/",
         "permanent": true
       },

diff --git a/pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json b/pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json
@@ -25,7 +25,7 @@
     "middlewares": {
       "dashboard_redirect": {
         "redirectRegex": {
-          "regex": "^(http:\\/\\/[^:\\/]+(:\\d+)?)\\/$",
+          "regex": "^(http:\\/\\/(\\[[\\w:.]+\\]|[\\w\\._-]+)(:\\d+)?)\\/$",
           "replacement": "${1}/dashboard/",
           "permanent": true
         }

diff --git a/pkg/provider/traefik/fixtures/full_configuration.json b/pkg/provider/traefik/fixtures/full_configuration.json
@@ -57,7 +57,7 @@
     "middlewares": {
       "dashboard_redirect": {
         "redirectRegex": {
-          "regex": "^(http:\\/\\/[^:\\/]+(:\\d+)?)\\/$",
+          "regex": "^(http:\\/\\/(\\[[\\w:.]+\\]|[\\w\\._-]+)(:\\d+)?)\\/$",
           "replacement": "${1}/dashboard/",
           "permanent": true
         }

diff --git a/pkg/provider/traefik/internal.go b/pkg/provider/traefik/internal.go
@@ -197,7 +197,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) {
 
 			cfg.HTTP.Middlewares["dashboard_redirect"] = &dynamic.Middleware{
 				RedirectRegex: &dynamic.RedirectRegex{
-					Regex:       `^(http:\/\/[^:\/]+(:\d+)?)\/$`,
+					Regex:       `^(http:\/\/(\[[\w:.]+\]|[\w\._-]+)(:\d+)?)\/$`,
 					Replacement: "${1}/dashboard/",
 					Permanent:   true,
 				},