From 2d58fd163fe0ff794f58b3bd6c16d6202afc12e6 Mon Sep 17 00:00:00 2001 From: 1135 <19515911+1135@users.noreply.github.com> Date: Mon, 30 May 2022 19:14:41 +0800 Subject: [PATCH] repo_editor: prohibits uploading files to `.git.` directory (#6970) Co-authored-by: Joe Chen --- internal/db/repo_editor.go | 6 +++++- internal/db/repo_editor_test.go | 26 ++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/internal/db/repo_editor.go b/internal/db/repo_editor.go index cfd37451b..2df7a80db 100644 --- a/internal/db/repo_editor.go +++ b/internal/db/repo_editor.go @@ -454,7 +454,11 @@ type UploadRepoFileOptions struct { // isRepositoryGitPath returns true if given path is or resides inside ".git" // path of the repository. func isRepositoryGitPath(path string) bool { - return strings.HasSuffix(path, ".git") || strings.Contains(path, ".git"+string(os.PathSeparator)) + return strings.HasSuffix(path, ".git") || + strings.Contains(path, ".git"+string(os.PathSeparator)) || + // Windows treats ".git." the same as ".git" + strings.HasSuffix(path, ".git.") || + strings.Contains(path, ".git."+string(os.PathSeparator)) } func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions) error { diff --git a/internal/db/repo_editor_test.go b/internal/db/repo_editor_test.go index 1b7d2265c..ea2bf7a92 100644 --- a/internal/db/repo_editor_test.go +++ b/internal/db/repo_editor_test.go @@ -13,21 +13,27 @@ import ( func Test_isRepositoryGitPath(t *testing.T) { tests := []struct { - path string - expVal bool + path string + wantVal bool }{ - {path: filepath.Join(".", ".git"), expVal: true}, - {path: filepath.Join(".", ".git", ""), expVal: true}, - {path: filepath.Join(".", ".git", "hooks", "pre-commit"), expVal: true}, - {path: filepath.Join(".git", "hooks"), expVal: true}, - {path: filepath.Join("dir", ".git"), expVal: true}, + {path: filepath.Join(".", ".git"), wantVal: true}, + {path: filepath.Join(".", ".git", ""), wantVal: true}, + {path: filepath.Join(".", ".git", "hooks", "pre-commit"), wantVal: true}, + {path: filepath.Join(".git", "hooks"), wantVal: true}, + {path: filepath.Join("dir", ".git"), wantVal: true}, - {path: filepath.Join(".gitignore"), expVal: false}, - {path: filepath.Join("dir", ".gitkeep"), expVal: false}, + {path: filepath.Join(".", ".git."), wantVal: true}, + {path: filepath.Join(".", ".git.", ""), wantVal: true}, + {path: filepath.Join(".", ".git.", "hooks", "pre-commit"), wantVal: true}, + {path: filepath.Join(".git.", "hooks"), wantVal: true}, + {path: filepath.Join("dir", ".git."), wantVal: true}, + + {path: filepath.Join(".gitignore"), wantVal: false}, + {path: filepath.Join("dir", ".gitkeep"), wantVal: false}, } for _, test := range tests { t.Run("", func(t *testing.T) { - assert.Equal(t, test.expVal, isRepositoryGitPath(test.path)) + assert.Equal(t, test.wantVal, isRepositoryGitPath(test.path)) }) } }