diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/admin/repos.go | 13 | ||||
| -rw-r--r-- | routers/api/v1/admin/adopt.go | 24 | ||||
| -rw-r--r-- | routers/install.go | 7 | ||||
| -rw-r--r-- | routers/user/setting/adopt.go | 14 |
4 files changed, 46 insertions, 12 deletions
diff --git a/routers/admin/repos.go b/routers/admin/repos.go index 10abaf9547..54b6c8e7c6 100644 --- a/routers/admin/repos.go +++ b/routers/admin/repos.go @@ -13,9 +13,9 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers" repo_service "code.gitea.io/gitea/services/repository" - "github.com/unknwon/com" ) const ( @@ -120,10 +120,17 @@ func AdoptOrDeleteRepository(ctx *context.Context) { repoName := dirSplit[1] // check not a repo - if has, err := models.IsRepositoryExist(ctxUser, repoName); err != nil { + has, err := models.IsRepositoryExist(ctxUser, repoName) + if err != nil { ctx.ServerError("IsRepositoryExist", err) return - } else if has || !com.IsDir(models.RepoPath(ctxUser.Name, repoName)) { + } + isDir, err := util.IsDir(models.RepoPath(ctxUser.Name, repoName)) + if err != nil { + ctx.ServerError("IsDir", err) + return + } + if has || !isDir { // Fallthrough to failure mode } else if action == "adopt" { if _, err := repository.AdoptRepository(ctx.User, ctxUser, models.CreateRepoOptions{ diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index 1a7a62a55c..fdef94e6c8 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -11,8 +11,8 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/repository" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/api/v1/utils" - "github.com/unknwon/com" ) // ListUnadoptedRepositories lists the unadopted repositories that match the provided names @@ -92,10 +92,17 @@ func AdoptRepository(ctx *context.APIContext) { } // check not a repo - if has, err := models.IsRepositoryExist(ctxUser, repoName); err != nil { + has, err := models.IsRepositoryExist(ctxUser, repoName) + if err != nil { + ctx.InternalServerError(err) + return + } + isDir, err := util.IsDir(models.RepoPath(ctxUser.Name, repoName)) + if err != nil { ctx.InternalServerError(err) return - } else if has || !com.IsDir(models.RepoPath(ctxUser.Name, repoName)) { + } + if has || !isDir { ctx.NotFound() return } @@ -147,10 +154,17 @@ func DeleteUnadoptedRepository(ctx *context.APIContext) { } // check not a repo - if has, err := models.IsRepositoryExist(ctxUser, repoName); err != nil { + has, err := models.IsRepositoryExist(ctxUser, repoName) + if err != nil { + ctx.InternalServerError(err) + return + } + isDir, err := util.IsDir(models.RepoPath(ctxUser.Name, repoName)) + if err != nil { ctx.InternalServerError(err) return - } else if has || !com.IsDir(models.RepoPath(ctxUser.Name, repoName)) { + } + if has || !isDir { ctx.NotFound() return } diff --git a/routers/install.go b/routers/install.go index 4dd934aa04..88786efb95 100644 --- a/routers/install.go +++ b/routers/install.go @@ -20,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/user" + "code.gitea.io/gitea/modules/util" "github.com/unknwon/com" "gopkg.in/ini.v1" @@ -260,7 +261,11 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { // Save settings. cfg := ini.Empty() - if com.IsFile(setting.CustomConf) { + isFile, err := util.IsFile(setting.CustomConf) + if err != nil { + log.Error("Unable to check if %s is a file. Error: %v", setting.CustomConf, err) + } + if isFile { // Keeps custom settings if there is already something. if err = cfg.Append(setting.CustomConf); err != nil { log.Error("Failed to load custom conf '%s': %v", setting.CustomConf, err) diff --git a/routers/user/setting/adopt.go b/routers/user/setting/adopt.go index 6ff07d6daa..b2d918784f 100644 --- a/routers/user/setting/adopt.go +++ b/routers/user/setting/adopt.go @@ -11,7 +11,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" - "github.com/unknwon/com" + "code.gitea.io/gitea/modules/util" ) // AdoptOrDeleteRepository adopts or deletes a repository @@ -30,10 +30,18 @@ func AdoptOrDeleteRepository(ctx *context.Context) { root := filepath.Join(models.UserPath(ctxUser.LowerName)) // check not a repo - if has, err := models.IsRepositoryExist(ctxUser, dir); err != nil { + has, err := models.IsRepositoryExist(ctxUser, dir) + if err != nil { ctx.ServerError("IsRepositoryExist", err) return - } else if has || !com.IsDir(filepath.Join(root, dir+".git")) { + } + + isDir, err := util.IsDir(filepath.Join(root, dir+".git")) + if err != nil { + ctx.ServerError("IsDir", err) + return + } + if has || !isDir { // Fallthrough to failure mode } else if action == "adopt" && allowAdopt { if _, err := repository.AdoptRepository(ctxUser, ctxUser, models.CreateRepoOptions{ |