]> source.dussan.org Git - gitea.git/commitdiff
Avoid returning without written ctx when posting PR (#31843)
authorJason Song <i@wolfogre.com>
Fri, 16 Aug 2024 17:04:54 +0000 (01:04 +0800)
committerGitHub <noreply@github.com>
Fri, 16 Aug 2024 17:04:54 +0000 (17:04 +0000)
Fix #31625.

If `pull_service.NewPullRequest` return an error which misses each `if`
check, `CompareAndPullRequestPost` will return immediately, since it
doesn't write the HTTP response, a 200 response with empty body will be
sent to clients.

```go
if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs); err != nil {
if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
} else if git.IsErrPushRejected(err) {
// ...
ctx.JSONError(flashError)
} else if errors.Is(err, user_model.ErrBlockedUser) {
// ...
ctx.JSONError(flashError)
} else if errors.Is(err, issues_model.ErrMustCollaborator) {
// ...
ctx.JSONError(flashError)
}
return
}
```

Not sure what kind of error can cause it to happen, so this PR just
expose it. And we can fix it when users report that creating PRs failed
with error responses.

It's all my guess since I cannot reproduce the problem, but even if it's
not related, the code here needs to be improved.

routers/web/repo/pull.go

index 9531482bee76e19e2f71bac8a439288cd5dffadf..e001e872aa8afde67ce277c7410c9469217f825e 100644 (file)
@@ -1308,9 +1308,10 @@ func CompareAndPullRequestPost(ctx *context.Context) {
        // instead of 500.
 
        if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs); err != nil {
-               if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
+               switch {
+               case repo_model.IsErrUserDoesNotHaveAccessToRepo(err):
                        ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
-               } else if git.IsErrPushRejected(err) {
+               case git.IsErrPushRejected(err):
                        pushrejErr := err.(*git.ErrPushRejected)
                        message := pushrejErr.Message
                        if len(message) == 0 {
@@ -1327,7 +1328,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
                                return
                        }
                        ctx.JSONError(flashError)
-               } else if errors.Is(err, user_model.ErrBlockedUser) {
+               case errors.Is(err, user_model.ErrBlockedUser):
                        flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
                                "Message": ctx.Tr("repo.pulls.push_rejected"),
                                "Summary": ctx.Tr("repo.pulls.new.blocked_user"),
@@ -1337,7 +1338,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
                                return
                        }
                        ctx.JSONError(flashError)
-               } else if errors.Is(err, issues_model.ErrMustCollaborator) {
+               case errors.Is(err, issues_model.ErrMustCollaborator):
                        flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
                                "Message": ctx.Tr("repo.pulls.push_rejected"),
                                "Summary": ctx.Tr("repo.pulls.new.must_collaborator"),
@@ -1347,6 +1348,11 @@ func CompareAndPullRequestPost(ctx *context.Context) {
                                return
                        }
                        ctx.JSONError(flashError)
+               default:
+                       // It's an unexpected error.
+                       // If it happens, we should add another case to handle it.
+                       log.Error("Unexpected error of NewPullRequest: %T %s", err, err)
+                       ctx.ServerError("CompareAndPullRequest", err)
                }
                return
        }