Deuxfleurs/guichet
22
3
Fork 1
Code Issues 42 Pull requests 4 Projects 2 Releases Wiki Activity

Fix several group membership issue

Browse source 
TODO:
- check for other wrong uses of GetAttributeValue(s)
- refactor is_admin check
This commit is contained in:
Alex 2020-02-11 20:10:47 +01:00
parent 0dca53bca0
commit dc9b2bc458
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
admin.go
View file

@ -19,9 +19,14 @@ func checkAdminLogin(w http.ResponseWriter, r *http.Request) *LoginStatus {
} }
can_admin := (login.Info.DN == config.AdminAccount) can_admin := (login.Info.DN == config.AdminAccount)
for _, group := range login.UserEntry.GetAttributeValues("memberof") { fmt.Printf("%#v", login.UserEntry)
if config.GroupCanAdmin != "" && group == config.GroupCanAdmin { for _, attr := range login.UserEntry.Attributes {
can_admin = true if strings.EqualFold(attr.Name, "memberof") {
for _, group := range attr.Values {
if config.GroupCanAdmin != "" && group == config.GroupCanAdmin {
can_admin = true
}
}
} }
} }

16
main.go
View file

@ -259,12 +259,16 @@ func handleHome(w http.ResponseWriter, r *http.Request) {
can_admin := (login.Info.DN == config.AdminAccount) can_admin := (login.Info.DN == config.AdminAccount)
can_invite := false can_invite := false
for _, group := range login.UserEntry.GetAttributeValues("memberof") { for _, attr := range login.UserEntry.Attributes {
if config.GroupCanInvite != "" && group == config.GroupCanInvite { if strings.EqualFold(attr.Name, "memberof") {
can_invite = true for _, group := range attr.Values {
} if config.GroupCanInvite != "" && group == config.GroupCanInvite {
if config.GroupCanAdmin != "" && group == config.GroupCanAdmin { can_invite = true
can_admin = true }
if config.GroupCanAdmin != "" && group == config.GroupCanAdmin {
can_admin = true
}
}
} }
} }