mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-09 03:08:05 +02:00
update repo_permission.go
change `GetUserRepoPermission` to check for permissions granted/denied by groups
This commit is contained in:
1 parent
cf712d465c
commit
55e745a147
1 file changed
+20
@@ -4,6 +4,7 @@
|
|||||||
package access
|
package access
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
group_model "code.gitea.io/gitea/models/group"
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -482,6 +483,14 @@ func GetIndividualUserRepoPermission(ctx context.Context, repo *repo_model.Repos
|
|||||||
return perm, nil
|
return perm, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
groupTeams, err := group_model.FindGroupTeams(ctx, repo.GroupID)
|
||||||
|
for _, team := range groupTeams {
|
||||||
|
if team.AccessMode >= perm_model.AccessModeAdmin {
|
||||||
|
perm.AccessMode = perm_model.AccessModeOwner
|
||||||
|
perm.unitsMode = nil
|
||||||
|
return perm, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for _, u := range repo.Units {
|
for _, u := range repo.Units {
|
||||||
for _, team := range teams {
|
for _, team := range teams {
|
||||||
@@ -529,6 +538,17 @@ func IsUserRepoAdmin(ctx context.Context, repo *repo_model.Repository, user *use
|
|||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
groupTeams, err := organization.GetUserGroupTeams(ctx, repo.GroupID, user.ID)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, team := range groupTeams {
|
||||||
|
if team.AccessMode >= perm_model.AccessModeAdmin {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
teams, err := organization.GetUserRepoTeams(ctx, repo.OwnerID, user.ID, repo.ID)
|
teams, err := organization.GetUserRepoTeams(ctx, repo.OwnerID, user.ID, repo.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
|
|||||||
Reference in new issue
Block a user