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 #276 from sosiska/patch-1 

Some code improvements
This commit is contained in:
Joel Speed 2019-10-09 17:41:36 +01:00 committed by GitHub
parent 63da5c64db e64e6fa514
commit 1afaf46656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env_options.go
View File

@ -40,7 +40,7 @@ func (cfg EnvOptions) LoadEnvForStruct(options interface{}) {
envName := field.Tag.Get("env") envName := field.Tag.Get("env")
cfgName := field.Tag.Get("cfg") cfgName := field.Tag.Get("cfg")
if cfgName == "" && flagName != "" { if cfgName == "" && flagName != "" {
cfgName = strings.Replace(flagName, "-", "_", -1) cfgName = strings.ReplaceAll(flagName, "-", "_")
} }
if envName == "" || cfgName == "" { if envName == "" || cfgName == "" {
// resolvable fields must have the `env` and `cfg` struct tag // resolvable fields must have the `env` and `cfg` struct tag

2
oauthproxy.go
View File

@ -119,7 +119,7 @@ func (u *UpstreamProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
r.Header.Set("GAP-Auth", w.Header().Get("GAP-Auth")) r.Header.Set("GAP-Auth", w.Header().Get("GAP-Auth"))
u.auth.SignRequest(r) u.auth.SignRequest(r)
} }
if u.wsHandler != nil && strings.ToLower(r.Header.Get("Connection")) == "upgrade" && r.Header.Get("Upgrade") == "websocket" { if u.wsHandler != nil && strings.EqualFold(r.Header.Get("Connection"), "upgrade") && r.Header.Get("Upgrade") == "websocket" {
u.wsHandler.ServeHTTP(w, r) u.wsHandler.ServeHTTP(w, r)
} else { } else {
u.handler.ServeHTTP(w, r) u.handler.ServeHTTP(w, r)

10
pkg/sessions/cookie/session_store.go
View File

@ -136,18 +136,18 @@ func splitCookie(c *http.Cookie) []*http.Cookie {
valueBytes := []byte(c.Value) valueBytes := []byte(c.Value)
count := 0 count := 0
for len(valueBytes) > 0 { for len(valueBytes) > 0 {
new := copyCookie(c) newCookie := copyCookie(c)
new.Name = fmt.Sprintf("%s_%d", c.Name, count) newCookie.Name = fmt.Sprintf("%s_%d", c.Name, count)
count++ count++
if len(valueBytes) < maxCookieLength { if len(valueBytes) < maxCookieLength {
new.Value = string(valueBytes) newCookie.Value = string(valueBytes)
valueBytes = []byte{} valueBytes = []byte{}
} else { } else {
newValue := valueBytes[:maxCookieLength] newValue := valueBytes[:maxCookieLength]
valueBytes = valueBytes[maxCookieLength:] valueBytes = valueBytes[maxCookieLength:]
new.Value = string(newValue) newCookie.Value = string(newValue)
} }
cookies = append(cookies, new) cookies = append(cookies, newCookie)
} }
return cookies return cookies
} }

7
providers/google.go
View File

@ -195,9 +195,10 @@ func userInGroup(service *admin.Service, groups []string, email string) bool {
r, err := req.Do() r, err := req.Do()
if err != nil { if err != nil {
err, ok := err.(*googleapi.Error) err, ok := err.(*googleapi.Error)
if ok && err.Code == 404 { switch {
case ok && err.Code == 404:
logger.Printf("error checking membership in group %s: group does not exist", group) logger.Printf("error checking membership in group %s: group does not exist", group)
} else if ok && err.Code == 400 { case ok && err.Code == 400:
// It is possible for Members.HasMember to return false even if the email is a group member. // It is possible for Members.HasMember to return false even if the email is a group member.
// One case that can cause this is if the user email is from a different domain than the group, // One case that can cause this is if the user email is from a different domain than the group,
// e.g. "member@otherdomain.com" in the group "group@mydomain.com" will result in a 400 error // e.g. "member@otherdomain.com" in the group "group@mydomain.com" will result in a 400 error
@ -215,7 +216,7 @@ func userInGroup(service *admin.Service, groups []string, email string) bool {
if r.Status == "ACTIVE" { if r.Status == "ACTIVE" {
return true return true
} }
} else { default:
logger.Printf("error checking group membership: %v", err) logger.Printf("error checking group membership: %v", err)
} }
continue continue