git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #925 from oauth2-proxy/fix-basic-auth
8bed7aaJoel Speed
CHANGELOG.md+1
compare with master
unifiedsplit
@@ -43,6 +43,7 @@
43
43
44## Changes since v6.1.1
44## Changes since v6.1.1
45
45
46+- [#925](https://github.com/oauth2-proxy/oauth2-rpoxy/pull/925) Fix basic auth legacy header conversion (@JoelSpeed)
46- [#916](https://github.com/oauth2-proxy/oauth2-rpoxy/pull/916) Add AlphaOptions struct to prepare for alpha config loading (@JoelSpeed)
47- [#916](https://github.com/oauth2-proxy/oauth2-rpoxy/pull/916) Add AlphaOptions struct to prepare for alpha config loading (@JoelSpeed)
47- [#923](https://github.com/oauth2-proxy/oauth2-proxy/pull/923) Support TLS 1.3 (@aajisaka)
48- [#923](https://github.com/oauth2-proxy/oauth2-proxy/pull/923) Support TLS 1.3 (@aajisaka)
48- [#918](https://github.com/oauth2-proxy/oauth2-proxy/pull/918) Fix log header output (@JoelSpeed)
49- [#918](https://github.com/oauth2-proxy/oauth2-proxy/pull/918) Fix log header output (@JoelSpeed)
pkg/apis/options/legacy_options.go+2−1
@@ -232,7 +232,8 @@ func getBasicAuthHeader(preferEmailToUser bool, basicAuthPassword string) Header
232 Values: []HeaderValue{
232 Values: []HeaderValue{
233 {
233 {
234 ClaimSource: &ClaimSource{
234 ClaimSource: &ClaimSource{
235− Claim: claim,
235+ Claim: claim,
236+ Prefix: "Basic ",
236 BasicAuthPassword: &SecretSource{
237 BasicAuthPassword: &SecretSource{
237 Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthPassword))),
238 Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthPassword))),
238 },
239 },
pkg/apis/options/legacy_options_test.go+4−2
@@ -329,7 +329,8 @@ var _ = Describe("Legacy Options", func() {
329 Values: []HeaderValue{
329 Values: []HeaderValue{
330 {
330 {
331 ClaimSource: &ClaimSource{
331 ClaimSource: &ClaimSource{
332− Claim: "user",
332+ Claim: "user",
333+ Prefix: "Basic ",
333 BasicAuthPassword: &SecretSource{
334 BasicAuthPassword: &SecretSource{
334 Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))),
335 Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))),
335 },
336 },
@@ -368,7 +369,8 @@ var _ = Describe("Legacy Options", func() {
368 Values: []HeaderValue{
369 Values: []HeaderValue{
369 {
370 {
370 ClaimSource: &ClaimSource{
371 ClaimSource: &ClaimSource{
371− Claim: "email",
372+ Claim: "email",
373+ Prefix: "Basic ",
372 BasicAuthPassword: &SecretSource{
374 BasicAuthPassword: &SecretSource{
373 Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))),
375 Value: []byte(base64.StdEncoding.EncodeToString([]byte(basicAuthSecret))),
374 },
376 },