diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-03-22 04:02:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-21 16:02:49 -0400 |
| commit | ce9dee5a1e8ae670c97621bca409d8cf43a90102 (patch) | |
| tree | 6c9d8922dfae4bdcc1785340f2a866f805259988 /routers/web/repo/editor.go | |
| parent | 253a00aaac6b17346927e42c709f3f96672caaf3 (diff) | |
| download | gitea-ce9dee5a1e8ae670c97621bca409d8cf43a90102.tar.gz gitea-ce9dee5a1e8ae670c97621bca409d8cf43a90102.zip | |
Introduce path Clean/Join helper functions (#23495)
Since #23493 has conflicts with latest commits, this PR is my proposal
for fixing #23371
Details are in the comments
And refactor the `modules/options` module, to make it always use
"filepath" to access local files.
Benefits:
* No need to do `util.CleanPath(strings.ReplaceAll(p, "\\", "/"))),
"/")` any more (not only one before)
* The function behaviors are clearly defined
Diffstat (limited to 'routers/web/repo/editor.go')
| -rw-r--r-- | routers/web/repo/editor.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 4f208098e4..07241b8870 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -726,7 +726,7 @@ func UploadFilePost(ctx *context.Context) { func cleanUploadFileName(name string) string { // Rebase the filename - name = strings.Trim(util.CleanPath(name), "/") + name = util.PathJoinRel(name) // Git disallows any filenames to have a .git directory in them. for _, part := range strings.Split(name, "/") { if strings.ToLower(part) == ".git" { |