Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not allow organisation owners add themselves as collaborator #20043

Merged
merged 10 commits into from
Sep 27, 2022
Merged

Do not allow organisation owners add themselves as collaborator #20043

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f14f299
Do not allow organisation owners add themselves as collaborator
42wim Jun 19, 2022
532c36a
Apply code review and check error
42wim Jun 19, 2022
149db50
Use IsOrganizationOwner
42wim Jun 19, 2022
318ef82
Add flash
42wim Jun 21, 2022
65c822f
Merge branch 'main' into fix-17966
42wim Jun 26, 2022
f94505c
Use repo section
42wim Jul 14, 2022
9821553
Merge branch 'main' into fix-17966
42wim Jul 14, 2022
fa7847d
Merge branch 'main' into fix-17966
wxiaoguang Jul 15, 2022
e403874
Merge branch 'main' into fix-17966
6543 Aug 3, 2022
7ac95a5
Merge branch 'main' into fix-17966
6543 Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1893,6 +1893,7 @@ settings.confirm_delete = Delete Repository
settings.add_collaborator = Add Collaborator
settings.add_collaborator_success = The collaborator has been added.
settings.add_collaborator_inactive_user = Can not add an inactive user as a collaborator.
settings.add_collaborator_owner = Can not add an owner as a collaborator.
settings.add_collaborator_duplicate = The collaborator is already added to this repository.
settings.delete_collaborator = Remove
settings.collaborator_deletion = Remove Collaborator
Expand Down
13 changes: 13 additions & 0 deletions routers/web/repo/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,19 @@ func CollaborationPost(ctx *context.Context) {
return
}

// find the owner team of the organization the repo belongs too and
// check if the user we're trying to add is an owner.
if ctx.Repo.Repository.Owner.IsOrganization() {
if isOwner, err := organization.IsOrganizationOwner(ctx, ctx.Repo.Repository.Owner.ID, u.ID); err != nil {
ctx.ServerError("IsOrganizationOwner", err)
return
} else if isOwner {
ctx.Flash.Error(ctx.Tr("repo.settings.add_collaborator_owner"))
ctx.Redirect(setting.AppSubURL + ctx.Req.URL.EscapedPath())
42wim marked this conversation as resolved.
Show resolved Hide resolved
return
}
}

if err = models.AddCollaborator(ctx.Repo.Repository, u); err != nil {
ctx.ServerError("AddCollaborator", err)
return
Expand Down