Skip to content

Commit e2b576a

Browse files
Release v1.1.0 Fixes. (#3643)
* fix(go): check for all networks access; * fix(go): skip group on error;
1 parent 64c6472 commit e2b576a

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

controllers/user.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,11 +1006,9 @@ func getUserV1(w http.ResponseWriter, r *http.Request) {
10061006
}
10071007
for gId := range user.UserGroups {
10081008
grp, err := logic.GetUserGroup(gId)
1009-
if err != nil {
1010-
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
1011-
return
1009+
if err == nil {
1010+
resp.UserGroups[gId] = grp
10121011
}
1013-
resp.UserGroups[gId] = grp
10141012
}
10151013
logger.Log(2, r.Header.Get("user"), "fetched user", usernameFetched)
10161014
logic.ReturnSuccessResponseWithJson(w, r, resp, "fetched user with role info")

logic/acls.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,12 @@ func ValidateCreateAclReq(req models.Acl) error {
15871587
return err
15881588
}
15891589

1590-
_, ok := userGroup.NetworkRoles[req.NetworkID]
1590+
_, ok := userGroup.NetworkRoles[models.AllNetworks]
1591+
if ok {
1592+
continue
1593+
}
1594+
1595+
_, ok = userGroup.NetworkRoles[req.NetworkID]
15911596
if !ok {
15921597
return fmt.Errorf("user group %s does not have access to network %s", src.Value, req.NetworkID)
15931598
}

0 commit comments

Comments
 (0)