Skip to content

Commit

Permalink
SECURITY: protect DeleteFilePost et al with cleanUploadFileName (#5631)…
Browse files Browse the repository at this point in the history
… (#5635)

This commit wraps more of the TreePaths with cleanUploadFileName

Signed-off-by: Andrew Thornton <[email protected]>
  • Loading branch information
zeripath authored and jonasfranz committed Jan 4, 2019
1 parent 14e218c commit 3ee3a4b
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions routers/repo/editor.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,11 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo
branchName = form.NewBranchName
}

form.TreePath = strings.Trim(path.Clean("/"+form.TreePath), " /")
form.TreePath = cleanUploadFileName(form.TreePath)
if len(form.TreePath) == 0 {
ctx.Error(500, "Upload file name is invalid")
return
}
treeNames, treePaths := getParentTreeFields(form.TreePath)

ctx.Data["TreePath"] = form.TreePath
Expand Down Expand Up @@ -373,6 +377,13 @@ func DeleteFile(ctx *context.Context) {
func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) {
ctx.Data["PageIsDelete"] = true
ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()

ctx.Repo.TreePath = cleanUploadFileName(ctx.Repo.TreePath)
if len(ctx.Repo.TreePath) == 0 {
ctx.Error(500, "Delete file name is invalid")
return
}

ctx.Data["TreePath"] = ctx.Repo.TreePath
canCommit := renderCommitRights(ctx)

Expand Down Expand Up @@ -477,7 +488,12 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) {
branchName = form.NewBranchName
}

form.TreePath = strings.Trim(path.Clean("/"+form.TreePath), " /")
form.TreePath = cleanUploadFileName(form.TreePath)
if len(form.TreePath) == 0 {
ctx.Error(500, "Upload file name is invalid")
return
}

treeNames, treePaths := getParentTreeFields(form.TreePath)
if len(treeNames) == 0 {
// We must at least have one element for user to input.
Expand Down

0 comments on commit 3ee3a4b

Please sign in to comment.