From 2658d4361e8038d1fed61de7bb2e5347d0a17b48 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Fri, 1 Mar 2024 23:19:18 +0100
Subject: [PATCH] [BUG] Disable CODEOWNERS for forked repositories
- Disable the CODEOWNERS feature for forked repositories, as it would
otherwise inadvertently request reviewers when for example a pull
request is opened against a forked repository to propose changes to an
existant pull request in the original repository.
- Adds integration test.
- Resolves #2525
---
models/issues/pull.go | 8 ++++++++
tests/integration/codeowner_test.go | 27 ++++++++++++++++++++++++---
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/models/issues/pull.go b/models/issues/pull.go
index 98d1617380..84a62ddc90 100644
--- a/models/issues/pull.go
+++ b/models/issues/pull.go
@@ -891,6 +891,14 @@ func PullRequestCodeOwnersReview(ctx context.Context, pull *Issue, pr *PullReque
return nil
}
+ if err := pull.LoadRepo(ctx); err != nil {
+ return err
+ }
+
+ if pull.Repo.IsFork {
+ return nil
+ }
+
if err := pr.LoadBaseRepo(ctx); err != nil {
return err
}
diff --git a/tests/integration/codeowner_test.go b/tests/integration/codeowner_test.go
index e1324782f8..7668755547 100644
--- a/tests/integration/codeowner_test.go
+++ b/tests/integration/codeowner_test.go
@@ -14,6 +14,7 @@ import (
"time"
issues_model "code.gitea.io/gitea/models/issues"
+ repo_model "code.gitea.io/gitea/models/repo"
unit_model "code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
@@ -42,9 +43,9 @@ func TestCodeOwner(t *testing.T) {
dstPath := t.TempDir()
r := fmt.Sprintf("%suser2/%s.git", u.String(), repo.Name)
- u, _ = url.Parse(r)
- u.User = url.UserPassword("user2", userPassword)
- assert.NoError(t, git.CloneWithArgs(context.Background(), nil, u.String(), dstPath, git.CloneRepoOptions{}))
+ cloneURL, _ := url.Parse(r)
+ cloneURL.User = url.UserPassword("user2", userPassword)
+ assert.NoError(t, git.CloneWithArgs(context.Background(), nil, cloneURL.String(), dstPath, git.CloneRepoOptions{}))
t.Run("Normal", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
@@ -77,6 +78,26 @@ func TestCodeOwner(t *testing.T) {
unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
})
+ t.Run("Forked repository", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ session := loginUser(t, "user1")
+ testRepoFork(t, session, user2.Name, repo.Name, "user1", "repo1")
+
+ repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
+
+ r := fmt.Sprintf("%suser1/repo1.git", u.String())
+ remoteURL, _ := url.Parse(r)
+ remoteURL.User = url.UserPassword("user2", userPassword)
+ doGitAddRemote(dstPath, "forked", remoteURL)(t)
+
+ err := git.NewCommand(git.DefaultContext, "push", "forked", "HEAD:refs/for/main", "-o", "topic=codeowner-forked").Run(&git.RunOpts{Dir: dstPath})
+ assert.NoError(t, err)
+
+ pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-forked"})
+ unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+ })
+
t.Run("Out of date", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()