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

An inactive user shouldn't be able to be added as a collaborator #4535

Merged
merged 11 commits into from
Aug 7, 2018
Merged

An inactive user shouldn't be able to be added as a collaborator #4535

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cbf4c92
an inactive user shouldn't be able to be a collaborator
adelowo Jul 28, 2018
bf402c7
use translated error message
adelowo Jul 28, 2018
9d6f15c
add active user check when adding a new collaborator via the api
adelowo Jul 29, 2018
ace2e37
fix translation text
adelowo Jul 29, 2018
47278ad
added collaborator test
adelowo Jul 29, 2018
7decd51
improvee testcases
adelowo Jul 29, 2018
f850462
Merge branch 'master' into an_inactive_user_cannot_be_a_collaborator
lafriks Jul 30, 2018
0d4d138
Merge branch 'master' of https://github.com/go-gitea/gitea into an_in…
adelowo Aug 6, 2018
6f7007b
Merge branch 'an_inactive_user_cannot_be_a_collaborator' of github.co…
adelowo Aug 6, 2018
931db1d
Merge branch 'master' into an_inactive_user_cannot_be_a_collaborator
techknowlogick Aug 7, 2018
52999be
Merge branch 'master' into an_inactive_user_cannot_be_a_collaborator
lafriks Aug 7, 2018
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 @@ -1014,6 +1014,7 @@ settings.transfer_succeed = The repository has been transferred.
settings.confirm_delete = Delete Repository
settings.add_collaborator = Add Collaborator
settings.add_collaborator_success = The collaborator has been added.
settings.add_collaborator_inactive_user = Cannot add an inactive user as a collaborator.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can not

settings.delete_collaborator = Remove
settings.collaborator_deletion = Remove Collaborator
settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue?
Expand Down
7 changes: 7 additions & 0 deletions routers/api/v1/repo/collaborators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
package repo

import (
"errors"

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"

Expand Down Expand Up @@ -145,6 +147,11 @@ func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {
return
}

if !collaborator.IsActive {
ctx.Error(500, "InactiveCollaborator", errors.New("collaborator's account is inactive"))
return
}

if err := ctx.Repo.Repository.AddCollaborator(collaborator); err != nil {
ctx.Error(500, "AddCollaborator", err)
return
Expand Down
6 changes: 6 additions & 0 deletions routers/repo/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,12 @@ func CollaborationPost(ctx *context.Context) {
return
}

if !u.IsActive {
ctx.Flash.Error(ctx.Tr("repo.settings.add_collaborator_inactive_user"))
ctx.Redirect(setting.AppSubURL + ctx.Req.URL.Path)
return
}

// Organization is not allowed to be added as a collaborator.
if u.IsOrganization() {
ctx.Flash.Error(ctx.Tr("repo.settings.org_not_allowed_to_be_collaborator"))
Expand Down