From d04903edb2a569764badaccba977845a18365f24 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 23 Sep 2022 15:12:29 +0200 Subject: [PATCH 1/2] fix: query parameter matching with equal --- pkg/muxer/http/mux.go | 2 +- pkg/muxer/http/mux_test.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/muxer/http/mux.go b/pkg/muxer/http/mux.go index 6c57d8db8..fefab67a9 100644 --- a/pkg/muxer/http/mux.go +++ b/pkg/muxer/http/mux.go @@ -237,7 +237,7 @@ func headersRegexp(route *mux.Route, headers ...string) error { func query(route *mux.Route, query ...string) error { var queries []string for _, elem := range query { - queries = append(queries, strings.Split(elem, "=")...) + queries = append(queries, strings.SplitN(elem, "=", 2)...) } route.Queries(queries...) diff --git a/pkg/muxer/http/mux_test.go b/pkg/muxer/http/mux_test.go index 2f2d64c9a..cacc639b2 100644 --- a/pkg/muxer/http/mux_test.go +++ b/pkg/muxer/http/mux_test.go @@ -252,6 +252,14 @@ func Test_addRoute(t *testing.T) { "http://localhost/foo?bar=baz": http.StatusNotFound, }, }, + { + desc: "Query with multiple equals", + rule: "Query(`foo=b=ar`)", + expected: map[string]int{ + "http://localhost/foo?foo=b=ar": http.StatusOK, + "http://localhost/foo?foo=bar": http.StatusNotFound, + }, + }, { desc: "Rule with simple path", rule: `Path("/a")`, From 7758880f3f71727b8536fb67d748109398543170 Mon Sep 17 00:00:00 2001 From: Kevin Pollet Date: Fri, 23 Sep 2022 15:24:15 +0200 Subject: [PATCH 2/2] Prepare release v2.8.6 --- CHANGELOG.md | 16 ++++++++++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8e16b8ba..fc0af112d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## [v2.8.6](https://github.com/traefik/traefik/tree/v2.8.6) (2022-09-23) +[All Commits](https://github.com/traefik/traefik/compare/v2.8.5...v2.8.6) + +**Bug fixes:** +- **[consulcatalog]** Fix UDP loadbalancer tags not being used with Consul Catalog ([#9357](https://github.com/traefik/traefik/pull/9357) by [t3hchipmunk](https://github.com/t3hchipmunk)) +- **[docker,rancher,ecs,provider]** Simplify AddServer algorithm ([#9358](https://github.com/traefik/traefik/pull/9358) by [ldez](https://github.com/ldez)) +- **[plugins]** Allow empty plugin configuration ([#9338](https://github.com/traefik/traefik/pull/9338) by [ldez](https://github.com/ldez)) +- **[rules]** Fix query parameter matching with equal ([#9369](https://github.com/traefik/traefik/pull/9369) by [ldez](https://github.com/ldez)) +- **[server]** Optimize websocket headers handling ([#9360](https://github.com/traefik/traefik/pull/9360) by [juliens](https://github.com/juliens)) + +**Documentation:** +- **[ecs]** Add documentation for ECS constraints option ([#9354](https://github.com/traefik/traefik/pull/9354) by [rtribotte](https://github.com/rtribotte)) +- **[k8s/gatewayapi]** Fix link to RouteNamespaces ([#9349](https://github.com/traefik/traefik/pull/9349) by [ldez](https://github.com/ldez)) +- Add documentation for json schema usage to validate config in the FAQ ([#9340](https://github.com/traefik/traefik/pull/9340) by [rtribotte](https://github.com/rtribotte)) +- Add a note on case insensitive regex matching ([#9322](https://github.com/traefik/traefik/pull/9322) by [NEwa-05](https://github.com/NEwa-05)) + ## [v2.8.5](https://github.com/traefik/traefik/tree/v2.8.5) (2022-09-13) [All Commits](https://github.com/traefik/traefik/compare/v2.8.4...v2.8.5) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index f7f0f72f4..f0548583e 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v2.8.5 +# example new bugfix v2.8.6 CurrentRef = "v2.8" -PreviousRef = "v2.8.4" +PreviousRef = "v2.8.5" BaseBranch = "v2.8" -FutureCurrentRefName = "v2.8.5" +FutureCurrentRefName = "v2.8.6" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10