e64e6fa · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Some code improvements

* Remove shadowing of predeclared identifier: new. * strings.ReplaceAll instead of strings.Replace with -1. * Change strings.ToLower comparison to strings.EqualFold. * Rewrite if-else-if-else chain as a switch.

commite64e6fa514e8e4e0df14135f1e2269824f075c0b authorKirill Motkov <motkov.kirill@gmail.com> dateWed 9 Oct 2019, 11:33 (7 years ago) parent63da5c6

4 files changed+11−10

compare with master

unifiedsplit

env_options.go+1−1 oauthproxy.go+1−1 pkg/sessions/cookie/session_store.go+5−5 providers/google.go+4−3

env_options.go+1−1

@@ -40,7 +40,7 @@ func (cfg EnvOptions) LoadEnvForStruct(options interface{}) {

4040 envName := field.Tag.Get("env")

4141 cfgName := field.Tag.Get("cfg")

4242 if cfgName == "" && flagName != "" {

43− cfgName = strings.Replace(flagName, "-", "_", -1)

43+ cfgName = strings.ReplaceAll(flagName, "-", "_")

4444 }

4545 if envName == "" || cfgName == "" {

4646 // resolvable fields must have the `env` and `cfg` struct tag

oauthproxy.go+1−1

@@ -119,7 +119,7 @@ func (u *UpstreamProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {

119119 r.Header.Set("GAP-Auth", w.Header().Get("GAP-Auth"))

120120 u.auth.SignRequest(r)

121121 }

122− if u.wsHandler != nil && strings.ToLower(r.Header.Get("Connection")) == "upgrade" && r.Header.Get("Upgrade") == "websocket" {

122+ if u.wsHandler != nil && strings.EqualFold(r.Header.Get("Connection"), "upgrade") && r.Header.Get("Upgrade") == "websocket" {

123123 u.wsHandler.ServeHTTP(w, r)

124124 } else {

125125 u.handler.ServeHTTP(w, r)

pkg/sessions/cookie/session_store.go+5−5

@@ -136,18 +136,18 @@ func splitCookie(c *http.Cookie) []*http.Cookie {

136136 valueBytes := []byte(c.Value)

137137 count := 0

138138 for len(valueBytes) > 0 {

139− new := copyCookie(c)

140− new.Name = fmt.Sprintf("%s_%d", c.Name, count)

139+ newCookie := copyCookie(c)

140+ newCookie.Name = fmt.Sprintf("%s_%d", c.Name, count)

141141 count++

142142 if len(valueBytes) < maxCookieLength {

143− new.Value = string(valueBytes)

143+ newCookie.Value = string(valueBytes)

144144 valueBytes = []byte{}

145145 } else {

146146 newValue := valueBytes[:maxCookieLength]

147147 valueBytes = valueBytes[maxCookieLength:]

148− new.Value = string(newValue)

148+ newCookie.Value = string(newValue)

149149 }

150− cookies = append(cookies, new)

150+ cookies = append(cookies, newCookie)

151151 }

152152 return cookies

153153}

providers/google.go+4−3

@@ -195,9 +195,10 @@ func userInGroup(service *admin.Service, groups []string, email string) bool {

195195 r, err := req.Do()

196196 if err != nil {

197197 err, ok := err.(*googleapi.Error)

198− if ok && err.Code == 404 {

198+ switch {

199+ case ok && err.Code == 404:

199200 logger.Printf("error checking membership in group %s: group does not exist", group)

200− } else if ok && err.Code == 400 {

201+ case ok && err.Code == 400:

201202 // It is possible for Members.HasMember to return false even if the email is a group member.

202203 // One case that can cause this is if the user email is from a different domain than the group,

203204 // 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 {

215216 if r.Status == "ACTIVE" {

216217 return true

217218 }

218− } else {

219+ default:

219220 logger.Printf("error checking group membership: %v", err)

220221 }

221222 continue