finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186)

Browse source 
* Ensure errors from IsDir propagate

* Handle errors when checking IsFile

* Handle and propagate errors from IsExist

* Update modules/templates/static.go

* Update modules/templates/static.go

* Return after ctx.ServerError

* Apply suggestions from code review

* Fix tests

The previous merge managed to break repo_form.go

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
zeripath 2020-11-28 02:42:08 +00:00 • committed by GitHub
parent 5b75f17043
commit 742e21aeba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 384 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

13
routers/admin/repos.go
View file

@ -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{

24
routers/api/v1/admin/adopt.go
View file

@ -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
} else if has || !com.IsDir(models.RepoPath(ctxUser.Name, repoName)) {
}
isDir, err := util.IsDir(models.RepoPath(ctxUser.Name, repoName))
if err != nil {
ctx.InternalServerError(err)
return
}
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
} else if has || !com.IsDir(models.RepoPath(ctxUser.Name, repoName)) {
}
isDir, err := util.IsDir(models.RepoPath(ctxUser.Name, repoName))
if err != nil {
ctx.InternalServerError(err)
return
}
if has || !isDir {
ctx.NotFound()
return
}

7
routers/install.go
View file

@ -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)

14
routers/user/setting/adopt.go
View file

@ -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{