Skip to content

Fix Agit pull request permission check #32999

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

Merged
merged 4 commits into from
Dec 27, 2024
Merged

Fix Agit pull request permission check #32999

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
219f0c5
Fix Agit pull request permission check
a1012112796 Dec 27, 2024
a73248d
fix lint
a1012112796 Dec 27, 2024
7a10bac
Update services/pull/pull.go
a1012112796 Dec 27, 2024
9e383d5
Merge branch 'main' into zzc/dev/agit_perm
GiteaBot Dec 27, 2024
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
2 changes: 1 addition & 1 deletion services/pull/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error {
}

// user should be a collaborator or a member of the organization for base repo
if !issue.Poster.IsAdmin {
if (!issue.Poster.IsAdmin) && pr.Flow == issues_model.PullRequestFlowGithub {
Copy link
Contributor

@wxiaoguang wxiaoguang Dec 27, 2024

Choose a reason for hiding this comment

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

Suggested change
if (!issue.Poster.IsAdmin) && pr.Flow == issues_model.PullRequestFlowGithub {
canCreate := issue.Poster.IsAdmin || pr.Flow == issues_model.PullRequestFlowAGit
if !canCreate {

But should we also check something like "repo read permission" for "agit" to create?

Copy link
Member Author

@a1012112796 a1012112796 Dec 27, 2024

Choose a reason for hiding this comment

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

But should we also check something like "repo read permission" for "agit" to create?

looks user already can't create pull request in my local test.

image

canCreate, err := repo_model.IsOwnerMemberCollaborator(ctx, repo, issue.Poster.ID)
if err != nil {
return err
Expand Down
19 changes: 19 additions & 0 deletions tests/integration/pull_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"strings"
"testing"

"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/test"
"code.gitea.io/gitea/tests"

Expand Down Expand Up @@ -226,3 +227,21 @@ func TestPullCreatePrFromBaseToFork(t *testing.T) {
assert.Regexp(t, "^/user1/repo1/pulls/[0-9]*$", url)
})
}

func TestCreateAgitPullWithReadPermission(t *testing.T) {
onGiteaRun(t, func(t *testing.T, u *url.URL) {
dstPath := t.TempDir()

u.Path = "user2/repo1.git"
u.User = url.UserPassword("user4", userPassword)

t.Run("Clone", doGitClone(dstPath, u))

t.Run("add commit", doGitAddSomeCommits(dstPath, "master"))

t.Run("do agit pull create", func(t *testing.T) {
err := git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master", "-o").AddDynamicArguments("topic=" + "test-topic").Run(&git.RunOpts{Dir: dstPath})
assert.NoError(t, err)
})
})
}
Loading