mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-10-31 22:38:58 +00:00
ce8b30be13
- Add the ability to block a user via their profile page. - This will unstar their repositories and visa versa. - Blocked users cannot create issues or pull requests on your the doer's repositories (mind that this is not the case for organizations). - Blocked users cannot comment on the doer's opened issues or pull requests. - Blocked users cannot add reactions to doer's comments. - Blocked users cannot cause a notification trough mentioning the doer. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/540 (cherry picked from commit687d852480
) (cherry picked from commit0c32a4fde5
) (cherry picked from commit1791130e3c
) (cherry picked from commit37858b7e8f
) (cherry picked from commita3e2bfd7e9
) (cherry picked from commit7009b9fe87
) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go templates/user/profile.tmpl (cherry picked from commitb2aec34791
) (cherry picked from commite2f1b73752
) [MODERATION] organization blocking a user (#802) - Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit0505a10421
) (cherry picked from commit37b4e6ef9b
) (cherry picked from commitc17c121f2c
) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to:6bbccdd177
Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit523635f83c
) (cherry picked from commit4743eaa6a0
) (cherry picked from commiteff5b43d2e
) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go (cherry picked from commit9d359be5ed
) (cherry picked from commitb1f3069a22
) [MODERATION] add user blocking API - Follow up for: #540, #802 - Add API routes for user blocking from user and organization perspective. - The new routes have integration testing. - The new model functions have unit tests. - Actually quite boring to write and to read this pull request. (cherry picked from commitf3afaf15c7
) (cherry picked from commit6d754db3e5
) (cherry picked from commit2a89ddc0ac
) (cherry picked from commit4a147bff7e
) Conflicts: routers/api/v1/api.go templates/swagger/v1_json.tmpl (cherry picked from commitbb8c339185
) (cherry picked from commit5a11569a01
) (cherry picked from commit2373c801ee
) [MODERATION] restore redirect on unblock ctx.RedirectToFirst(ctx.FormString("redirect_to"), ctx.ContextUser.HomeLink()) was replaced by ctx.JSONOK() in128d77a3a
Following up fixes for "Fix inconsistent user profile layout across tabs" (#25739) thus changing the behavior (nicely spotted by the tests). This restores it. (cherry picked from commit597c243707
) (cherry picked from commitcfa539e590
) [MODERATION] Add test case (squash) - Add an test case, to test an property of the function. (cherry picked from commit70dadb1916
) [MODERATION] Block adding collaborators - Ensure that the doer and blocked user cannot add each other as collaborators to repositories. - The Web UI gets an detailed message of the specific situation, the API gets an generic Forbidden code. - Unit tests has been added. - Integration testing for Web and API has been added. - This commit doesn't introduce removing each other as collaborators on the block action, due to the complexity of database calls that needs to be figured out. That deserves its own commit and test code. (cherry picked from commit747be949a1
) [MODERATION] move locale_en-US.ini strings to avoid conflicts Conflicts: web_src/css/org.css web_src/css/user.css https://codeberg.org/forgejo/forgejo/pulls/1180 (cherry picked from commite53f955c88
) Conflicts: services/issue/comments.go https://codeberg.org/forgejo/forgejo/pulls/1212 (cherry picked from commitb4a454b576
) Conflicts: models/forgejo_migrations/migrate.go options/locale/locale_en-US.ini services/pull/pull.go https://codeberg.org/forgejo/forgejo/pulls/1264 [MODERATION] Remove blocked user collaborations with doer - When the doer blocks an user, who is also an collaborator on an repository that the doer owns, remove that collaboration. - Added unit tests. - Refactor the unit test to be more organized. (cherry picked from commitec87016178
) (cherry picked from commit313e6174d8
) [MODERATION] QoL improvements (squash) - Ensure that organisations cannot be blocked. It currently has no effect, as all blocked operations cannot be executed from an organisation standpoint. - Refactored the API route to make use of the `UserAssignmentAPI` middleware. - Make more use of `t.Run` so that the test code is more clear about which block of code belongs to which test case. - Added more integration testing (to ensure the organisations cannot be blocked and some authorization/permission checks). (cherry picked from commite9d638d075
) [MODERATION] s/{{avatar/{{ctx.AvatarUtils.Avatar/
410 lines
9.5 KiB
Go
410 lines
9.5 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
asymkey_model "code.gitea.io/gitea/models/asymkey"
|
|
"code.gitea.io/gitea/models/organization"
|
|
"code.gitea.io/gitea/models/perm"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/test"
|
|
"code.gitea.io/gitea/modules/web"
|
|
"code.gitea.io/gitea/services/forms"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func createSSHAuthorizedKeysTmpPath(t *testing.T) func() {
|
|
tmpDir := t.TempDir()
|
|
|
|
oldPath := setting.SSH.RootPath
|
|
setting.SSH.RootPath = tmpDir
|
|
|
|
return func() {
|
|
setting.SSH.RootPath = oldPath
|
|
}
|
|
}
|
|
|
|
func TestAddReadOnlyDeployKey(t *testing.T) {
|
|
if deferable := createSSHAuthorizedKeysTmpPath(t); deferable != nil {
|
|
defer deferable()
|
|
} else {
|
|
return
|
|
}
|
|
unittest.PrepareTestEnv(t)
|
|
|
|
ctx, _ := test.MockContext(t, "user2/repo1/settings/keys")
|
|
|
|
test.LoadUser(t, ctx, 2)
|
|
test.LoadRepo(t, ctx, 2)
|
|
|
|
addKeyForm := forms.AddKeyForm{
|
|
Title: "read-only",
|
|
Content: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n",
|
|
}
|
|
web.SetForm(ctx, &addKeyForm)
|
|
DeployKeysPost(ctx)
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
|
|
unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
|
|
Name: addKeyForm.Title,
|
|
Content: addKeyForm.Content,
|
|
Mode: perm.AccessModeRead,
|
|
})
|
|
}
|
|
|
|
func TestAddReadWriteOnlyDeployKey(t *testing.T) {
|
|
if deferable := createSSHAuthorizedKeysTmpPath(t); deferable != nil {
|
|
defer deferable()
|
|
} else {
|
|
return
|
|
}
|
|
|
|
unittest.PrepareTestEnv(t)
|
|
|
|
ctx, _ := test.MockContext(t, "user2/repo1/settings/keys")
|
|
|
|
test.LoadUser(t, ctx, 2)
|
|
test.LoadRepo(t, ctx, 2)
|
|
|
|
addKeyForm := forms.AddKeyForm{
|
|
Title: "read-write",
|
|
Content: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n",
|
|
IsWritable: true,
|
|
}
|
|
web.SetForm(ctx, &addKeyForm)
|
|
DeployKeysPost(ctx)
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
|
|
unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
|
|
Name: addKeyForm.Title,
|
|
Content: addKeyForm.Content,
|
|
Mode: perm.AccessModeWrite,
|
|
})
|
|
}
|
|
|
|
func TestCollaborationPost(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "user2/repo1/issues/labels")
|
|
test.LoadUser(t, ctx, 2)
|
|
test.LoadUser(t, ctx, 4)
|
|
test.LoadRepo(t, ctx, 1)
|
|
|
|
ctx.Req.Form.Set("collaborator", "user4")
|
|
|
|
u := &user_model.User{
|
|
ID: 2,
|
|
LowerName: "user2",
|
|
Type: user_model.UserTypeIndividual,
|
|
}
|
|
|
|
re := &repo_model.Repository{
|
|
ID: 2,
|
|
Owner: u,
|
|
OwnerID: u.ID,
|
|
}
|
|
|
|
repo := &context.Repository{
|
|
Owner: u,
|
|
Repository: re,
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
CollaborationPost(ctx)
|
|
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
|
|
exists, err := repo_model.IsCollaborator(ctx, re.ID, 4)
|
|
assert.NoError(t, err)
|
|
assert.True(t, exists)
|
|
}
|
|
|
|
func TestCollaborationPost_InactiveUser(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "user2/repo1/issues/labels")
|
|
test.LoadUser(t, ctx, 2)
|
|
test.LoadUser(t, ctx, 9)
|
|
test.LoadRepo(t, ctx, 1)
|
|
|
|
ctx.Req.Form.Set("collaborator", "user9")
|
|
|
|
repo := &context.Repository{
|
|
Owner: &user_model.User{
|
|
LowerName: "user2",
|
|
},
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
CollaborationPost(ctx)
|
|
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
|
|
}
|
|
|
|
func TestCollaborationPost_AddCollaboratorTwice(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "user2/repo1/issues/labels")
|
|
test.LoadUser(t, ctx, 2)
|
|
test.LoadUser(t, ctx, 4)
|
|
test.LoadRepo(t, ctx, 1)
|
|
|
|
ctx.Req.Form.Set("collaborator", "user4")
|
|
|
|
u := &user_model.User{
|
|
ID: 2,
|
|
LowerName: "user2",
|
|
Type: user_model.UserTypeIndividual,
|
|
}
|
|
|
|
re := &repo_model.Repository{
|
|
ID: 2,
|
|
Owner: u,
|
|
OwnerID: u.ID,
|
|
}
|
|
|
|
repo := &context.Repository{
|
|
Owner: u,
|
|
Repository: re,
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
CollaborationPost(ctx)
|
|
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
|
|
exists, err := repo_model.IsCollaborator(ctx, re.ID, 4)
|
|
assert.NoError(t, err)
|
|
assert.True(t, exists)
|
|
|
|
// Try adding the same collaborator again
|
|
CollaborationPost(ctx)
|
|
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
|
|
}
|
|
|
|
func TestCollaborationPost_NonExistentUser(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "user2/repo1/issues/labels")
|
|
test.LoadUser(t, ctx, 2)
|
|
test.LoadRepo(t, ctx, 1)
|
|
|
|
ctx.Req.Form.Set("collaborator", "user34")
|
|
|
|
repo := &context.Repository{
|
|
Owner: &user_model.User{
|
|
LowerName: "user2",
|
|
},
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
CollaborationPost(ctx)
|
|
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
|
|
}
|
|
|
|
func TestAddTeamPost(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "org26/repo43")
|
|
|
|
ctx.Req.Form.Set("team", "team11")
|
|
|
|
org := &user_model.User{
|
|
LowerName: "org26",
|
|
Type: user_model.UserTypeOrganization,
|
|
}
|
|
|
|
team := &organization.Team{
|
|
ID: 11,
|
|
OrgID: 26,
|
|
}
|
|
|
|
re := &repo_model.Repository{
|
|
ID: 43,
|
|
Owner: org,
|
|
OwnerID: 26,
|
|
}
|
|
|
|
repo := &context.Repository{
|
|
Owner: &user_model.User{
|
|
ID: 26,
|
|
LowerName: "org26",
|
|
RepoAdminChangeTeamAccess: true,
|
|
},
|
|
Repository: re,
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
AddTeamPost(ctx)
|
|
|
|
assert.True(t, models.HasRepository(team, re.ID))
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
assert.Empty(t, ctx.Flash.ErrorMsg)
|
|
}
|
|
|
|
func TestAddTeamPost_NotAllowed(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "org26/repo43")
|
|
|
|
ctx.Req.Form.Set("team", "team11")
|
|
|
|
org := &user_model.User{
|
|
LowerName: "org26",
|
|
Type: user_model.UserTypeOrganization,
|
|
}
|
|
|
|
team := &organization.Team{
|
|
ID: 11,
|
|
OrgID: 26,
|
|
}
|
|
|
|
re := &repo_model.Repository{
|
|
ID: 43,
|
|
Owner: org,
|
|
OwnerID: 26,
|
|
}
|
|
|
|
repo := &context.Repository{
|
|
Owner: &user_model.User{
|
|
ID: 26,
|
|
LowerName: "org26",
|
|
RepoAdminChangeTeamAccess: false,
|
|
},
|
|
Repository: re,
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
AddTeamPost(ctx)
|
|
|
|
assert.False(t, models.HasRepository(team, re.ID))
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
|
|
}
|
|
|
|
func TestAddTeamPost_AddTeamTwice(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "org26/repo43")
|
|
|
|
ctx.Req.Form.Set("team", "team11")
|
|
|
|
org := &user_model.User{
|
|
LowerName: "org26",
|
|
Type: user_model.UserTypeOrganization,
|
|
}
|
|
|
|
team := &organization.Team{
|
|
ID: 11,
|
|
OrgID: 26,
|
|
}
|
|
|
|
re := &repo_model.Repository{
|
|
ID: 43,
|
|
Owner: org,
|
|
OwnerID: 26,
|
|
}
|
|
|
|
repo := &context.Repository{
|
|
Owner: &user_model.User{
|
|
ID: 26,
|
|
LowerName: "org26",
|
|
RepoAdminChangeTeamAccess: true,
|
|
},
|
|
Repository: re,
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
AddTeamPost(ctx)
|
|
|
|
AddTeamPost(ctx)
|
|
assert.True(t, models.HasRepository(team, re.ID))
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
|
|
}
|
|
|
|
func TestAddTeamPost_NonExistentTeam(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "org26/repo43")
|
|
|
|
ctx.Req.Form.Set("team", "team-non-existent")
|
|
|
|
org := &user_model.User{
|
|
LowerName: "org26",
|
|
Type: user_model.UserTypeOrganization,
|
|
}
|
|
|
|
re := &repo_model.Repository{
|
|
ID: 43,
|
|
Owner: org,
|
|
OwnerID: 26,
|
|
}
|
|
|
|
repo := &context.Repository{
|
|
Owner: &user_model.User{
|
|
ID: 26,
|
|
LowerName: "org26",
|
|
RepoAdminChangeTeamAccess: true,
|
|
},
|
|
Repository: re,
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
AddTeamPost(ctx)
|
|
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
|
|
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
|
|
}
|
|
|
|
func TestDeleteTeam(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := test.MockContext(t, "org3/team1/repo3")
|
|
|
|
ctx.Req.Form.Set("id", "2")
|
|
|
|
org := &user_model.User{
|
|
LowerName: "org3",
|
|
Type: user_model.UserTypeOrganization,
|
|
}
|
|
|
|
team := &organization.Team{
|
|
ID: 2,
|
|
OrgID: 3,
|
|
}
|
|
|
|
re := &repo_model.Repository{
|
|
ID: 3,
|
|
Owner: org,
|
|
OwnerID: 3,
|
|
}
|
|
|
|
repo := &context.Repository{
|
|
Owner: &user_model.User{
|
|
ID: 3,
|
|
LowerName: "org3",
|
|
RepoAdminChangeTeamAccess: true,
|
|
},
|
|
Repository: re,
|
|
}
|
|
|
|
ctx.Repo = repo
|
|
|
|
DeleteTeam(ctx)
|
|
|
|
assert.False(t, models.HasRepository(team, re.ID))
|
|
}
|