diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-03-08 20:17:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-08 20:17:39 +0800 |
| commit | b116418f05b822481bba3613873eef876da73814 (patch) | |
| tree | 65d1d88d940c26029e7ef920c4dd30761763ce46 /modules/storage | |
| parent | 090e75392385041b3abb30d02564962a3ff687f6 (diff) | |
| download | gitea-b116418f05b822481bba3613873eef876da73814.tar.gz gitea-b116418f05b822481bba3613873eef876da73814.zip | |
Use CleanPath instead of path.Clean (#23371)
As title.
Diffstat (limited to 'modules/storage')
| -rw-r--r-- | modules/storage/local.go | 3 | ||||
| -rw-r--r-- | modules/storage/minio.go | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/storage/local.go b/modules/storage/local.go index a6a9d54a8c..05bf1fb28a 100644 --- a/modules/storage/local.go +++ b/modules/storage/local.go @@ -8,7 +8,6 @@ import ( "io" "net/url" "os" - "path" "path/filepath" "strings" @@ -59,7 +58,7 @@ func NewLocalStorage(ctx context.Context, cfg interface{}) (ObjectStorage, error } func (l *LocalStorage) buildLocalPath(p string) string { - return filepath.Join(l.dir, path.Clean("/" + strings.ReplaceAll(p, "\\", "/"))[1:]) + return filepath.Join(l.dir, util.CleanPath(strings.ReplaceAll(p, "\\", "/"))) } // Open a file diff --git a/modules/storage/minio.go b/modules/storage/minio.go index c427d8d7e3..24da14b634 100644 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -15,6 +15,7 @@ import ( "time" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" @@ -120,7 +121,7 @@ func NewMinioStorage(ctx context.Context, cfg interface{}) (ObjectStorage, error } func (m *MinioStorage) buildMinioPath(p string) string { - return strings.TrimPrefix(path.Join(m.basePath, path.Clean("/" + strings.ReplaceAll(p, "\\", "/"))[1:]), "/") + return strings.TrimPrefix(path.Join(m.basePath, util.CleanPath(strings.ReplaceAll(p, "\\", "/"))), "/") } // Open open a file |