mirror
/
gitea
mirror of https://github.com/go-gitea/gitea
2
0
Fork 0
Code Issues Releases Wiki Activity

Re-attempt to delete temporary upload if the file is locked by another process (#12447)

Browse Source 
Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util.

Fix #12339

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
pull/12474/head
zeripath 4 years ago committed by GitHub
parent faa676cc8b
commit 74bd9691c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 304 additions and 202 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      build/generate-gitignores.go
  2. 4
      build/generate-licenses.go
  3. 3
      cmd/doctor.go
  4. 9
      cmd/dump.go
  5. 19
      contrib/pr/checkout.go
  6. 6
      integrations/api_repo_test.go
  7. 3
      integrations/create_no_session_test.go
  8. 5
      integrations/git_helper_for_declarative_test.go
  9. 10
      integrations/git_test.go
  10. 3
      integrations/gpg_git_test.go
  11. 13
      integrations/integration_test.go
  12. 5
      integrations/migration-test/migration_test.go
  13. 14
      integrations/ssh_key_test.go
  14. 4
      models/admin.go
  15. 3
      models/attachment.go
  16. 3
      models/helper_directory.go
  17. 4
      models/migrations/v112.go
  18. 5
      models/migrations/v115.go
  19. 4
      models/migrations/v96.go
  20. 6
      models/org.go
  21. 12
      models/repo.go
  22. 17
      models/ssh_key.go
  23. 28
      models/unit_tests.go
  24. 3
      models/upload.go
  25. 6
      models/user.go
  26. 3
      modules/git/commit_info_test.go
  27. 5
      modules/git/hook.go
  28. 4
      modules/git/repo_compare_test.go
  29. 6
      modules/git/repo_tag_test.go
  30. 3
      modules/graceful/net_unix.go
  31. 5
      modules/indexer/code/bleve.go
  32. 4
      modules/indexer/code/bleve_test.go
  33. 5
      modules/indexer/issues/bleve.go
  34. 4
      modules/indexer/issues/bleve_test.go
  35. 4
      modules/indexer/issues/indexer_test.go
  36. 7
      modules/lfs/content_store.go
  37. 8
      modules/log/file.go
  38. 9
      modules/log/file_test.go
  39. 8
      modules/markup/external/external.go
  40. 4
      modules/queue/queue_disk_channel_test.go
  41. 4
      modules/queue/queue_disk_test.go
  42. 4
      modules/repository/create.go
  43. 7
      modules/repository/generate.go
  44. 5
      modules/repository/hooks.go
  45. 8
      modules/repository/init.go
  46. 8
      modules/repository/repo.go
  47. 57
      modules/util/remove.go
  48. 3
      modules/util/sanitize.go
  49. 18
      modules/util/url.go
  50. 35
      modules/util/util_test.go
  51. 3
      routers/repo/http.go
  52. 4
      routers/repo/lfs.go
  53. 4
      routers/repo/settings_test.go
  54. 6
      routers/user/auth.go
  55. 16
      routers/utils/utils.go
  56. 34
      routers/utils/utils_test.go
  57. 7
      services/pull/check.go
  58. 3
      services/pull/patch.go
  59. 4
      services/pull/pull.go
  60. 4
      services/release/release.go

4
build/generate-gitignores.go
Unescape View File

@ -15,6 +15,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"strings" "strings"
"code.gitea.io/gitea/modules/util"
) )
func main() { func main() {
@ -33,7 +35,7 @@ func main() {
log.Fatalf("Failed to create temp file. %s", err) log.Fatalf("Failed to create temp file. %s", err)
} }
defer os.Remove(file.Name()) defer util.Remove(file.Name())
resp, err := http.Get(url) resp, err := http.Get(url)

4
build/generate-licenses.go
Unescape View File

@ -15,6 +15,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"strings" "strings"
"code.gitea.io/gitea/modules/util"
) )
func main() { func main() {
@ -33,7 +35,7 @@ func main() {
log.Fatalf("Failed to create temp file. %s", err) log.Fatalf("Failed to create temp file. %s", err)
} }
defer os.Remove(file.Name()) defer util.Remove(file.Name())
resp, err := http.Get(url) resp, err := http.Get(url)

3
cmd/doctor.go
Unescape View File

@ -24,6 +24,7 @@ import (
"code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/options"
"code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"xorm.io/builder" "xorm.io/builder"
"github.com/urfave/cli" "github.com/urfave/cli"
@ -312,7 +313,7 @@ func runDoctorWritableDir(path string) error {
if err != nil { if err != nil {
return err return err
} }
if err := os.Remove(tmpFile.Name()); err != nil { if err := util.Remove(tmpFile.Name()); err != nil {
fmt.Printf("Warning: can't remove temporary file: '%s'\n", tmpFile.Name()) fmt.Printf("Warning: can't remove temporary file: '%s'\n", tmpFile.Name())
} }
tmpFile.Close() tmpFile.Close()

9
cmd/dump.go
Unescape View File

@ -18,6 +18,7 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"gitea.com/macaron/session" "gitea.com/macaron/session"
archiver "github.com/mholt/archiver/v3" archiver "github.com/mholt/archiver/v3"
@ -243,7 +244,11 @@ func runDump(ctx *cli.Context) error {
if err != nil { if err != nil {
fatal("Failed to create tmp file: %v", err) fatal("Failed to create tmp file: %v", err)
} }
defer os.Remove(dbDump.Name()) defer func() {
if err := util.Remove(dbDump.Name()); err != nil {
log.Warn("Unable to remove temporary file: %s: Error: %v", dbDump.Name(), err)
}
}()
targetDBType := ctx.String("database") targetDBType := ctx.String("database")
if len(targetDBType) > 0 && targetDBType != setting.Database.Type { if len(targetDBType) > 0 && targetDBType != setting.Database.Type {
@ -313,7 +318,7 @@ func runDump(ctx *cli.Context) error {
if fileName != "-" { if fileName != "-" {
if err = w.Close(); err != nil { if err = w.Close(); err != nil {
_ = os.Remove(fileName) _ = util.Remove(fileName)
fatal("Failed to save %s: %v", fileName, err) fatal("Failed to save %s: %v", fileName, err)
} }

19
contrib/pr/checkout.go
Unescape View File

@ -29,6 +29,7 @@ import (
"code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/external" "code.gitea.io/gitea/modules/markup/external"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers"
"code.gitea.io/gitea/routers/routes" "code.gitea.io/gitea/routers/routes"
@ -108,8 +109,8 @@ func runPR() {
os.Exit(1) os.Exit(1)
} }
models.LoadFixtures() models.LoadFixtures()
os.RemoveAll(setting.RepoRootPath) util.RemoveAll(setting.RepoRootPath)
os.RemoveAll(models.LocalCopyPath()) util.RemoveAll(models.LocalCopyPath())
com.CopyDir(path.Join(curDir, "integrations/gitea-repositories-meta"), setting.RepoRootPath) com.CopyDir(path.Join(curDir, "integrations/gitea-repositories-meta"), setting.RepoRootPath)
log.Printf("[PR] Setting up router\n") log.Printf("[PR] Setting up router\n")
@ -141,20 +142,20 @@ func runPR() {
log.Printf("[PR] Cleaning up ...\n") log.Printf("[PR] Cleaning up ...\n")
/* /*
if err = os.RemoveAll(setting.Indexer.IssuePath); err != nil { if err = util.RemoveAll(setting.Indexer.IssuePath); err != nil {
fmt.Printf("os.RemoveAll: %v\n", err) fmt.Printf("util.RemoveAll: %v\n", err)
os.Exit(1) os.Exit(1)
} }
if err = os.RemoveAll(setting.Indexer.RepoPath); err != nil { if err = util.RemoveAll(setting.Indexer.RepoPath); err != nil {
fmt.Printf("Unable to remove repo indexer: %v\n", err) fmt.Printf("Unable to remove repo indexer: %v\n", err)
os.Exit(1) os.Exit(1)
} }
*/ */
if err = os.RemoveAll(setting.RepoRootPath); err != nil { if err = util.RemoveAll(setting.RepoRootPath); err != nil {
log.Fatalf("os.RemoveAll: %v\n", err) log.Fatalf("util.RemoveAll: %v\n", err)
} }
if err = os.RemoveAll(setting.AppDataPath); err != nil { if err = util.RemoveAll(setting.AppDataPath); err != nil {
log.Fatalf("os.RemoveAll: %v\n", err) log.Fatalf("util.RemoveAll: %v\n", err)
} }
} }

6
integrations/api_repo_test.go
Unescape View File

@ -9,12 +9,12 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"os"
"testing" "testing"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -341,7 +341,7 @@ func testAPIRepoMigrateConflict(t *testing.T, u *url.URL) {
httpContext.Reponame = "repo-tmp-17" httpContext.Reponame = "repo-tmp-17"
dstPath, err := ioutil.TempDir("", httpContext.Reponame) dstPath, err := ioutil.TempDir("", httpContext.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
t.Run("CreateRepo", doAPICreateRepository(httpContext, false)) t.Run("CreateRepo", doAPICreateRepository(httpContext, false))
user, err := models.GetUserByName(httpContext.Username) user, err := models.GetUserByName(httpContext.Username)
@ -404,7 +404,7 @@ func testAPIRepoCreateConflict(t *testing.T, u *url.URL) {
httpContext.Reponame = "repo-tmp-17" httpContext.Reponame = "repo-tmp-17"
dstPath, err := ioutil.TempDir("", httpContext.Reponame) dstPath, err := ioutil.TempDir("", httpContext.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
t.Run("CreateRepo", doAPICreateRepository(httpContext, false)) t.Run("CreateRepo", doAPICreateRepository(httpContext, false))
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos?token="+httpContext.Token, req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos?token="+httpContext.Token,

3
integrations/create_no_session_test.go
Unescape View File

@ -14,6 +14,7 @@ import (
"testing" "testing"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/routers/routes" "code.gitea.io/gitea/routers/routes"
"gitea.com/macaron/session" "gitea.com/macaron/session"
@ -72,7 +73,7 @@ func TestSessionFileCreation(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
defer func() { defer func() {
if _, err := os.Stat(tmpDir); !os.IsNotExist(err) { if _, err := os.Stat(tmpDir); !os.IsNotExist(err) {
_ = os.RemoveAll(tmpDir) _ = util.RemoveAll(tmpDir)
} }
}() }()
config.ProviderConfig = tmpDir config.ProviderConfig = tmpDir

5
integrations/git_helper_for_declarative_test.go
Unescape View File

@ -21,6 +21,7 @@ import (
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/ssh" "code.gitea.io/gitea/modules/ssh"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/unknwon/com" "github.com/unknwon/com"
@ -30,7 +31,7 @@ func withKeyFile(t *testing.T, keyname string, callback func(string)) {
tmpDir, err := ioutil.TempDir("", "key-file") tmpDir, err := ioutil.TempDir("", "key-file")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
err = os.Chmod(tmpDir, 0700) err = os.Chmod(tmpDir, 0700)
assert.NoError(t, err) assert.NoError(t, err)
@ -119,7 +120,7 @@ func doGitCloneFail(u *url.URL) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "doGitCloneFail") tmpDir, err := ioutil.TempDir("", "doGitCloneFail")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
assert.Error(t, git.Clone(u.String(), tmpDir, git.CloneRepoOptions{})) assert.Error(t, git.Clone(u.String(), tmpDir, git.CloneRepoOptions{}))
assert.False(t, com.IsExist(filepath.Join(tmpDir, "README.md"))) assert.False(t, com.IsExist(filepath.Join(tmpDir, "README.md")))
} }

10
integrations/git_test.go
Unescape View File

@ -10,7 +10,6 @@ import (
"math/rand" "math/rand"
"net/http" "net/http"
"net/url" "net/url"
"os"
"path" "path"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -21,6 +20,7 @@ import (
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -51,7 +51,7 @@ func testGit(t *testing.T, u *url.URL) {
dstPath, err := ioutil.TempDir("", httpContext.Reponame) dstPath, err := ioutil.TempDir("", httpContext.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, false)) t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, false))
t.Run("AddUserAsCollaborator", doAPIAddCollaborator(forkedUserCtx, httpContext.Username, models.AccessModeRead)) t.Run("AddUserAsCollaborator", doAPIAddCollaborator(forkedUserCtx, httpContext.Username, models.AccessModeRead))
@ -99,7 +99,7 @@ func testGit(t *testing.T, u *url.URL) {
//Setup clone folder //Setup clone folder
dstPath, err := ioutil.TempDir("", sshContext.Reponame) dstPath, err := ioutil.TempDir("", sshContext.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
t.Run("Clone", doGitClone(dstPath, sshURL)) t.Run("Clone", doGitClone(dstPath, sshURL))
@ -124,7 +124,7 @@ func testGit(t *testing.T, u *url.URL) {
func ensureAnonymousClone(t *testing.T, u *url.URL) { func ensureAnonymousClone(t *testing.T, u *url.URL) {
dstLocalPath, err := ioutil.TempDir("", "repo1") dstLocalPath, err := ioutil.TempDir("", "repo1")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstLocalPath) defer util.RemoveAll(dstLocalPath)
t.Run("CloneAnonymous", doGitClone(dstLocalPath, u)) t.Run("CloneAnonymous", doGitClone(dstLocalPath, u))
} }
@ -498,7 +498,7 @@ func doPushCreate(ctx APITestContext, u *url.URL) func(t *testing.T) {
// Create a temporary directory // Create a temporary directory
tmpDir, err := ioutil.TempDir("", ctx.Reponame) tmpDir, err := ioutil.TempDir("", ctx.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
// Now create local repository to push as our test and set its origin // Now create local repository to push as our test and set its origin
t.Run("InitTestRepository", doGitInitTestRepository(tmpDir)) t.Run("InitTestRepository", doGitInitTestRepository(tmpDir))

3
integrations/gpg_git_test.go
Unescape View File

@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/armor" "golang.org/x/crypto/openpgp/armor"
@ -28,7 +29,7 @@ func TestGPGGit(t *testing.T) {
// OK Set a new GPG home // OK Set a new GPG home
tmpDir, err := ioutil.TempDir("", "temp-gpg") tmpDir, err := ioutil.TempDir("", "temp-gpg")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
err = os.Chmod(tmpDir, 0700) err = os.Chmod(tmpDir, 0700)
assert.NoError(t, err) assert.NoError(t, err)

13
integrations/integration_test.go
Unescape View File

@ -29,6 +29,7 @@ import (
"code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/queue" "code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers"
"code.gitea.io/gitea/routers/routes" "code.gitea.io/gitea/routers/routes"
@ -98,11 +99,11 @@ func TestMain(m *testing.M) {
writerCloser.t = nil writerCloser.t = nil
if err = os.RemoveAll(setting.Indexer.IssuePath); err != nil { if err = util.RemoveAll(setting.Indexer.IssuePath); err != nil {
fmt.Printf("os.RemoveAll: %v\n", err) fmt.Printf("util.RemoveAll: %v\n", err)
os.Exit(1) os.Exit(1)
} }
if err = os.RemoveAll(setting.Indexer.RepoPath); err != nil { if err = util.RemoveAll(setting.Indexer.RepoPath); err != nil {
fmt.Printf("Unable to remove repo indexer: %v\n", err) fmt.Printf("Unable to remove repo indexer: %v\n", err)
os.Exit(1) os.Exit(1)
} }
@ -138,7 +139,7 @@ func initIntegrationTest() {
setting.SetCustomPathAndConf("", "", "") setting.SetCustomPathAndConf("", "", "")
setting.NewContext() setting.NewContext()
os.RemoveAll(models.LocalCopyPath()) util.RemoveAll(models.LocalCopyPath())
setting.CheckLFSVersion() setting.CheckLFSVersion()
setting.InitDBConfig() setting.InitDBConfig()
@ -230,7 +231,7 @@ func prepareTestEnv(t testing.TB, skip ...int) func() {
} }
deferFn := PrintCurrentTest(t, ourSkip) deferFn := PrintCurrentTest(t, ourSkip)
assert.NoError(t, models.LoadFixtures()) assert.NoError(t, models.LoadFixtures())
assert.NoError(t, os.RemoveAll(setting.RepoRootPath)) assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"),
setting.RepoRootPath)) setting.RepoRootPath))
@ -473,7 +474,7 @@ func GetCSRF(t testing.TB, session *TestSession, urlStr string) string {
func resetFixtures(t *testing.T) { func resetFixtures(t *testing.T) {
assert.NoError(t, queue.GetManager().FlushAll(context.Background(), -1)) assert.NoError(t, queue.GetManager().FlushAll(context.Background(), -1))
assert.NoError(t, models.LoadFixtures()) assert.NoError(t, models.LoadFixtures())
assert.NoError(t, os.RemoveAll(setting.RepoRootPath)) assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"),
setting.RepoRootPath)) setting.RepoRootPath))
} }

5
integrations/migration-test/migration_test.go
Unescape View File

@ -24,6 +24,7 @@ import (
"code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/charset" "code.gitea.io/gitea/modules/charset"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/unknwon/com" "github.com/unknwon/com"
@ -58,7 +59,7 @@ func initMigrationTest(t *testing.T) func() {
setting.NewContext() setting.NewContext()
assert.True(t, len(setting.RepoRootPath) != 0) assert.True(t, len(setting.RepoRootPath) != 0)
assert.NoError(t, os.RemoveAll(setting.RepoRootPath)) assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath))
setting.CheckLFSVersion() setting.CheckLFSVersion()
@ -129,7 +130,7 @@ func restoreOldDB(t *testing.T, version string) bool {
switch { switch {
case setting.Database.UseSQLite3: case setting.Database.UseSQLite3:
os.Remove(setting.Database.Path) util.Remove(setting.Database.Path)
err := os.MkdirAll(path.Dir(setting.Database.Path), os.ModePerm) err := os.MkdirAll(path.Dir(setting.Database.Path), os.ModePerm)
assert.NoError(t, err) assert.NoError(t, err)

14
integrations/ssh_key_test.go
Unescape View File

@ -9,13 +9,13 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"os"
"path/filepath" "path/filepath"
"testing" "testing"
"time" "time"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -63,7 +63,7 @@ func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) {
// Setup the testing repository // Setup the testing repository
dstPath, err := ioutil.TempDir("", "repo-tmp-deploy-key-empty-repo-1") dstPath, err := ioutil.TempDir("", "repo-tmp-deploy-key-empty-repo-1")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
t.Run("InitTestRepository", doGitInitTestRepository(dstPath)) t.Run("InitTestRepository", doGitInitTestRepository(dstPath))
@ -109,7 +109,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
t.Run("KeyCanOnlyBeUser", func(t *testing.T) { t.Run("KeyCanOnlyBeUser", func(t *testing.T) {
dstPath, err := ioutil.TempDir("", ctx.Reponame) dstPath, err := ioutil.TempDir("", ctx.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
sshURL := createSSHUrl(ctx.GitPath(), u) sshURL := createSSHUrl(ctx.GitPath(), u)
@ -135,7 +135,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
t.Run("KeyCanBeAnyDeployButNotUserAswell", func(t *testing.T) { t.Run("KeyCanBeAnyDeployButNotUserAswell", func(t *testing.T) {
dstPath, err := ioutil.TempDir("", ctx.Reponame) dstPath, err := ioutil.TempDir("", ctx.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
sshURL := createSSHUrl(ctx.GitPath(), u) sshURL := createSSHUrl(ctx.GitPath(), u)
@ -153,7 +153,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
otherSSHURL := createSSHUrl(otherCtx.GitPath(), u) otherSSHURL := createSSHUrl(otherCtx.GitPath(), u)
dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame) dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstOtherPath) defer util.RemoveAll(dstOtherPath)
t.Run("AddWriterDeployKeyToOther", doAPICreateDeployKey(otherCtx, keyname, keyFile, false)) t.Run("AddWriterDeployKeyToOther", doAPICreateDeployKey(otherCtx, keyname, keyFile, false))
@ -170,7 +170,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
otherSSHURL := createSSHUrl(otherCtx.GitPath(), u) otherSSHURL := createSSHUrl(otherCtx.GitPath(), u)
dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame) dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstOtherPath) defer util.RemoveAll(dstOtherPath)
t.Run("DeleteRepository", doAPIDeleteRepository(ctx)) t.Run("DeleteRepository", doAPIDeleteRepository(ctx))
@ -192,7 +192,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
dstPath, err := ioutil.TempDir("", ctx.Reponame) dstPath, err := ioutil.TempDir("", ctx.Reponame)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dstPath) defer util.RemoveAll(dstPath)
sshURL := createSSHUrl(ctx.GitPath(), u) sshURL := createSSHUrl(ctx.GitPath(), u)

4
models/admin.go
Unescape View File

@ -6,10 +6,10 @@ package models
import ( import (
"fmt" "fmt"
"os"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/unknwon/com" "github.com/unknwon/com"
) )
@ -66,7 +66,7 @@ func RemoveAllWithNotice(title, path string) {
} }
func removeAllWithNotice(e Engine, title, path string) { func removeAllWithNotice(e Engine, title, path string) {
if err := os.RemoveAll(path); err != nil { if err := util.RemoveAll(path); err != nil {
desc := fmt.Sprintf("%s [%s]: %v", title, path, err) desc := fmt.Sprintf("%s [%s]: %v", title, path, err)
log.Warn(title+" [%s]: %v", path, err) log.Warn(title+" [%s]: %v", path, err)
if err = createNotice(e, NoticeRepository, desc); err != nil { if err = createNotice(e, NoticeRepository, desc); err != nil {

3
models/attachment.go
Unescape View File

@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
gouuid "github.com/google/uuid" gouuid "github.com/google/uuid"
"xorm.io/xorm" "xorm.io/xorm"
@ -237,7 +238,7 @@ func DeleteAttachments(attachments []*Attachment, remove bool) (int, error) {
if remove { if remove {
for i, a := range attachments { for i, a := range attachments {
if err := os.Remove(a.LocalPath()); err != nil { if err := util.Remove(a.LocalPath()); err != nil {
return i, err return i, err
} }
} }

3
models/helper_directory.go
Unescape View File

@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
) )
// LocalCopyPath returns the local repository temporary copy path. // LocalCopyPath returns the local repository temporary copy path.
@ -41,7 +42,7 @@ func CreateTemporaryPath(prefix string) (string, error) {
// RemoveTemporaryPath removes the temporary path // RemoveTemporaryPath removes the temporary path
func RemoveTemporaryPath(basePath string) error { func RemoveTemporaryPath(basePath string) error {
if _, err := os.Stat(basePath); !os.IsNotExist(err) { if _, err := os.Stat(basePath); !os.IsNotExist(err) {
return os.RemoveAll(basePath) return util.RemoveAll(basePath)
} }
return nil return nil
} }

4
models/migrations/v112.go
Unescape View File

@ -6,10 +6,10 @@ package migrations
import ( import (
"fmt" "fmt"
"os"
"path" "path"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"xorm.io/builder" "xorm.io/builder"
"xorm.io/xorm" "xorm.io/xorm"
@ -31,7 +31,7 @@ func removeAttachmentMissedRepo(x *xorm.Engine) error {
for i := 0; i < len(attachments); i++ { for i := 0; i < len(attachments); i++ {
uuid := attachments[i].UUID uuid := attachments[i].UUID
if err = os.RemoveAll(path.Join(setting.AttachmentPath, uuid[0:1], uuid[1:2], uuid)); err != nil { if err = util.RemoveAll(path.Join(setting.AttachmentPath, uuid[0:1], uuid[1:2], uuid)); err != nil {
fmt.Printf("Error: %v", err) fmt.Printf("Error: %v", err)
} }
} }

5
models/migrations/v115.go
Unescape View File

@ -15,6 +15,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"xorm.io/xorm" "xorm.io/xorm"
) )
@ -110,8 +111,8 @@ func renameExistingUserAvatarName(x *xorm.Engine) error {
log.Info("Deleting %d old avatars ...", deleteCount) log.Info("Deleting %d old avatars ...", deleteCount)
i := 0 i := 0
for file := range deleteList { for file := range deleteList {
if err := os.Remove(file); err != nil { if err := util.Remove(file); err != nil {
log.Warn("os.Remove: %v", err) log.Warn("util.Remove: %v", err)
} }
i++ i++
select { select {

4
models/migrations/v96.go
Unescape View File

@ -5,10 +5,10 @@
package migrations package migrations
import ( import (
"os"
"path" "path"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"xorm.io/xorm" "xorm.io/xorm"
) )
@ -58,7 +58,7 @@ func deleteOrphanedAttachments(x *xorm.Engine) error {
} }
for _, attachment := range attachements { for _, attachment := range attachements {
if err := os.RemoveAll(AttachmentLocalPath(attachment.UUID)); err != nil { if err := util.RemoveAll(AttachmentLocalPath(attachment.UUID)); err != nil {
return err return err
} }
} }

6
models/org.go
Unescape View File

@ -7,12 +7,12 @@ package models
import ( import (
"fmt" "fmt"
"os"
"strings" "strings"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
"github.com/unknwon/com" "github.com/unknwon/com"
"xorm.io/builder" "xorm.io/builder"
@ -305,14 +305,14 @@ func deleteOrg(e *xorm.Session, u *User) error {
// so just keep error logs of those operations. // so just keep error logs of those operations.
path := UserPath(u.Name) path := UserPath(u.Name)
if err := os.RemoveAll(path); err != nil { if err := util.RemoveAll(path); err != nil {
return fmt.Errorf("Failed to RemoveAll %s: %v", path, err) return fmt.Errorf("Failed to RemoveAll %s: %v", path, err)
} }
if len(u.Avatar) > 0 { if len(u.Avatar) > 0 {
avatarPath := u.CustomAvatarPath() avatarPath := u.CustomAvatarPath()
if com.IsExist(avatarPath) { if com.IsExist(avatarPath) {
if err := os.Remove(avatarPath); err != nil { if err := util.Remove(avatarPath); err != nil {
return fmt.Errorf("Failed to remove %s: %v", avatarPath, err) return fmt.Errorf("Failed to remove %s: %v", avatarPath, err)
} }
} }

12
models/repo.go
Unescape View File

@ -1440,7 +1440,7 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
// Create/Remove git-daemon-export-ok for git-daemon... // Create/Remove git-daemon-export-ok for git-daemon...
daemonExportFile := path.Join(repo.RepoPath(), `git-daemon-export-ok`) daemonExportFile := path.Join(repo.RepoPath(), `git-daemon-export-ok`)
if repo.IsPrivate && com.IsExist(daemonExportFile) { if repo.IsPrivate && com.IsExist(daemonExportFile) {
if err = os.Remove(daemonExportFile); err != nil { if err = util.Remove(daemonExportFile); err != nil {
log.Error("Failed to remove %s: %v", daemonExportFile, err) log.Error("Failed to remove %s: %v", daemonExportFile, err)
} }
} else if !repo.IsPrivate && !com.IsExist(daemonExportFile) { } else if !repo.IsPrivate && !com.IsExist(daemonExportFile) {
@ -1708,7 +1708,7 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
if len(repo.Avatar) > 0 { if len(repo.Avatar) > 0 {
avatarPath := repo.CustomAvatarPath() avatarPath := repo.CustomAvatarPath()
if com.IsExist(avatarPath) { if com.IsExist(avatarPath) {
if err := os.Remove(avatarPath); err != nil { if err := util.Remove(avatarPath); err != nil {
return fmt.Errorf("Failed to remove %s: %v", avatarPath, err) return fmt.Errorf("Failed to remove %s: %v", avatarPath, err)
} }
} }
@ -1852,7 +1852,7 @@ func DeleteRepositoryArchives(ctx context.Context) error {
return ErrCancelledf("before deleting repository archives for %s", repo.FullName()) return ErrCancelledf("before deleting repository archives for %s", repo.FullName())
default: default:
} }
return os.RemoveAll(filepath.Join(repo.RepoPath(), "archives")) return util.RemoveAll(filepath.Join(repo.RepoPath(), "archives"))
}) })
} }
@ -1911,7 +1911,7 @@ func deleteOldRepositoryArchives(ctx context.Context, olderThan time.Duration, i
} }
toDelete := filepath.Join(path, info.Name()) toDelete := filepath.Join(path, info.Name())
// This is a best-effort purge, so we do not check error codes to confirm removal. // This is a best-effort purge, so we do not check error codes to confirm removal.
if err = os.Remove(toDelete); err != nil { if err = util.Remove(toDelete); err != nil {
log.Trace("Unable to delete %s, but proceeding: %v", toDelete, err) log.Trace("Unable to delete %s, but proceeding: %v", toDelete, err)
} }
} }
@ -2280,7 +2280,7 @@ func (repo *Repository) UploadAvatar(data []byte) error {
} }
if len(oldAvatarPath) > 0 && oldAvatarPath != repo.CustomAvatarPath() { if len(oldAvatarPath) > 0 && oldAvatarPath != repo.CustomAvatarPath() {
if err := os.Remove(oldAvatarPath); err != nil { if err := util.Remove(oldAvatarPath); err != nil {
return fmt.Errorf("UploadAvatar: Failed to remove old repo avatar %s: %v", oldAvatarPath, err) return fmt.Errorf("UploadAvatar: Failed to remove old repo avatar %s: %v", oldAvatarPath, err)
} }
} }
@ -2311,7 +2311,7 @@ func (repo *Repository) DeleteAvatar() error {
} }
if _, err := os.Stat(avatarPath); err == nil { if _, err := os.Stat(avatarPath); err == nil {
if err := os.Remove(avatarPath); err != nil { if err := util.Remove(avatarPath); err != nil {
return fmt.Errorf("DeleteAvatar: Failed to remove %s: %v", avatarPath, err) return fmt.Errorf("DeleteAvatar: Failed to remove %s: %v", avatarPath, err)
} }
} else { } else {

17
models/ssh_key.go
Unescape View File

@ -28,6 +28,7 @@ import (
"code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/unknwon/com" "github.com/unknwon/com"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
@ -227,7 +228,11 @@ func SSHKeyGenParsePublicKey(key string) (string, int, error) {
if err != nil { if err != nil {
return "", 0, fmt.Errorf("writeTmpKeyFile: %v", err) return "", 0, fmt.Errorf("writeTmpKeyFile: %v", err)
} }
defer os.Remove(tmpName) defer func() {
if err := util.Remove(tmpName); err != nil {
log.Warn("Unable to remove temporary key file: %s: Error: %v", tmpName, err)
}
}()
stdout, stderr, err := process.GetManager().Exec("SSHKeyGenParsePublicKey", setting.SSH.KeygenPath, "-lf", tmpName) stdout, stderr, err := process.GetManager().Exec("SSHKeyGenParsePublicKey", setting.SSH.KeygenPath, "-lf", tmpName)
if err != nil { if err != nil {
@ -423,7 +428,11 @@ func calcFingerprintSSHKeygen(publicKeyContent string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
defer os.Remove(tmpPath) defer func() {
if err := util.Remove(tmpPath); err != nil {
log.Warn("Unable to remove temporary key file: %s: Error: %v", tmpPath, err)
}
}()
stdout, stderr, err := process.GetManager().Exec("AddPublicKey", "ssh-keygen", "-lf", tmpPath) stdout, stderr, err := process.GetManager().Exec("AddPublicKey", "ssh-keygen", "-lf", tmpPath)
if err != nil { if err != nil {
if strings.Contains(stderr, "is not a public key file") { if strings.Contains(stderr, "is not a public key file") {
@ -692,7 +701,9 @@ func rewriteAllPublicKeys(e Engine) error {
} }
defer func() { defer func() {
t.Close() t.Close()
os.Remove(tmpPath) if err := util.Remove(tmpPath); err != nil {
log.Warn("Unable to remove temporary authorized keys file: %s: Error: %v", tmpPath, err)
}
}() }()
if setting.SSH.AuthorizedKeysBackup && com.IsExist(fPath) { if setting.SSH.AuthorizedKeysBackup && com.IsExist(fPath) {

28
models/unit_tests.go
Unescape View File

@ -12,10 +12,10 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
"time"
"code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/unknwon/com" "github.com/unknwon/com"
@ -67,19 +67,19 @@ func MainTest(m *testing.M, pathToGiteaRoot string) {
fatalTestError("url.Parse: %v\n", err) fatalTestError("url.Parse: %v\n", err)
} }
if err = removeAllWithRetry(setting.RepoRootPath); err != nil { if err = util.RemoveAll(setting.RepoRootPath); err != nil {
fatalTestError("os.RemoveAll: %v\n", err) fatalTestError("util.RemoveAll: %v\n", err)
} }
if err = com.CopyDir(filepath.Join(pathToGiteaRoot, "integrations", "gitea-repositories-meta"), setting.RepoRootPath); err != nil { if err = com.CopyDir(filepath.Join(pathToGiteaRoot, "integrations", "gitea-repositories-meta"), setting.RepoRootPath); err != nil {
fatalTestError("com.CopyDir: %v\n", err) fatalTestError("com.CopyDir: %v\n", err)
} }
exitStatus := m.Run() exitStatus := m.Run()
if err = removeAllWithRetry(setting.RepoRootPath); err != nil { if err = util.RemoveAll(setting.RepoRootPath); err != nil {
fatalTestError("os.RemoveAll: %v\n", err) fatalTestError("util.RemoveAll: %v\n", err)
} }
if err = removeAllWithRetry(setting.AppDataPath); err != nil { if err = util.RemoveAll(setting.AppDataPath); err != nil {
fatalTestError("os.RemoveAll: %v\n", err) fatalTestError("util.RemoveAll: %v\n", err)
} }
os.Exit(exitStatus) os.Exit(exitStatus)
} }
@ -103,18 +103,6 @@ func CreateTestEngine(fixturesDir string) error {
return InitFixtures(fixturesDir) return InitFixtures(fixturesDir)
} }
func removeAllWithRetry(dir string) error {
var err error
for i := 0; i < 20; i++ {
err = os.RemoveAll(dir)
if err == nil {
break
}
time.Sleep(100 * time.Millisecond)
}
return err
}
// PrepareTestDatabase load test fixtures into test database // PrepareTestDatabase load test fixtures into test database
func PrepareTestDatabase() error { func PrepareTestDatabase() error {
return LoadFixtures() return LoadFixtures()
@ -124,7 +112,7 @@ func PrepareTestDatabase() error {
// by tests that use the above MainTest(..) function. // by tests that use the above MainTest(..) function.
func PrepareTestEnv(t testing.TB) { func PrepareTestEnv(t testing.TB) {
assert.NoError(t, PrepareTestDatabase()) assert.NoError(t, PrepareTestDatabase())
assert.NoError(t, removeAllWithRetry(setting.RepoRootPath)) assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
metaPath := filepath.Join(giteaRoot, "integrations", "gitea-repositories-meta") metaPath := filepath.Join(giteaRoot, "integrations", "gitea-repositories-meta")
assert.NoError(t, com.CopyDir(metaPath, setting.RepoRootPath)) assert.NoError(t, com.CopyDir(metaPath, setting.RepoRootPath))
base.SetupGiteaRoot() // Makes sure GITEA_ROOT is set base.SetupGiteaRoot() // Makes sure GITEA_ROOT is set

3
models/upload.go
Unescape View File

@ -13,6 +13,7 @@ import (
"path" "path"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
gouuid "github.com/google/uuid" gouuid "github.com/google/uuid"
"github.com/unknwon/com" "github.com/unknwon/com"
@ -129,7 +130,7 @@ func DeleteUploads(uploads ...*Upload) (err error) {
continue continue
} }
if err := os.Remove(localPath); err != nil { if err := util.Remove(localPath); err != nil {
return fmt.Errorf("remove upload: %v", err) return fmt.Errorf("remove upload: %v", err)
} }
} }

6
models/user.go
Unescape View File

@ -582,7 +582,7 @@ func (u *User) UploadAvatar(data []byte) error {
func (u *User) DeleteAvatar() error { func (u *User) DeleteAvatar() error {
log.Trace("DeleteAvatar[%d]: %s", u.ID, u.CustomAvatarPath()) log.Trace("DeleteAvatar[%d]: %s", u.ID, u.CustomAvatarPath())
if len(u.Avatar) > 0 { if len(u.Avatar) > 0 {
if err := os.Remove(u.CustomAvatarPath()); err != nil { if err := util.Remove(u.CustomAvatarPath()); err != nil {
return fmt.Errorf("Failed to remove %s: %v", u.CustomAvatarPath(), err) return fmt.Errorf("Failed to remove %s: %v", u.CustomAvatarPath(), err)
} }
} }
@ -1282,14 +1282,14 @@ func deleteUser(e *xorm.Session, u *User) error {
// so just keep error logs of those operations. // so just keep error logs of those operations.
path := UserPath(u.Name) path := UserPath(u.Name)
if err := os.RemoveAll(path); err != nil { if err := util.RemoveAll(path); err != nil {
return fmt.Errorf("Failed to RemoveAll %s: %v", path, err) return fmt.Errorf("Failed to RemoveAll %s: %v", path, err)
} }
if len(u.Avatar) > 0 { if len(u.Avatar) > 0 {
avatarPath := u.CustomAvatarPath() avatarPath := u.CustomAvatarPath()
if com.IsExist(avatarPath) { if com.IsExist(avatarPath) {
if err := os.Remove(avatarPath); err != nil { if err := util.Remove(avatarPath); err != nil {
return fmt.Errorf("Failed to remove %s: %v", avatarPath, err) return fmt.Errorf("Failed to remove %s: %v", avatarPath, err)
} }
} }

3
modules/git/commit_info_test.go
Unescape View File

@ -10,6 +10,7 @@ import (
"testing" "testing"
"time" "time"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -87,7 +88,7 @@ func TestEntries_GetCommitsInfo(t *testing.T) {
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestEntries_GetCommitsInfo") clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestEntries_GetCommitsInfo")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(clonedPath) defer util.RemoveAll(clonedPath)
clonedRepo1, err := OpenRepository(clonedPath) clonedRepo1, err := OpenRepository(clonedPath)
assert.NoError(t, err) assert.NoError(t, err)
defer clonedRepo1.Close() defer clonedRepo1.Close()

5
modules/git/hook.go
Unescape View File

@ -12,6 +12,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"code.gitea.io/gitea/modules/util"
"github.com/unknwon/com" "github.com/unknwon/com"
) )
@ -82,7 +83,7 @@ func (h *Hook) Name() string {
func (h *Hook) Update() error { func (h *Hook) Update() error {
if len(strings.TrimSpace(h.Content)) == 0 { if len(strings.TrimSpace(h.Content)) == 0 {
if isExist(h.path) { if isExist(h.path) {
err := os.Remove(h.path) err := util.Remove(h.path)
if err != nil { if err != nil {
return err return err
} }
@ -129,7 +130,7 @@ func SetUpdateHook(repoPath, content string) (err error) {
log("Setting update hook: %s", repoPath) log("Setting update hook: %s", repoPath)
hookPath := path.Join(repoPath, HookPathUpdate) hookPath := path.Join(repoPath, HookPathUpdate)
if com.IsExist(hookPath) { if com.IsExist(hookPath) {
err = os.Remove(hookPath) err = util.Remove(hookPath)
} else { } else {
err = os.MkdirAll(path.Dir(hookPath), os.ModePerm) err = os.MkdirAll(path.Dir(hookPath), os.ModePerm)
} }

4
modules/git/repo_compare_test.go
Unescape View File

@ -7,10 +7,10 @@ package git
import ( import (
"bytes" "bytes"
"io/ioutil" "io/ioutil"
"os"
"path/filepath" "path/filepath"
"testing" "testing"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -18,7 +18,7 @@ func TestGetFormatPatch(t *testing.T) {
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestGetFormatPatch") clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestGetFormatPatch")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(clonedPath) defer util.RemoveAll(clonedPath)
repo, err := OpenRepository(clonedPath) repo, err := OpenRepository(clonedPath)
assert.NoError(t, err) assert.NoError(t, err)
defer repo.Close() defer repo.Close()

6
modules/git/repo_tag_test.go
Unescape View File

@ -5,10 +5,10 @@
package git package git
import ( import (
"os"
"path/filepath" "path/filepath"
"testing" "testing"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -31,7 +31,7 @@ func TestRepository_GetTag(t *testing.T) {
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestRepository_GetTag") clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestRepository_GetTag")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(clonedPath) defer util.RemoveAll(clonedPath)
bareRepo1, err := OpenRepository(clonedPath) bareRepo1, err := OpenRepository(clonedPath)
assert.NoError(t, err) assert.NoError(t, err)
@ -81,7 +81,7 @@ func TestRepository_GetAnnotatedTag(t *testing.T) {
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestRepository_GetTag") clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestRepository_GetTag")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(clonedPath) defer util.RemoveAll(clonedPath)
bareRepo1, err := OpenRepository(clonedPath) bareRepo1, err := OpenRepository(clonedPath)
assert.NoError(t, err) assert.NoError(t, err)

3
modules/graceful/net_unix.go
Unescape View File

@ -17,6 +17,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
) )
const ( const (
@ -173,7 +174,7 @@ func GetListenerUnix(network string, address *net.UnixAddr) (*net.UnixListener,
} }
// make a fresh listener // make a fresh listener
if err := os.Remove(address.Name); err != nil && !os.IsNotExist(err) { if err := util.Remove(address.Name); err != nil && !os.IsNotExist(err) {
return nil, fmt.Errorf("Failed to remove unix socket %s: %v", address.Name, err) return nil, fmt.Errorf("Failed to remove unix socket %s: %v", address.Name, err)
} }

5
modules/indexer/code/bleve.go
Unescape View File

@ -19,6 +19,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/blevesearch/bleve" "github.com/blevesearch/bleve"
analyzer_custom "github.com/blevesearch/bleve/analysis/analyzer/custom" analyzer_custom "github.com/blevesearch/bleve/analysis/analyzer/custom"
@ -75,14 +76,14 @@ func openIndexer(path string, latestVersion int) (bleve.Index, error) {
if metadata.Version < latestVersion { if metadata.Version < latestVersion {
// the indexer is using a previous version, so we should delete it and // the indexer is using a previous version, so we should delete it and
// re-populate // re-populate
return nil, os.RemoveAll(path) return nil, util.RemoveAll(path)
} }
index, err := bleve.Open(path) index, err := bleve.Open(path)
if err != nil && err == upsidedown.IncompatibleVersion { if err != nil && err == upsidedown.IncompatibleVersion {
// the indexer was built with a previous version of bleve, so we should // the indexer was built with a previous version of bleve, so we should
// delete it and re-populate // delete it and re-populate
return nil, os.RemoveAll(path) return nil, util.RemoveAll(path)
} else if err != nil { } else if err != nil {
return nil, err return nil, err
} }

4
modules/indexer/code/bleve_test.go
Unescape View File

@ -6,12 +6,12 @@ package code
import ( import (
"io/ioutil" "io/ioutil"
"os"
"path/filepath" "path/filepath"
"testing" "testing"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -29,7 +29,7 @@ func TestIndexAndSearch(t *testing.T) {
assert.Fail(t, "Unable to create temporary directory") assert.Fail(t, "Unable to create temporary directory")
return return
} }
defer os.RemoveAll(dir) defer util.RemoveAll(dir)
setting.Indexer.RepoIndexerEnabled = true setting.Indexer.RepoIndexerEnabled = true
idx, _, err := NewBleveIndexer(dir) idx, _, err := NewBleveIndexer(dir)

5
modules/indexer/issues/bleve.go
Unescape View File

@ -10,6 +10,7 @@ import (
"strconv" "strconv"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
"github.com/blevesearch/bleve" "github.com/blevesearch/bleve"
"github.com/blevesearch/bleve/analysis/analyzer/custom" "github.com/blevesearch/bleve/analysis/analyzer/custom"
"github.com/blevesearch/bleve/analysis/token/lowercase" "github.com/blevesearch/bleve/analysis/token/lowercase"
@ -86,14 +87,14 @@ func openIndexer(path string, latestVersion int) (bleve.Index, error) {
if metadata.Version < latestVersion { if metadata.Version < latestVersion {
// the indexer is using a previous version, so we should delete it and // the indexer is using a previous version, so we should delete it and
// re-populate // re-populate
return nil, os.RemoveAll(path) return nil, util.RemoveAll(path)
} }
index, err := bleve.Open(path) index, err := bleve.Open(path)
if err != nil && err == upsidedown.IncompatibleVersion { if err != nil && err == upsidedown.IncompatibleVersion {
// the indexer was built with a previous version of bleve, so we should // the indexer was built with a previous version of bleve, so we should
// delete it and re-populate // delete it and re-populate
return nil, os.RemoveAll(path) return nil, util.RemoveAll(path)
} else if err != nil { } else if err != nil {
return nil, err return nil, err
} }

4
modules/indexer/issues/bleve_test.go
Unescape View File

@ -6,9 +6,9 @@ package issues
import ( import (
"io/ioutil" "io/ioutil"
"os"
"testing" "testing"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -19,7 +19,7 @@ func TestBleveIndexAndSearch(t *testing.T) {
assert.Fail(t, "Unable to create temporary directory") assert.Fail(t, "Unable to create temporary directory")
return return
} }
defer os.RemoveAll(dir) defer util.RemoveAll(dir)
indexer := NewBleveIndexer(dir) indexer := NewBleveIndexer(dir)
defer indexer.Close() defer indexer.Close()

4
modules/indexer/issues/indexer_test.go
Unescape View File

@ -6,7 +6,6 @@ package issues
import ( import (
"io/ioutil" "io/ioutil"
"os"
"path" "path"
"path/filepath" "path/filepath"
"testing" "testing"
@ -14,6 +13,7 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
@ -40,7 +40,7 @@ func TestBleveSearchIssues(t *testing.T) {
defer func() { defer func() {
setting.Indexer.IssueQueueDir = oldQueueDir setting.Indexer.IssueQueueDir = oldQueueDir
setting.Indexer.IssuePath = oldIssuePath setting.Indexer.IssuePath = oldIssuePath
os.RemoveAll(tmpIndexerDir) util.RemoveAll(tmpIndexerDir)
}() }()
setting.Indexer.IssueType = "bleve" setting.Indexer.IssueType = "bleve"

7
modules/lfs/content_store.go
Unescape View File

@ -14,6 +14,7 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
) )
var ( var (
@ -61,7 +62,11 @@ func (s *ContentStore) Put(meta *models.LFSMetaObject, r io.Reader) error {
log.Error("Whilst putting LFS OID[%s]: Unable to open temporary file for writing: %s Error: %v", tmpPath, err) log.Error("Whilst putting LFS OID[%s]: Unable to open temporary file for writing: %s Error: %v", tmpPath, err)
return err return err
} }
defer os.Remove(tmpPath) defer func() {
if err := util.Remove(tmpPath); err != nil {
log.Warn("Unable to remove temporary path: %s: Error: %v", tmpPath, err)
}
}()
hash := sha256.New() hash := sha256.New()
hw := io.MultiWriter(hash, file) hw := io.MultiWriter(hash, file)

8
modules/log/file.go
Unescape View File

@ -15,6 +15,8 @@ import (
"strings" "strings"
"sync" "sync"
"time" "time"
"code.gitea.io/gitea/modules/util"
) )
// FileLogger implements LoggerProvider. // FileLogger implements LoggerProvider.
@ -214,11 +216,11 @@ func compressOldLogFile(fname string, compressionLevel int) error {
if err != nil { if err != nil {
zw.Close() zw.Close()
fw.Close() fw.Close()
os.Remove(fname + ".gz") util.Remove(fname + ".gz")
return err return err
} }
reader.Close() reader.Close()
return os.Remove(fname) return util.Remove(fname)
} }
func (log *FileLogger) deleteOldLog() { func (log *FileLogger) deleteOldLog() {
@ -233,7 +235,7 @@ func (log *FileLogger) deleteOldLog() {
if !info.IsDir() && info.ModTime().Unix() < (time.Now().Unix()-60*60*24*log.Maxdays) { if !info.IsDir() && info.ModTime().Unix() < (time.Now().Unix()-60*60*24*log.Maxdays) {
if strings.HasPrefix(filepath.Base(path), filepath.Base(log.Filename)) { if strings.HasPrefix(filepath.Base(path), filepath.Base(log.Filename)) {
if err := os.Remove(path); err != nil { if err := util.Remove(path); err != nil {
returnErr = fmt.Errorf("Failed to remove %s: %v", path, err) returnErr = fmt.Errorf("Failed to remove %s: %v", path, err)
} }
} }

9
modules/log/file_test.go
Unescape View File

@ -14,13 +14,14 @@ import (
"testing" "testing"
"time" "time"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func TestFileLoggerFails(t *testing.T) { func TestFileLoggerFails(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger") tmpDir, err := ioutil.TempDir("", "TestFileLogger")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
prefix := "TestPrefix " prefix := "TestPrefix "
level := INFO level := INFO
@ -48,7 +49,7 @@ func TestFileLoggerFails(t *testing.T) {
func TestFileLogger(t *testing.T) { func TestFileLogger(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger") tmpDir, err := ioutil.TempDir("", "TestFileLogger")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
prefix := "TestPrefix " prefix := "TestPrefix "
level := INFO level := INFO
@ -151,7 +152,7 @@ func TestFileLogger(t *testing.T) {
func TestCompressFileLogger(t *testing.T) { func TestCompressFileLogger(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger") tmpDir, err := ioutil.TempDir("", "TestFileLogger")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
prefix := "TestPrefix " prefix := "TestPrefix "
level := INFO level := INFO
@ -211,7 +212,7 @@ func TestCompressFileLogger(t *testing.T) {
func TestCompressOldFile(t *testing.T) { func TestCompressOldFile(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger") tmpDir, err := ioutil.TempDir("", "TestFileLogger")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
fname := filepath.Join(tmpDir, "test") fname := filepath.Join(tmpDir, "test")
nonGzip := filepath.Join(tmpDir, "test-nonGzip") nonGzip := filepath.Join(tmpDir, "test-nonGzip")

8
modules/markup/external/external.go vendored
Unescape View File

@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
) )
// RegisterParsers registers all supported third part parsers according settings // RegisterParsers registers all supported third part parsers according settings
@ -70,7 +71,12 @@ func (p *Parser) Render(rawBytes []byte, urlPrefix string, metas map[string]stri
log.Error("%s create temp file when rendering %s failed: %v", p.Name(), p.Command, err) log.Error("%s create temp file when rendering %s failed: %v", p.Name(), p.Command, err)
return []byte("") return []byte("")
} }
defer os.Remove(f.Name()) tmpPath := f.Name()
defer func() {
if err := util.Remove(tmpPath); err != nil {
log.Warn("Unable to remove temporary file: %s: Error: %v", tmpPath, err)
}
}()
_, err = io.Copy(f, rd) _, err = io.Copy(f, rd)
if err != nil { if err != nil {

4
modules/queue/queue_disk_channel_test.go
Unescape View File

@ -7,10 +7,10 @@ package queue
import ( import (
"context" "context"
"io/ioutil" "io/ioutil"
"os"
"testing" "testing"
"time" "time"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -29,7 +29,7 @@ func TestPersistableChannelQueue(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "persistable-channel-queue-test-data") tmpDir, err := ioutil.TempDir("", "persistable-channel-queue-test-data")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
queue, err := NewPersistableChannelQueue(handle, PersistableChannelQueueConfiguration{ queue, err := NewPersistableChannelQueue(handle, PersistableChannelQueueConfiguration{
DataDir: tmpDir, DataDir: tmpDir,

4
modules/queue/queue_disk_test.go
Unescape View File

@ -7,11 +7,11 @@ package queue
import ( import (
"context" "context"
"io/ioutil" "io/ioutil"
"os"
"sync" "sync"
"testing" "testing"
"time" "time"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -31,7 +31,7 @@ func TestLevelQueue(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "level-queue-test-data") tmpDir, err := ioutil.TempDir("", "level-queue-test-data")
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(tmpDir) defer util.RemoveAll(tmpDir)
queue, err := NewLevelQueue(handle, LevelQueueConfiguration{ queue, err := NewLevelQueue(handle, LevelQueueConfiguration{
ByteFIFOQueueConfiguration: ByteFIFOQueueConfiguration{ ByteFIFOQueueConfiguration: ByteFIFOQueueConfiguration{

4
modules/repository/create.go
Unescape View File

@ -6,13 +6,13 @@ package repository
import ( import (
"fmt" "fmt"
"os"
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
) )
// CreateRepository creates a repository for the user/organization. // CreateRepository creates a repository for the user/organization.
@ -48,7 +48,7 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (_ *m
if !opts.IsMirror { if !opts.IsMirror {
repoPath := models.RepoPath(u.Name, repo.Name) repoPath := models.RepoPath(u.Name, repo.Name)
if err = initRepository(ctx, repoPath, doer, repo, opts); err != nil { if err = initRepository(ctx, repoPath, doer, repo, opts); err != nil {
if err2 := os.RemoveAll(repoPath); err2 != nil { if err2 := util.RemoveAll(repoPath); err2 != nil {
log.Error("initRepository: %v", err) log.Error("initRepository: %v", err)
return fmt.Errorf( return fmt.Errorf(
"delete repo directory %s/%s failed(2): %v", u.Name, repo.Name, err2) "delete repo directory %s/%s failed(2): %v", u.Name, repo.Name, err2)

7
modules/repository/generate.go
Unescape View File

@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
"github.com/huandu/xstrings" "github.com/huandu/xstrings"
) )
@ -119,7 +120,7 @@ func generateRepoCommit(repo, templateRepo, generateRepo *models.Repository, tmp
return fmt.Errorf("git clone: %v", err) return fmt.Errorf("git clone: %v", err)
} }
if err := os.RemoveAll(path.Join(tmpDir, ".git")); err != nil { if err := util.RemoveAll(path.Join(tmpDir, ".git")); err != nil {
return fmt.Errorf("remove git dir: %v", err) return fmt.Errorf("remove git dir: %v", err)
} }
@ -130,7 +131,7 @@ func generateRepoCommit(repo, templateRepo, generateRepo *models.Repository, tmp
} }
if gt != nil { if gt != nil {
if err := os.Remove(gt.Path); err != nil { if err := util.Remove(gt.Path); err != nil {
return fmt.Errorf("remove .giteatemplate: %v", err) return fmt.Errorf("remove .giteatemplate: %v", err)
} }
@ -191,7 +192,7 @@ func generateGitContent(ctx models.DBContext, repo, templateRepo, generateRepo *
} }
defer func() { defer func() {
if err := os.RemoveAll(tmpDir); err != nil { if err := util.RemoveAll(tmpDir); err != nil {
log.Error("RemoveAll: %v", err) log.Error("RemoveAll: %v", err)
} }
}() }()

5
modules/repository/hooks.go
Unescape View File

@ -14,6 +14,7 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"github.com/unknwon/com" "github.com/unknwon/com"
"xorm.io/builder" "xorm.io/builder"
@ -53,7 +54,7 @@ func createDelegateHooks(repoPath string) (err error) {
} }
// WARNING: This will override all old server-side hooks // WARNING: This will override all old server-side hooks
if err = os.Remove(oldHookPath); err != nil && !os.IsNotExist(err) { if err = util.Remove(oldHookPath); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("unable to pre-remove old hook file '%s' prior to rewriting: %v ", oldHookPath, err) return fmt.Errorf("unable to pre-remove old hook file '%s' prior to rewriting: %v ", oldHookPath, err)
} }
if err = ioutil.WriteFile(oldHookPath, []byte(hookTpls[i]), 0777); err != nil { if err = ioutil.WriteFile(oldHookPath, []byte(hookTpls[i]), 0777); err != nil {
@ -64,7 +65,7 @@ func createDelegateHooks(repoPath string) (err error) {
return fmt.Errorf("Unable to set %s executable. Error %v", oldHookPath, err) return fmt.Errorf("Unable to set %s executable. Error %v", oldHookPath, err)
} }
if err = os.Remove(newHookPath); err != nil && !os.IsNotExist(err) { if err = util.Remove(newHookPath); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("unable to pre-remove new hook file '%s' prior to rewriting: %v", newHookPath, err) return fmt.Errorf("unable to pre-remove new hook file '%s' prior to rewriting: %v", newHookPath, err)
} }
if err = ioutil.WriteFile(newHookPath, []byte(giteaHookTpls[i]), 0777); err != nil { if err = ioutil.WriteFile(newHookPath, []byte(giteaHookTpls[i]), 0777); err != nil {

8
modules/repository/init.go
Unescape View File

@ -17,6 +17,7 @@ import (
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"github.com/mcuadros/go-version" "github.com/mcuadros/go-version"
"github.com/unknwon/com" "github.com/unknwon/com"
@ -188,8 +189,11 @@ func initRepository(ctx models.DBContext, repoPath string, u *models.User, repo
if err != nil { if err != nil {
return fmt.Errorf("Failed to create temp dir for repository %s: %v", repo.RepoPath(), err) return fmt.Errorf("Failed to create temp dir for repository %s: %v", repo.RepoPath(), err)
} }
defer func() {
defer os.RemoveAll(tmpDir) if err := util.RemoveAll(tmpDir); err != nil {
log.Warn("Unable to remove temporary directory: %s: Error: %v", tmpDir, err)
}
}()
if err = prepareRepoCommit(ctx, repo, tmpDir, repoPath, opts); err != nil { if err = prepareRepoCommit(ctx, repo, tmpDir, repoPath, opts); err != nil {
return fmt.Errorf("prepareRepoCommit: %v", err) return fmt.Errorf("prepareRepoCommit: %v", err)

8
modules/repository/repo.go
Unescape View File

@ -6,7 +6,6 @@ package repository
import ( import (
"fmt" "fmt"
"os"
"path" "path"
"strings" "strings"
"time" "time"
@ -17,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
) )
@ -57,7 +57,7 @@ func MigrateRepositoryGitData(doer, u *models.User, repo *models.Repository, opt
migrateTimeout := time.Duration(setting.Git.Timeout.Migrate) * time.Second migrateTimeout := time.Duration(setting.Git.Timeout.Migrate) * time.Second
var err error var err error
if err = os.RemoveAll(repoPath); err != nil { if err = util.RemoveAll(repoPath); err != nil {
return repo, fmt.Errorf("Failed to remove %s: %v", repoPath, err) return repo, fmt.Errorf("Failed to remove %s: %v", repoPath, err)
} }
@ -73,7 +73,7 @@ func MigrateRepositoryGitData(doer, u *models.User, repo *models.Repository, opt
wikiPath := models.WikiPath(u.Name, opts.RepoName) wikiPath := models.WikiPath(u.Name, opts.RepoName)
wikiRemotePath := WikiRemoteURL(opts.CloneAddr) wikiRemotePath := WikiRemoteURL(opts.CloneAddr)
if len(wikiRemotePath) > 0 { if len(wikiRemotePath) > 0 {
if err := os.RemoveAll(wikiPath); err != nil { if err := util.RemoveAll(wikiPath); err != nil {
return repo, fmt.Errorf("Failed to remove %s: %v", wikiPath, err) return repo, fmt.Errorf("Failed to remove %s: %v", wikiPath, err)
} }
@ -84,7 +84,7 @@ func MigrateRepositoryGitData(doer, u *models.User, repo *models.Repository, opt
Branch: "master", Branch: "master",
}); err != nil { }); err != nil {
log.Warn("Clone wiki: %v", err) log.Warn("Clone wiki: %v", err)
if err := os.RemoveAll(wikiPath); err != nil { if err := util.RemoveAll(wikiPath); err != nil {
return repo, fmt.Errorf("Failed to remove %s: %v", wikiPath, err) return repo, fmt.Errorf("Failed to remove %s: %v", wikiPath, err)
} }
} }

57
modules/util/remove.go
Unescape View File

@ -0,0 +1,57 @@
// Copyright 2020 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package util
import (
"os"
"syscall"
"time"
)
// Remove removes the named file or (empty) directory with at most 5 attempts.
func Remove(name string) error {
var err error
for i := 0; i < 5; i++ {
err = os.Remove(name)
if err == nil {
break
}
unwrapped := err.(*os.PathError).Err
if unwrapped == syscall.EBUSY || unwrapped == syscall.ENOTEMPTY || unwrapped == syscall.EPERM || unwrapped == syscall.EMFILE || unwrapped == syscall.ENFILE {
// try again
<-time.After(100 * time.Millisecond)
continue
}
if unwrapped == syscall.ENOENT {
// it's already gone
return nil
}
}
return err
}
// RemoveAll removes the named file or (empty) directory with at most 5 attempts.Remove
func RemoveAll(name string) error {
var err error
for i := 0; i < 5; i++ {
err = os.RemoveAll(name)
if err == nil {
break
}
unwrapped := err.(*os.PathError).Err
if unwrapped == syscall.EBUSY || unwrapped == syscall.ENOTEMPTY || unwrapped == syscall.EPERM || unwrapped == syscall.EMFILE || unwrapped == syscall.ENFILE {
// try again
<-time.After(100 * time.Millisecond)
continue
}
if unwrapped == syscall.ENOENT {
// it's already gone
return nil
}
}
return err
}

3
modules/util/sanitize.go
Unescape View File

@ -7,8 +7,6 @@ package util
import ( import (
"net/url" "net/url"
"strings" "strings"
"code.gitea.io/gitea/modules/log"
) )
// urlSafeError wraps an error whose message may contain a sensitive URL // urlSafeError wraps an error whose message may contain a sensitive URL
@ -38,7 +36,6 @@ func SanitizeMessage(message, unsanitizedURL string) string {
func SanitizeURLCredentials(unsanitizedURL string, usePlaceholder bool) string { func SanitizeURLCredentials(unsanitizedURL string, usePlaceholder bool) string {
u, err := url.Parse(unsanitizedURL) u, err := url.Parse(unsanitizedURL)
if err != nil { if err != nil {
log.Error("parse url %s failed: %v", unsanitizedURL, err)
// don't log the error, since it might contain unsanitized URL. // don't log the error, since it might contain unsanitized URL.
return "(unparsable url)" return "(unparsable url)"
} }

18
modules/util/url.go
Unescape View File

@ -8,9 +8,6 @@ import (
"net/url" "net/url"
"path" "path"
"strings" "strings"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
) )
// PathEscapeSegments escapes segments of a path while not escaping forward slash // PathEscapeSegments escapes segments of a path while not escaping forward slash
@ -30,13 +27,11 @@ func URLJoin(base string, elems ...string) string {
} }
baseURL, err := url.Parse(base) baseURL, err := url.Parse(base)
if err != nil { if err != nil {
log.Error("URLJoin: Invalid base URL %s", base)
return "" return ""
} }
joinedPath := path.Join(elems...) joinedPath := path.Join(elems...)
argURL, err := url.Parse(joinedPath) argURL, err := url.Parse(joinedPath)
if err != nil { if err != nil {
log.Error("URLJoin: Invalid arg %s", joinedPath)
return "" return ""
} }
joinedURL := baseURL.ResolveReference(argURL).String() joinedURL := baseURL.ResolveReference(argURL).String()
@ -45,16 +40,3 @@ func URLJoin(base string, elems ...string) string {
} }
return joinedURL return joinedURL
} }
// IsExternalURL checks if rawURL points to an external URL like http://example.com
func IsExternalURL(rawURL string) bool {
parsed, err := url.Parse(rawURL)
if err != nil {
return true
}
appURL, _ := url.Parse(setting.AppURL)
if len(parsed.Host) != 0 && strings.Replace(parsed.Host, "www.", "", 1) != strings.Replace(appURL.Host, "www.", "", 1) {
return true
}
return false
}

35
modules/util/util_test.go
Unescape View File

@ -8,8 +8,6 @@ import (
"strings" "strings"
"testing" "testing"
"code.gitea.io/gitea/modules/setting"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -46,39 +44,6 @@ func TestURLJoin(t *testing.T) {
} }
} }
func TestIsExternalURL(t *testing.T) {
setting.AppURL = "https://try.gitea.io"
type test struct {
Expected bool
RawURL string
}
newTest := func(expected bool, rawURL string) test {
return test{Expected: expected, RawURL: rawURL}
}
for _, test := range []test{
newTest(false,
"https://try.gitea.io"),
newTest(true,
"https://example.com/"),
newTest(true,
"//example.com"),
newTest(true,
"http://example.com"),
newTest(false,
"a/"),
newTest(false,
"https://try.gitea.io/test?param=false"),
newTest(false,
"test?param=false"),
newTest(false,
"//try.gitea.io/test?param=false"),
newTest(false,
"/hey/hey/hey#3244"),
} {
assert.Equal(t, test.Expected, IsExternalURL(test.RawURL))
}
}
func TestIsEmptyString(t *testing.T) { func TestIsEmptyString(t *testing.T) {
cases := []struct { cases := []struct {

3
routers/repo/http.go
Unescape View File

@ -31,6 +31,7 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
repo_service "code.gitea.io/gitea/services/repository" repo_service "code.gitea.io/gitea/services/repository"
) )
@ -391,7 +392,7 @@ func dummyInfoRefs(ctx *context.Context) {
} }
defer func() { defer func() {
if err := os.RemoveAll(tmpDir); err != nil { if err := util.RemoveAll(tmpDir); err != nil {
log.Error("RemoveAll: %v", err) log.Error("RemoveAll: %v", err)
} }
}() }()

4
routers/repo/lfs.go
Unescape View File

@ -11,7 +11,6 @@ import (
gotemplate "html/template" gotemplate "html/template"
"io" "io"
"io/ioutil" "io/ioutil"
"os"
"path" "path"
"path/filepath" "path/filepath"
"sort" "sort"
@ -29,6 +28,7 @@ import (
"code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
gogit "github.com/go-git/go-git/v5" gogit "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing"
@ -356,7 +356,7 @@ func LFSDelete(ctx *context.Context) {
// Please note a similar condition happens in models/repo.go DeleteRepository // Please note a similar condition happens in models/repo.go DeleteRepository
if count == 0 { if count == 0 {
oidPath := filepath.Join(oid[0:2], oid[2:4], oid[4:]) oidPath := filepath.Join(oid[0:2], oid[2:4], oid[4:])
err = os.Remove(filepath.Join(setting.LFS.ContentPath, oidPath)) err = util.Remove(filepath.Join(setting.LFS.ContentPath, oidPath))
if err != nil { if err != nil {
ctx.ServerError("LFSDelete", err) ctx.ServerError("LFSDelete", err)
return return

4
routers/repo/settings_test.go
Unescape View File

@ -7,7 +7,6 @@ package repo
import ( import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os"
"testing" "testing"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
@ -15,6 +14,7 @@ import (
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/test"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -31,7 +31,7 @@ func createSSHAuthorizedKeysTmpPath(t *testing.T) func() {
return func() { return func() {
setting.SSH.RootPath = oldPath setting.SSH.RootPath = oldPath
os.RemoveAll(tmpDir) util.RemoveAll(tmpDir)
} }
} }

6
routers/user/auth.go
Unescape View File

@ -22,7 +22,7 @@ import (
"code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/recaptcha"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/utils"
"code.gitea.io/gitea/services/externalaccount" "code.gitea.io/gitea/services/externalaccount"
"code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/services/mailer"
@ -537,7 +537,7 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR
return setting.AppSubURL + "/" return setting.AppSubURL + "/"
} }
if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 && !util.IsExternalURL(redirectTo) { if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 && !utils.IsExternalURL(redirectTo) {
ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true)
if obeyRedirect { if obeyRedirect {
ctx.RedirectToFirst(redirectTo) ctx.RedirectToFirst(redirectTo)
@ -1540,7 +1540,7 @@ func MustChangePasswordPost(ctx *context.Context, cpt *captcha.Captcha, form aut
log.Trace("User updated password: %s", u.Name) log.Trace("User updated password: %s", u.Name)
if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 && !util.IsExternalURL(redirectTo) { if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 && !utils.IsExternalURL(redirectTo) {
ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL) ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL)
ctx.RedirectToFirst(redirectTo) ctx.RedirectToFirst(redirectTo)
return return

16
routers/utils/utils.go
Unescape View File

@ -6,7 +6,10 @@ package utils
import ( import (
"html" "html"
"net/url"
"strings" "strings"
"code.gitea.io/gitea/modules/setting"
) )
// RemoveUsernameParameterSuffix returns the username parameter without the (fullname) suffix - leaving just the username // RemoveUsernameParameterSuffix returns the username parameter without the (fullname) suffix - leaving just the username
@ -46,3 +49,16 @@ func SanitizeFlashErrorString(x string) string {
return strings.Replace(html.EscapeString(x), "\n", "<br>", -1) return strings.Replace(html.EscapeString(x), "\n", "<br>", -1)
} }
// IsExternalURL checks if rawURL points to an external URL like http://example.com
func IsExternalURL(rawURL string) bool {
parsed, err := url.Parse(rawURL)
if err != nil {
return true
}
appURL, _ := url.Parse(setting.AppURL)
if len(parsed.Host) != 0 && strings.Replace(parsed.Host, "www.", "", 1) != strings.Replace(appURL.Host, "www.", "", 1) {
return true
}
return false
}

34
routers/utils/utils_test.go
Unescape View File

@ -7,6 +7,7 @@ package utils
import ( import (
"testing" "testing"
"code.gitea.io/gitea/modules/setting"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -32,3 +33,36 @@ func TestIsValidSlackChannel(t *testing.T) {
assert.Equal(t, v.expected, IsValidSlackChannel(v.channelName)) assert.Equal(t, v.expected, IsValidSlackChannel(v.channelName))
} }
} }
func TestIsExternalURL(t *testing.T) {
setting.AppURL = "https://try.gitea.io"
type test struct {
Expected bool
RawURL string
}
newTest := func(expected bool, rawURL string) test {
return test{Expected: expected, RawURL: rawURL}
}
for _, test := range []test{
newTest(false,
"https://try.gitea.io"),
newTest(true,
"https://example.com/"),
newTest(true,
"//example.com"),
newTest(true,
"http://example.com"),
newTest(false,
"a/"),
newTest(false,
"https://try.gitea.io/test?param=false"),
newTest(false,
"test?param=false"),
newTest(false,
"//try.gitea.io/test?param=false"),
newTest(false,
"/hey/hey/hey#3244"),
} {
assert.Equal(t, test.Expected, IsExternalURL(test.RawURL))
}
}

7
services/pull/check.go
Unescape View File

@ -20,6 +20,7 @@ import (
"code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/queue" "code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/unknwon/com" "github.com/unknwon/com"
) )
@ -82,7 +83,11 @@ func getMergeCommit(pr *models.PullRequest) (*git.Commit, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to create temp dir for repository %s: %v", pr.BaseRepo.RepoPath(), err) return nil, fmt.Errorf("Failed to create temp dir for repository %s: %v", pr.BaseRepo.RepoPath(), err)
} }
defer os.RemoveAll(indexTmpPath) defer func() {
if err := util.RemoveAll(indexTmpPath); err != nil {
log.Warn("Unable to remove temporary index path: %s: Error: %v", indexTmpPath, err)
}
}()
headFile := pr.GetGitRefName() headFile := pr.GetGitRefName()

3
services/pull/patch.go
Unescape View File

@ -17,6 +17,7 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
) )
// DownloadDiffOrPatch will write the patch for the pr to the writer // DownloadDiffOrPatch will write the patch for the pr to the writer
@ -80,7 +81,7 @@ func TestPatch(pr *models.PullRequest) error {
return fmt.Errorf("Unable to create temporary patch file! Error: %v", err) return fmt.Errorf("Unable to create temporary patch file! Error: %v", err)
} }
defer func() { defer func() {
_ = os.Remove(tmpPatchFile.Name()) _ = util.Remove(tmpPatchFile.Name())
}() }()
if err := gitRepo.GetDiff(pr.MergeBase, "tracking", tmpPatchFile); err != nil { if err := gitRepo.GetDiff(pr.MergeBase, "tracking", tmpPatchFile); err != nil {

4
services/pull/pull.go
Unescape View File

@ -10,7 +10,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"os"
"path" "path"
"strings" "strings"
"time" "time"
@ -21,6 +20,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
issue_service "code.gitea.io/gitea/services/issue" issue_service "code.gitea.io/gitea/services/issue"
"github.com/unknwon/com" "github.com/unknwon/com"
@ -436,7 +436,7 @@ func PushToBaseRepo(pr *models.PullRequest) (err error) {
// Remove head in case there is a conflict. // Remove head in case there is a conflict.
file := path.Join(pr.BaseRepo.RepoPath(), headFile) file := path.Join(pr.BaseRepo.RepoPath(), headFile)
_ = os.Remove(file) _ = util.Remove(file)
if err = pr.LoadIssue(); err != nil { if err = pr.LoadIssue(); err != nil {
return fmt.Errorf("unable to load issue %d for pr %d: %v", pr.IssueID, pr.ID, err) return fmt.Errorf("unable to load issue %d for pr %d: %v", pr.IssueID, pr.ID, err)

4
services/release/release.go
Unescape View File

@ -6,7 +6,6 @@ package release
import ( import (
"fmt" "fmt"
"os"
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
@ -15,6 +14,7 @@ import (
"code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
) )
func createTag(gitRepo *git.Repository, rel *models.Release) error { func createTag(gitRepo *git.Repository, rel *models.Release) error {
@ -168,7 +168,7 @@ func DeleteReleaseByID(id int64, doer *models.User, delTag bool) error {
for i := range rel.Attachments { for i := range rel.Attachments {
attachment := rel.Attachments[i] attachment := rel.Attachments[i]
if err := os.RemoveAll(attachment.LocalPath()); err != nil { if err := util.RemoveAll(attachment.LocalPath()); err != nil {
log.Error("Delete attachment %s of release %s failed: %v", attachment.UUID, rel.ID, err) log.Error("Delete attachment %s of release %s failed: %v", attachment.UUID, rel.ID, err)
} }
} }

Write Preview
Loading…
Cancel
Save