From 482cd32a17ede5e70eb2665b2e47baeab98d8501 Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Thu, 19 Nov 2020 20:06:43 +0000 Subject: [PATCH] Fix basic auth legacy header conversion --- CHANGELOG.md | 1 + pkg/apis/options/legacy_options.go | 3 ++- pkg/apis/options/legacy_options_test.go | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b7911b..efb8ed24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ ## 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) - [#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) diff --git a/pkg/apis/options/legacy_options.go b/pkg/apis/options/legacy_options.go index 6fb2596b..ae45bc7e 100644 --- a/pkg/apis/options/legacy_options.go +++ b/pkg/apis/options/legacy_options.go @@ -232,7 +232,8 @@ func getBasicAuthHeader(preferEmailToUser bool, basicAuthPassword string) Header Values: []HeaderValue{ { ClaimSource: &ClaimSource{ - Claim: claim, + Claim: claim, + Prefix: "Basic ", BasicAuthPassword: &SecretSource{ Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthPassword))), }, diff --git a/pkg/apis/options/legacy_options_test.go b/pkg/apis/options/legacy_options_test.go index 44c8c728..684d7874 100644 --- a/pkg/apis/options/legacy_options_test.go +++ b/pkg/apis/options/legacy_options_test.go @@ -329,7 +329,8 @@ var _ = Describe("Legacy Options", func() { Values: []HeaderValue{ { ClaimSource: &ClaimSource{ - Claim: "user", + Claim: "user", + Prefix: "Basic ", BasicAuthPassword: &SecretSource{ Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))), }, @@ -368,7 +369,8 @@ var _ = Describe("Legacy Options", func() { Values: []HeaderValue{ { ClaimSource: &ClaimSource{ - Claim: "email", + Claim: "email", + Prefix: "Basic ", BasicAuthPassword: &SecretSource{ Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))), },