mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 08:47:42 -05:00
8eb1cd9264
Adds a feature [like GitHub has](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) (step 7). If you create a new PR from a forked repo, you can select (and change later, but only if you are the PR creator/poster) the "Allow edits from maintainers" option. Then users with write access to the base branch get more permissions on this branch: * use the update pull request button * push directly from the command line (`git push`) * edit/delete/upload files via web UI * use related API endpoints You can't merge PRs to this branch with this enabled, you'll need "full" code write permissions. This feature has a pretty big impact on the permission system. I might forgot changing some things or didn't find security vulnerabilities. In this case, please leave a review or comment on this PR. Closes #17728 Co-authored-by: 6543 <6543@obermui.de>
107 lines
3 KiB
Go
107 lines
3 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package repo
|
|
|
|
import (
|
|
"net/http"
|
|
"time"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/git"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
"code.gitea.io/gitea/modules/web"
|
|
"code.gitea.io/gitea/services/repository/files"
|
|
)
|
|
|
|
// ApplyDiffPatch handles API call for applying a patch
|
|
func ApplyDiffPatch(ctx *context.APIContext) {
|
|
// swagger:operation POST /repos/{owner}/{repo}/diffpatch repository repoApplyDiffPatch
|
|
// ---
|
|
// summary: Apply diff patch to repository
|
|
// consumes:
|
|
// - application/json
|
|
// produces:
|
|
// - application/json
|
|
// parameters:
|
|
// - name: owner
|
|
// in: path
|
|
// description: owner of the repo
|
|
// type: string
|
|
// required: true
|
|
// - name: repo
|
|
// in: path
|
|
// description: name of the repo
|
|
// type: string
|
|
// required: true
|
|
// - name: body
|
|
// in: body
|
|
// required: true
|
|
// schema:
|
|
// "$ref": "#/definitions/UpdateFileOptions"
|
|
// responses:
|
|
// "200":
|
|
// "$ref": "#/responses/FileResponse"
|
|
apiOpts := web.GetForm(ctx).(*api.ApplyDiffPatchFileOptions)
|
|
|
|
opts := &files.ApplyDiffPatchOptions{
|
|
Content: apiOpts.Content,
|
|
SHA: apiOpts.SHA,
|
|
Message: apiOpts.Message,
|
|
OldBranch: apiOpts.BranchName,
|
|
NewBranch: apiOpts.NewBranchName,
|
|
Committer: &files.IdentityOptions{
|
|
Name: apiOpts.Committer.Name,
|
|
Email: apiOpts.Committer.Email,
|
|
},
|
|
Author: &files.IdentityOptions{
|
|
Name: apiOpts.Author.Name,
|
|
Email: apiOpts.Author.Email,
|
|
},
|
|
Dates: &files.CommitDateOptions{
|
|
Author: apiOpts.Dates.Author,
|
|
Committer: apiOpts.Dates.Committer,
|
|
},
|
|
Signoff: apiOpts.Signoff,
|
|
}
|
|
if opts.Dates.Author.IsZero() {
|
|
opts.Dates.Author = time.Now()
|
|
}
|
|
if opts.Dates.Committer.IsZero() {
|
|
opts.Dates.Committer = time.Now()
|
|
}
|
|
|
|
if opts.Message == "" {
|
|
opts.Message = "apply-patch"
|
|
}
|
|
|
|
if !canWriteFiles(ctx, apiOpts.BranchName) {
|
|
ctx.Error(http.StatusInternalServerError, "ApplyPatch", models.ErrUserDoesNotHaveAccessToRepo{
|
|
UserID: ctx.Doer.ID,
|
|
RepoName: ctx.Repo.Repository.LowerName,
|
|
})
|
|
return
|
|
}
|
|
|
|
fileResponse, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, opts)
|
|
if err != nil {
|
|
if models.IsErrUserCannotCommit(err) || models.IsErrFilePathProtected(err) {
|
|
ctx.Error(http.StatusForbidden, "Access", err)
|
|
return
|
|
}
|
|
if models.IsErrBranchAlreadyExists(err) || models.IsErrFilenameInvalid(err) || models.IsErrSHADoesNotMatch(err) ||
|
|
models.IsErrFilePathInvalid(err) || models.IsErrRepoFileAlreadyExists(err) {
|
|
ctx.Error(http.StatusUnprocessableEntity, "Invalid", err)
|
|
return
|
|
}
|
|
if models.IsErrBranchDoesNotExist(err) || git.IsErrBranchNotExist(err) {
|
|
ctx.Error(http.StatusNotFound, "BranchDoesNotExist", err)
|
|
return
|
|
}
|
|
ctx.Error(http.StatusInternalServerError, "ApplyPatch", err)
|
|
} else {
|
|
ctx.JSON(http.StatusCreated, fileResponse)
|
|
}
|
|
}
|