Add user blocking (#29028)
Fixes #17453 This PR adds the abbility to block a user from a personal account or organization to restrict how the blocked user can interact with the blocker. The docs explain what's the consequence of blocking a user. Screenshots:    --------- Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
KN4CK3R
GitHub
parent
8e12ba34ba
commit
c337ff0ec7
109 changed files with 2878 additions and 548 deletions
243
tests/integration/api_user_block_test.go
Normal file
243
tests/integration/api_user_block_test.go
Normal file
|
|
@ -0,0 +1,243 @@
|
|||
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models"
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
"code.gitea.io/gitea/models/db"
|
||||
issues_model "code.gitea.io/gitea/models/issues"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
api "code.gitea.io/gitea/modules/structs"
|
||||
"code.gitea.io/gitea/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestBlockUser(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
|
||||
countStars := func(t *testing.T, repoOwnerID, starrerID int64) int64 {
|
||||
count, err := db.Count[repo_model.Repository](db.DefaultContext, &repo_model.StarredReposOptions{
|
||||
StarrerID: starrerID,
|
||||
RepoOwnerID: repoOwnerID,
|
||||
IncludePrivate: true,
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
return count
|
||||
}
|
||||
|
||||
countWatches := func(t *testing.T, repoOwnerID, watcherID int64) int64 {
|
||||
count, err := db.Count[repo_model.Repository](db.DefaultContext, &repo_model.WatchedReposOptions{
|
||||
WatcherID: watcherID,
|
||||
RepoOwnerID: repoOwnerID,
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
return count
|
||||
}
|
||||
|
||||
countRepositoryTransfers := func(t *testing.T, senderID, recipientID int64) int64 {
|
||||
transfers, err := models.GetPendingRepositoryTransfers(db.DefaultContext, &models.PendingRepositoryTransferOptions{
|
||||
SenderID: senderID,
|
||||
RecipientID: recipientID,
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
return int64(len(transfers))
|
||||
}
|
||||
|
||||
countAssignedIssues := func(t *testing.T, repoOwnerID, assigneeID int64) int64 {
|
||||
_, count, err := issues_model.GetAssignedIssues(db.DefaultContext, &issues_model.AssignedIssuesOptions{
|
||||
AssigneeID: assigneeID,
|
||||
RepoOwnerID: repoOwnerID,
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
return count
|
||||
}
|
||||
|
||||
countCollaborations := func(t *testing.T, repoOwnerID, collaboratorID int64) int64 {
|
||||
count, err := db.Count[repo_model.Collaboration](db.DefaultContext, &repo_model.FindCollaborationOptions{
|
||||
CollaboratorID: collaboratorID,
|
||||
RepoOwnerID: repoOwnerID,
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
return count
|
||||
}
|
||||
|
||||
t.Run("User", func(t *testing.T) {
|
||||
var blockerID int64 = 16
|
||||
blockerName := "user16"
|
||||
blockerToken := getUserToken(t, blockerName, auth_model.AccessTokenScopeWriteUser)
|
||||
|
||||
var blockeeID int64 = 10
|
||||
blockeeName := "user10"
|
||||
|
||||
t.Run("Block", func(t *testing.T) {
|
||||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName))
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
assert.EqualValues(t, 1, countStars(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countWatches(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countRepositoryTransfers(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countCollaborations(t, blockerID, blockeeID))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s?reason=test", blockeeName)).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
assert.EqualValues(t, 0, countStars(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countWatches(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countRepositoryTransfers(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countCollaborations(t, blockerID, blockeeID))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest) // can't block blocked user
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s", "org3")).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest) // can't block organization
|
||||
|
||||
req = NewRequest(t, "GET", "/api/v1/user/blocks")
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "GET", "/api/v1/user/blocks").
|
||||
AddTokenAuth(blockerToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var users []api.User
|
||||
DecodeJSON(t, resp, &users)
|
||||
|
||||
assert.Len(t, users, 1)
|
||||
assert.Equal(t, blockeeName, users[0].UserName)
|
||||
})
|
||||
|
||||
t.Run("Unblock", func(t *testing.T) {
|
||||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName))
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", "org3")).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
req = NewRequest(t, "GET", "/api/v1/user/blocks").
|
||||
AddTokenAuth(blockerToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var users []api.User
|
||||
DecodeJSON(t, resp, &users)
|
||||
|
||||
assert.Empty(t, users)
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("Organization", func(t *testing.T) {
|
||||
var blockerID int64 = 3
|
||||
blockerName := "org3"
|
||||
|
||||
doerToken := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteUser, auth_model.AccessTokenScopeWriteOrganization)
|
||||
|
||||
var blockeeID int64 = 10
|
||||
blockeeName := "user10"
|
||||
|
||||
t.Run("Block", func(t *testing.T) {
|
||||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, blockeeName))
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, "user4")).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest) // can't block member
|
||||
|
||||
assert.EqualValues(t, 1, countStars(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countWatches(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countRepositoryTransfers(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countAssignedIssues(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countCollaborations(t, blockerID, blockeeID))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, blockeeName)).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s?reason=test", blockerName, blockeeName)).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
assert.EqualValues(t, 0, countStars(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countWatches(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countRepositoryTransfers(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countAssignedIssues(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countCollaborations(t, blockerID, blockeeID))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, blockeeName)).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, blockeeName)).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest) // can't block blocked user
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, "org3")).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest) // can't block organization
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/blocks", blockerName))
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/blocks", blockerName)).
|
||||
AddTokenAuth(doerToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var users []api.User
|
||||
DecodeJSON(t, resp, &users)
|
||||
|
||||
assert.Len(t, users, 1)
|
||||
assert.Equal(t, blockeeName, users[0].UserName)
|
||||
})
|
||||
|
||||
t.Run("Unblock", func(t *testing.T) {
|
||||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, blockeeName))
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, blockeeName)).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, blockeeName)).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/%s/blocks/%s", blockerName, "org3")).
|
||||
AddTokenAuth(doerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/blocks", blockerName)).
|
||||
AddTokenAuth(doerToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var users []api.User
|
||||
DecodeJSON(t, resp, &users)
|
||||
|
||||
assert.Empty(t, users)
|
||||
})
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue