public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1020 from grnhse/flatten-response-headers 

Flatten array-based response headers
This commit is contained in:
Joel Speed 2021-02-04 08:10:59 +00:00 committed by GitHub
parent 06985879e1 c3f31b4dd5
commit 9df3a752a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -8,6 +8,8 @@
## Changes since v7.0.0
- [#1020](https://github.com/oauth2-proxy/oauth2-proxy/pull/1020) Flatten array-based response headers (@NickMeves)
# V7.0.0
## Release Highlights

2
pkg/middleware/headers.go
View File

@ -108,7 +108,7 @@ func injectResponseHeaders(injector header.Injector, next http.Handler) http.Han
// If scope is nil, this will panic.
// A scope should always be injected before this handler is called.
injector.Inject(rw.Header(), scope.Session)
flattenHeaders(req.Header)
flattenHeaders(rw.Header())
next.ServeHTTP(rw, req)
})
}

12
pkg/middleware/headers_test.go
View File

@ -249,7 +249,7 @@ var _ = Describe("Headers Suite", func() {
},
session: &sessionsapi.SessionState{},
expectedHeaders: http.Header{
"Foo": []string{"bar", "baz"},
"Foo": []string{"bar,baz"},
},
expectedErr: "",
}),
@ -273,7 +273,7 @@ var _ = Describe("Headers Suite", func() {
IDToken: "IDToken-1234",
},
expectedHeaders: http.Header{
"Foo": []string{"bar", "baz"},
"Foo": []string{"bar,baz"},
"Claim": []string{"IDToken-1234"},
},
expectedErr: "",
@ -298,7 +298,7 @@ var _ = Describe("Headers Suite", func() {
IDToken: "IDToken-1234",
},
expectedHeaders: http.Header{
"Claim": []string{"bar", "baz", "IDToken-1234"},
"Claim": []string{"bar,baz,IDToken-1234"},
},
expectedErr: "",
}),
@ -323,7 +323,7 @@ var _ = Describe("Headers Suite", func() {
IDToken: "IDToken-1234",
},
expectedHeaders: http.Header{
"Claim": []string{"bar", "baz", "IDToken-1234"},
"Claim": []string{"bar,baz,IDToken-1234"},
},
expectedErr: "",
}),
@ -345,7 +345,7 @@ var _ = Describe("Headers Suite", func() {
},
session: nil,
expectedHeaders: http.Header{
"Claim": []string{"bar", "baz"},
"Claim": []string{"bar,baz"},
},
expectedErr: "",
}),
@ -368,7 +368,7 @@ var _ = Describe("Headers Suite", func() {
},
session: nil,
expectedHeaders: http.Header{
"Claim": []string{"bar", "baz"},
"Claim": []string{"bar,baz"},
},
expectedErr: "",
}),