mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-28 05:14:00 +01:00
7378b251b4
- 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/ (cherry picked from commitce8b30be13
) (cherry picked from commitf911dc4025
) Conflicts: options/locale/locale_en-US.ini https://codeberg.org/forgejo/forgejo/pulls/1354 (cherry picked from commitc1b37b7fda
) (cherry picked from commit856a2e0903
) [MODERATION] Show graceful error on comment creation - When someone is blocked by the repository owner or issue poster and try to comment on that issue, they get shown a graceful error. - Adds integration test. (cherry picked from commit490646302e
) (cherry picked from commitd3d88667cb
) (cherry picked from commit6818de13a9
) [MODERATION] Show graceful error on comment creation (squash) typo (cherry picked from commit1588d4834a
) (cherry picked from commitd510ea52d0
) (cherry picked from commit8249e93a14
) [MODERATION] Refactor integration testing (squash) - Motivation for this PR is that I'd noticed that a lot of repeated calls are happening between the test functions and that certain tests weren't using helper functions like `GetCSRF`, therefor this refactor of the integration tests to keep it: clean, small and hopefully more maintainable and understandable. - There are now three integration tests: `TestBlockUser`, `TestBlockUserFromOrganization` and `TestBlockActions` (and has been moved in that order in the source code). - `TestBlockUser` is for doing blocking related actions as an user and `TestBlockUserFromOrganization` as an organisation, even though they execute the same kind of tests they do not share any database calls or logic and therefor it currently doesn't make sense to merge them together (hopefully such oppurtinutiy might be presented in the future). - `TestBlockActions` now contain all tests for actions that should be blocked after blocking has happened, most tests now share the same doer and blocked users and a extra fixture has been added to make this possible for the comment test. - Less code, more comments and more re-use between tests. (cherry picked from commitffb393213d
) (cherry picked from commit85505e0f81
) (cherry picked from commit0f3cf17761
) [MODERATION] Fix network error (squash) - Fix network error toast messages on user actions such as follow and unfollow. This happened because the javascript code now expects an JSON to be returned, but this wasn't the case due to cfa539e590127b4953b010fba3dea21c82a1714. - The integration testing has been adjusted to instead test for the returned flash cookie. (cherry picked from commit112bc25e54
) (cherry picked from commit1194fe4899
) (cherry picked from commit9abb95a844
) [MODERATION] Modernize frontend (squash) - Unify blocked users list. - Use the new flex list classes for blocked users list to avoid using the CSS helper classes and thereby be consistent in the design. - Fix the modal by using the new modal class. - Remove the icon in the modal as looks too big in the new design. - Fix avatar not displaying as it was passing the context where the user should've been passed. - Don't use italics for 'Blocked since' text. - Use namelink template to display the user's name and homelink. (cherry picked from commitec935a16a3
) (cherry picked from commit67f37c8346
) Conflicts: models/user/follow.go models/user/user_test.go routers/api/v1/user/follower.go routers/web/shared/user/header.go routers/web/user/profile.go templates/swagger/v1_json.tmpl https://codeberg.org/forgejo/forgejo/pulls/1468 (cherry picked from commit6a9626839c
) Conflicts: tests/integration/api_nodeinfo_test.go https://codeberg.org/forgejo/forgejo/pulls/1508#issuecomment-1242385
350 lines
10 KiB
Go
350 lines
10 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package issue
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
activities_model "code.gitea.io/gitea/models/activities"
|
|
"code.gitea.io/gitea/models/db"
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
access_model "code.gitea.io/gitea/models/perm/access"
|
|
project_model "code.gitea.io/gitea/models/project"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
system_model "code.gitea.io/gitea/models/system"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/storage"
|
|
"code.gitea.io/gitea/modules/timeutil"
|
|
notify_service "code.gitea.io/gitea/services/notify"
|
|
)
|
|
|
|
// NewIssue creates new issue with labels for repository.
|
|
func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *issues_model.Issue, labelIDs []int64, uuids []string, assigneeIDs []int64) error {
|
|
// Check if the user is not blocked by the repo's owner.
|
|
if user_model.IsBlocked(ctx, repo.OwnerID, issue.PosterID) {
|
|
return user_model.ErrBlockedByUser
|
|
}
|
|
|
|
if err := issues_model.NewIssue(repo, issue, labelIDs, uuids); err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, assigneeID := range assigneeIDs {
|
|
if _, err := AddAssigneeIfNotAssigned(ctx, issue, issue.Poster, assigneeID, true); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
mentions, err := issues_model.FindAndUpdateIssueMentions(ctx, issue, issue.Poster, issue.Content)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
notify_service.NewIssue(ctx, issue, mentions)
|
|
if len(issue.Labels) > 0 {
|
|
notify_service.IssueChangeLabels(ctx, issue.Poster, issue, issue.Labels, nil)
|
|
}
|
|
if issue.Milestone != nil {
|
|
notify_service.IssueChangeMilestone(ctx, issue.Poster, issue, 0)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// ChangeTitle changes the title of this issue, as the given user.
|
|
func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, title string) error {
|
|
oldTitle := issue.Title
|
|
issue.Title = title
|
|
|
|
if err := issues_model.ChangeIssueTitle(ctx, issue, doer, oldTitle); err != nil {
|
|
return err
|
|
}
|
|
|
|
if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issues_model.HasWorkInProgressPrefix(title) {
|
|
if err := issues_model.PullRequestCodeOwnersReview(ctx, issue, issue.PullRequest); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
notify_service.IssueChangeTitle(ctx, doer, issue, oldTitle)
|
|
|
|
return nil
|
|
}
|
|
|
|
// ChangeIssueRef changes the branch of this issue, as the given user.
|
|
func ChangeIssueRef(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, ref string) error {
|
|
oldRef := issue.Ref
|
|
issue.Ref = ref
|
|
|
|
if err := issues_model.ChangeIssueRef(issue, doer, oldRef); err != nil {
|
|
return err
|
|
}
|
|
|
|
notify_service.IssueChangeRef(ctx, doer, issue, oldRef)
|
|
|
|
return nil
|
|
}
|
|
|
|
// UpdateAssignees is a helper function to add or delete one or multiple issue assignee(s)
|
|
// Deleting is done the GitHub way (quote from their api documentation):
|
|
// https://developer.github.com/v3/issues/#edit-an-issue
|
|
// "assignees" (array): Logins for Users to assign to this issue.
|
|
// Pass one or more user logins to replace the set of assignees on this Issue.
|
|
// Send an empty array ([]) to clear all assignees from the Issue.
|
|
func UpdateAssignees(ctx context.Context, issue *issues_model.Issue, oneAssignee string, multipleAssignees []string, doer *user_model.User) (err error) {
|
|
var allNewAssignees []*user_model.User
|
|
|
|
// Keep the old assignee thingy for compatibility reasons
|
|
if oneAssignee != "" {
|
|
// Prevent double adding assignees
|
|
var isDouble bool
|
|
for _, assignee := range multipleAssignees {
|
|
if assignee == oneAssignee {
|
|
isDouble = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if !isDouble {
|
|
multipleAssignees = append(multipleAssignees, oneAssignee)
|
|
}
|
|
}
|
|
|
|
// Loop through all assignees to add them
|
|
for _, assigneeName := range multipleAssignees {
|
|
assignee, err := user_model.GetUserByName(ctx, assigneeName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
allNewAssignees = append(allNewAssignees, assignee)
|
|
}
|
|
|
|
// Delete all old assignees not passed
|
|
if err = DeleteNotPassedAssignee(ctx, issue, doer, allNewAssignees); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Add all new assignees
|
|
// Update the assignee. The function will check if the user exists, is already
|
|
// assigned (which he shouldn't as we deleted all assignees before) and
|
|
// has access to the repo.
|
|
for _, assignee := range allNewAssignees {
|
|
// Extra method to prevent double adding (which would result in removing)
|
|
_, err = AddAssigneeIfNotAssigned(ctx, issue, doer, assignee.ID, true)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
// DeleteIssue deletes an issue
|
|
func DeleteIssue(ctx context.Context, doer *user_model.User, gitRepo *git.Repository, issue *issues_model.Issue) error {
|
|
// load issue before deleting it
|
|
if err := issue.LoadAttributes(ctx); err != nil {
|
|
return err
|
|
}
|
|
if err := issue.LoadPullRequest(ctx); err != nil {
|
|
return err
|
|
}
|
|
|
|
// delete entries in database
|
|
if err := deleteIssue(ctx, issue); err != nil {
|
|
return err
|
|
}
|
|
|
|
// delete pull request related git data
|
|
if issue.IsPull && gitRepo != nil {
|
|
if err := gitRepo.RemoveReference(fmt.Sprintf("%s%d/head", git.PullPrefix, issue.PullRequest.Index)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// If the Issue is pinned, we should unpin it before deletion to avoid problems with other pinned Issues
|
|
if issue.IsPinned() {
|
|
if err := issue.Unpin(ctx, doer); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
notify_service.DeleteIssue(ctx, doer, issue)
|
|
|
|
return nil
|
|
}
|
|
|
|
// AddAssigneeIfNotAssigned adds an assignee only if he isn't already assigned to the issue.
|
|
// Also checks for access of assigned user
|
|
func AddAssigneeIfNotAssigned(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, assigneeID int64, notify bool) (comment *issues_model.Comment, err error) {
|
|
assignee, err := user_model.GetUserByID(ctx, assigneeID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Check if the user is already assigned
|
|
isAssigned, err := issues_model.IsUserAssignedToIssue(ctx, issue, assignee)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if isAssigned {
|
|
// nothing to to
|
|
return nil, nil
|
|
}
|
|
|
|
valid, err := access_model.CanBeAssigned(ctx, assignee, issue.Repo, issue.IsPull)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !valid {
|
|
return nil, repo_model.ErrUserDoesNotHaveAccessToRepo{UserID: assigneeID, RepoName: issue.Repo.Name}
|
|
}
|
|
|
|
if notify {
|
|
_, comment, err = ToggleAssigneeWithNotify(ctx, issue, doer, assigneeID)
|
|
return comment, err
|
|
}
|
|
_, comment, err = issues_model.ToggleIssueAssignee(ctx, issue, doer, assigneeID)
|
|
return comment, err
|
|
}
|
|
|
|
// GetRefEndNamesAndURLs retrieves the ref end names (e.g. refs/heads/branch-name -> branch-name)
|
|
// and their respective URLs.
|
|
func GetRefEndNamesAndURLs(issues []*issues_model.Issue, repoLink string) (map[int64]string, map[int64]string) {
|
|
issueRefEndNames := make(map[int64]string, len(issues))
|
|
issueRefURLs := make(map[int64]string, len(issues))
|
|
for _, issue := range issues {
|
|
if issue.Ref != "" {
|
|
issueRefEndNames[issue.ID] = git.RefName(issue.Ref).ShortName()
|
|
issueRefURLs[issue.ID] = git.RefURL(repoLink, issue.Ref)
|
|
}
|
|
}
|
|
return issueRefEndNames, issueRefURLs
|
|
}
|
|
|
|
// deleteIssue deletes the issue
|
|
func deleteIssue(ctx context.Context, issue *issues_model.Issue) error {
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
e := db.GetEngine(ctx)
|
|
if _, err := e.ID(issue.ID).NoAutoCondition().Delete(issue); err != nil {
|
|
return err
|
|
}
|
|
|
|
// update the total issue numbers
|
|
if err := repo_model.UpdateRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull, false); err != nil {
|
|
return err
|
|
}
|
|
// if the issue is closed, update the closed issue numbers
|
|
if issue.IsClosed {
|
|
if err := repo_model.UpdateRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull, true); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if err := issues_model.UpdateMilestoneCounters(ctx, issue.MilestoneID); err != nil {
|
|
return fmt.Errorf("error updating counters for milestone id %d: %w",
|
|
issue.MilestoneID, err)
|
|
}
|
|
|
|
if err := activities_model.DeleteIssueActions(ctx, issue.RepoID, issue.ID, issue.Index); err != nil {
|
|
return err
|
|
}
|
|
|
|
// find attachments related to this issue and remove them
|
|
if err := issue.LoadAttributes(ctx); err != nil {
|
|
return err
|
|
}
|
|
|
|
for i := range issue.Attachments {
|
|
system_model.RemoveStorageWithNotice(ctx, storage.Attachments, "Delete issue attachment", issue.Attachments[i].RelativePath())
|
|
}
|
|
|
|
// delete all database data still assigned to this issue
|
|
if err := issues_model.DeleteInIssue(ctx, issue.ID,
|
|
&issues_model.ContentHistory{},
|
|
&issues_model.Comment{},
|
|
&issues_model.IssueLabel{},
|
|
&issues_model.IssueDependency{},
|
|
&issues_model.IssueAssignees{},
|
|
&issues_model.IssueUser{},
|
|
&activities_model.Notification{},
|
|
&issues_model.Reaction{},
|
|
&issues_model.IssueWatch{},
|
|
&issues_model.Stopwatch{},
|
|
&issues_model.TrackedTime{},
|
|
&project_model.ProjectIssue{},
|
|
&repo_model.Attachment{},
|
|
&issues_model.PullRequest{},
|
|
); err != nil {
|
|
return err
|
|
}
|
|
|
|
// References to this issue in other issues
|
|
if _, err := db.DeleteByBean(ctx, &issues_model.Comment{
|
|
RefIssueID: issue.ID,
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Delete dependencies for issues in other repositories
|
|
if _, err := db.DeleteByBean(ctx, &issues_model.IssueDependency{
|
|
DependencyID: issue.ID,
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
|
|
// delete from dependent issues
|
|
if _, err := db.DeleteByBean(ctx, &issues_model.Comment{
|
|
DependentIssueID: issue.ID,
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
|
|
return committer.Commit()
|
|
}
|
|
|
|
// Set the UpdatedUnix date and the NoAutoTime field of an Issue if a non
|
|
// nil 'updated' time is provided
|
|
//
|
|
// In order to set a specific update time, the DB will be updated with
|
|
// NoAutoTime(). A 'NoAutoTime' boolean field in the Issue struct is used to
|
|
// propagate down to the DB update calls the will to apply autoupdate or not.
|
|
func SetIssueUpdateDate(ctx context.Context, issue *issues_model.Issue, updated *time.Time, doer *user_model.User) error {
|
|
issue.NoAutoTime = false
|
|
if updated == nil {
|
|
return nil
|
|
}
|
|
|
|
if err := issue.LoadRepo(ctx); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Check if the poster is allowed to set an update date
|
|
perm, err := access_model.GetUserRepoPermission(ctx, issue.Repo, doer)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !perm.IsAdmin() && !perm.IsOwner() {
|
|
return fmt.Errorf("user needs to have admin or owner right")
|
|
}
|
|
|
|
// A simple guard against potential inconsistent calls
|
|
updatedUnix := timeutil.TimeStamp(updated.Unix())
|
|
if updatedUnix < issue.CreatedUnix || updatedUnix > timeutil.TimeStampNow() {
|
|
return fmt.Errorf("unallowed update date")
|
|
}
|
|
|
|
issue.UpdatedUnix = updatedUnix
|
|
issue.NoAutoTime = true
|
|
|
|
return nil
|
|
}
|