scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add group lenth check

Browse source
This commit is contained in:
Samir Patel 2021-12-17 11:34:48 -06:00
parent c2d51a2257
commit 3b58e887ed
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
authn/authenticate.go
View file

@ -90,11 +90,11 @@ type UserInfo struct {
UserName string `json:"username"`
}
func (a *Auth) Authenticate(w http.ResponseWriter, r *http.Request) []Group {
func (a *Auth) Authenticate(w http.ResponseWriter, r *http.Request) ([]Group, error) {
cookie, err := a.readCookie(r)
if err != nil {
http.Redirect(w, r, "/signin", http.StatusTemporaryRedirect)
return nil
return nil, err
}
if cookie.Token.Expiry.Before(time.Now().Add(a.refreshWithin)) {
err = a.refreshToken(w, cookie)
@ -102,11 +102,14 @@ func (a *Auth) Authenticate(w http.ResponseWriter, r *http.Request) []Group {
//log error
if cookie.Token.Expiry.Before(time.Now()) {
http.Redirect(w, r, "/signin", http.StatusTemporaryRedirect)
return nil
return nil, err
}
}
}
return cookie.GroupMembership
if len(cookie.GroupMembership) == 0 {
return nil, errors.New("user is not part of any groups in identity provider")
}
return cookie.GroupMembership, nil
}

4
http/handler.go
View file

@ -3395,8 +3395,8 @@ func (h *Handler) handleCheckAuthentication(w http.ResponseWriter, r *http.Reque
http.Error(w, "Trying to authenticate but authentication is off.", http.StatusBadRequest)
return
}
groups := h.auth.Authenticate(w, r)
if groups == nil {
groups, err := h.auth.Authenticate(w, r)
if groups == nil || err != nil {
w.Header().Add("Content-Type", "text/plain")
w.WriteHeader(http.StatusForbidden)
return