sungmg/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-29 20:53:10 +00:00
Code Activity

Stop trimming preceding and suffixing spaces from editor filenames (#18334)

Browse source 
* Stop trimming preceding and suffixing spaces from editor filenames

In #5702 it was decided to trim preceding and suffixed spaces aswell as / from
editing file filenames. This was because at this point in time the url-safety of
Gitea was much poorer.

We can now drop this requirement and file editing should work correctly.

Fix #18176

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2022-01-19 21:03:15 +00:00 committed by GitHub
parent c68f1281f6
commit 6b0a71230d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -228,6 +228,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
* Add left padding for chunk header of split diff view (#13397) * Add left padding for chunk header of split diff view (#13397)
* Allow U2F 2FA without TOTP (#11573) * Allow U2F 2FA without TOTP (#11573)
* BUGFIXES * BUGFIXES
* Stop trimming preceding and suffixing spaces from editor filenames (#18334)
* Restore propagation of ErrDependenciesLeft (#18325) * Restore propagation of ErrDependenciesLeft (#18325)
* Fix PR comments UI (#18323) * Fix PR comments UI (#18323)
* Use indirect comparison when showing pull requests (#18313) * Use indirect comparison when showing pull requests (#18313)

2
routers/web/repo/editor.go
View file

@ -728,7 +728,7 @@ func UploadFilePost(ctx *context.Context) {
func cleanUploadFileName(name string) string { func cleanUploadFileName(name string) string {
// Rebase the filename // Rebase the filename
name = strings.Trim(path.Clean("/"+name), " /") name = strings.Trim(path.Clean("/"+name), "/")
// Git disallows any filenames to have a .git directory in them. // Git disallows any filenames to have a .git directory in them.
for _, part := range strings.Split(name, "/") { for _, part := range strings.Split(name, "/") {
if strings.ToLower(part) == ".git" { if strings.ToLower(part) == ".git" {

2
services/repository/files/file.go
View file

@ -129,7 +129,7 @@ func GetAuthorAndCommitterUsers(author, committer *IdentityOptions, doer *user_m
// CleanUploadFileName Trims a filename and returns empty string if it is a .git directory // CleanUploadFileName Trims a filename and returns empty string if it is a .git directory
func CleanUploadFileName(name string) string { func CleanUploadFileName(name string) string {
// Rebase the filename // Rebase the filename
name = strings.Trim(path.Clean("/"+name), " /") name = strings.Trim(path.Clean("/"+name), "/")
// Git disallows any filenames to have a .git directory in them. // Git disallows any filenames to have a .git directory in them.
for _, part := range strings.Split(name, "/") { for _, part := range strings.Split(name, "/") {
if strings.ToLower(part) == ".git" { if strings.ToLower(part) == ".git" {