diff options
| author | zeripath <art27@cantab.net> | 2020-11-28 02:42:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 21:42:08 -0500 |
| commit | 742e21aeba5c02935269a2a3681f4486019ce542 (patch) | |
| tree | e1572ab13c33dec1238321170a90d42851ae4ca2 /routers/api/v1/admin/adopt.go | |
| parent | 5b75f17043bc2a6d0e753ae5c9c6759adad5aaac (diff) | |
| download | gitea-742e21aeba5c02935269a2a3681f4486019ce542.tar.gz gitea-742e21aeba5c02935269a2a3681f4486019ce542.zip | |
Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186)
* 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>
Diffstat (limited to 'routers/api/v1/admin/adopt.go')
| -rw-r--r-- | routers/api/v1/admin/adopt.go | 24 |
1 files changed, 19 insertions, 5 deletions
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 } |