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

Fix basic auth legacy header conversion

This commit is contained in:
Joel Speed 2020-11-19 20:06:43 +00:00
parent eb07005a5c
commit 482cd32a17
No known key found for this signature in database
GPG Key ID: 6E80578D6751DEFB
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -43,6 +43,7 @@
## Changes since v6.1.1 ## Changes since v6.1.1
- [#925](https://github.com/oauth2-proxy/oauth2-rpoxy/pull/925) Fix basic auth legacy header conversion (@JoelSpeed)
- [#916](https://github.com/oauth2-proxy/oauth2-rpoxy/pull/916) Add AlphaOptions struct to prepare for alpha config loading (@JoelSpeed) - [#916](https://github.com/oauth2-proxy/oauth2-rpoxy/pull/916) Add AlphaOptions struct to prepare for alpha config loading (@JoelSpeed)
- [#923](https://github.com/oauth2-proxy/oauth2-proxy/pull/923) Support TLS 1.3 (@aajisaka) - [#923](https://github.com/oauth2-proxy/oauth2-proxy/pull/923) Support TLS 1.3 (@aajisaka)
- [#918](https://github.com/oauth2-proxy/oauth2-proxy/pull/918) Fix log header output (@JoelSpeed) - [#918](https://github.com/oauth2-proxy/oauth2-proxy/pull/918) Fix log header output (@JoelSpeed)

3
pkg/apis/options/legacy_options.go
View File

@ -232,7 +232,8 @@ func getBasicAuthHeader(preferEmailToUser bool, basicAuthPassword string) Header
Values: []HeaderValue{ Values: []HeaderValue{
{ {
ClaimSource: &ClaimSource{ ClaimSource: &ClaimSource{
Claim: claim, Claim: claim,
Prefix: "Basic ",
BasicAuthPassword: &SecretSource{ BasicAuthPassword: &SecretSource{
Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthPassword))), Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthPassword))),
}, },

6
pkg/apis/options/legacy_options_test.go
View File

@ -329,7 +329,8 @@ var _ = Describe("Legacy Options", func() {
Values: []HeaderValue{ Values: []HeaderValue{
{ {
ClaimSource: &ClaimSource{ ClaimSource: &ClaimSource{
Claim: "user", Claim: "user",
Prefix: "Basic ",
BasicAuthPassword: &SecretSource{ BasicAuthPassword: &SecretSource{
Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))), Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))),
}, },
@ -368,7 +369,8 @@ var _ = Describe("Legacy Options", func() {
Values: []HeaderValue{ Values: []HeaderValue{
{ {
ClaimSource: &ClaimSource{ ClaimSource: &ClaimSource{
Claim: "email", Claim: "email",
Prefix: "Basic ",
BasicAuthPassword: &SecretSource{ BasicAuthPassword: &SecretSource{
Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))), Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))),
}, },