Drop fallback to email when user is empty (#537)

This commit is contained in:
Joel Speed
2020-05-12 16:04:51 +01:00
committed by GitHub
parent 7cf685140b
commit 4e3dd09cf2
5 changed files with 18 additions and 9 deletions
+6 -2
View File
@@ -1048,10 +1048,14 @@ func (p *OAuthProxy) addHeadersForProxying(rw http.ResponseWriter, req *http.Req
}
}
if p.SetBasicAuth {
if session.User != "" {
switch {
case p.PreferEmailToUser && session.Email != "":
authVal := b64.StdEncoding.EncodeToString([]byte(session.Email + ":" + p.BasicAuthPassword))
rw.Header().Set("Authorization", "Basic "+authVal)
case session.User != "":
authVal := b64.StdEncoding.EncodeToString([]byte(session.User + ":" + p.BasicAuthPassword))
rw.Header().Set("Authorization", "Basic "+authVal)
} else {
default:
rw.Header().Del("Authorization")
}
}