git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #1020 from grnhse/flatten-response-headers

Flatten array-based response headers

commit9df3a752a6a6941676848a865fb072321c094c5e authorJoel Speed <Joel.speed@hotmail.co.uk> dateThu 4 Feb 2021, 08:10 (6 years ago) parent0698587c3f31b4
3 files changed+9−7
compare with master
unifiedsplit
CHANGELOG.md+2 pkg/middleware/headers.go+1−1 pkg/middleware/headers_test.go+6−6
CHANGELOG.md+2
@@ -8,6 +8,8 @@
88
99## Changes since v7.0.0
1010
11+- [#1020](https://github.com/oauth2-proxy/oauth2-proxy/pull/1020) Flatten array-based response headers (@NickMeves)
12+
1113# V7.0.0
1214
1315## Release Highlights
pkg/middleware/headers.go+1−1
@@ -108,7 +108,7 @@ func injectResponseHeaders(injector header.Injector, next http.Handler) http.Han
108108 // If scope is nil, this will panic.
109109 // A scope should always be injected before this handler is called.
110110 injector.Inject(rw.Header(), scope.Session)
111− flattenHeaders(req.Header)
111+ flattenHeaders(rw.Header())
112112 next.ServeHTTP(rw, req)
113113 })
114114}
pkg/middleware/headers_test.go+6−6
@@ -249,7 +249,7 @@ var _ = Describe("Headers Suite", func() {
249249 },
250250 session: &sessionsapi.SessionState{},
251251 expectedHeaders: http.Header{
252− "Foo": []string{"bar", "baz"},
252+ "Foo": []string{"bar,baz"},
253253 },
254254 expectedErr: "",
255255 }),
@@ -273,7 +273,7 @@ var _ = Describe("Headers Suite", func() {
273273 IDToken: "IDToken-1234",
274274 },
275275 expectedHeaders: http.Header{
276− "Foo": []string{"bar", "baz"},
276+ "Foo": []string{"bar,baz"},
277277 "Claim": []string{"IDToken-1234"},
278278 },
279279 expectedErr: "",
@@ -298,7 +298,7 @@ var _ = Describe("Headers Suite", func() {
298298 IDToken: "IDToken-1234",
299299 },
300300 expectedHeaders: http.Header{
301− "Claim": []string{"bar", "baz", "IDToken-1234"},
301+ "Claim": []string{"bar,baz,IDToken-1234"},
302302 },
303303 expectedErr: "",
304304 }),
@@ -323,7 +323,7 @@ var _ = Describe("Headers Suite", func() {
323323 IDToken: "IDToken-1234",
324324 },
325325 expectedHeaders: http.Header{
326− "Claim": []string{"bar", "baz", "IDToken-1234"},
326+ "Claim": []string{"bar,baz,IDToken-1234"},
327327 },
328328 expectedErr: "",
329329 }),
@@ -345,7 +345,7 @@ var _ = Describe("Headers Suite", func() {
345345 },
346346 session: nil,
347347 expectedHeaders: http.Header{
348− "Claim": []string{"bar", "baz"},
348+ "Claim": []string{"bar,baz"},
349349 },
350350 expectedErr: "",
351351 }),
@@ -368,7 +368,7 @@ var _ = Describe("Headers Suite", func() {
368368 },
369369 session: nil,
370370 expectedHeaders: http.Header{
371− "Claim": []string{"bar", "baz"},
371+ "Claim": []string{"bar,baz"},
372372 },
373373 expectedErr: "",
374374 }),