File tree Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -1006,11 +1006,9 @@ func getUserV1(w http.ResponseWriter, r *http.Request) {
1006
1006
}
1007
1007
for gId := range user .UserGroups {
1008
1008
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
1012
1011
}
1013
- resp .UserGroups [gId ] = grp
1014
1012
}
1015
1013
logger .Log (2 , r .Header .Get ("user" ), "fetched user" , usernameFetched )
1016
1014
logic .ReturnSuccessResponseWithJson (w , r , resp , "fetched user with role info" )
Original file line number Diff line number Diff line change @@ -1587,7 +1587,12 @@ func ValidateCreateAclReq(req models.Acl) error {
1587
1587
return err
1588
1588
}
1589
1589
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 ]
1591
1596
if ! ok {
1592
1597
return fmt .Errorf ("user group %s does not have access to network %s" , src .Value , req .NetworkID )
1593
1598
}
You can’t perform that action at this time.
0 commit comments