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 /modules/templates | |
| 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 'modules/templates')
| -rw-r--r-- | modules/templates/dynamic.go | 13 | ||||
| -rw-r--r-- | modules/templates/static.go | 15 |
2 files changed, 22 insertions, 6 deletions
diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go index bd1c4d06c5..5eda948034 100644 --- a/modules/templates/dynamic.go +++ b/modules/templates/dynamic.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "gitea.com/macaron/macaron" "github.com/unknwon/com" @@ -59,7 +60,11 @@ func Mailer() (*texttmpl.Template, *template.Template) { staticDir := path.Join(setting.StaticRootPath, "templates", "mail") - if com.IsDir(staticDir) { + isDir, err := util.IsDir(staticDir) + if err != nil { + log.Warn("Unable to check if templates dir %s is a directory. Error: %v", staticDir, err) + } + if isDir { files, err := com.StatDir(staticDir) if err != nil { @@ -84,7 +89,11 @@ func Mailer() (*texttmpl.Template, *template.Template) { customDir := path.Join(setting.CustomPath, "templates", "mail") - if com.IsDir(customDir) { + isDir, err = util.IsDir(customDir) + if err != nil { + log.Warn("Unable to check if templates dir %s is a directory. Error: %v", customDir, err) + } + if isDir { files, err := com.StatDir(customDir) if err != nil { diff --git a/modules/templates/static.go b/modules/templates/static.go index a3aff5e567..fd8e79a783 100644 --- a/modules/templates/static.go +++ b/modules/templates/static.go @@ -18,6 +18,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "gitea.com/macaron/macaron" "github.com/unknwon/com" @@ -77,8 +78,11 @@ func NewTemplateFileSystem() templateFileSystem { } customDir := path.Join(setting.CustomPath, "templates") - - if com.IsDir(customDir) { + isDir, err := util.IsDir(customDir) + if err != nil { + log.Warn("Unable to check if templates dir %s is a directory. Error: %v", customDir, err) + } + if isDir { files, err := com.StatDir(customDir) if err != nil { @@ -170,8 +174,11 @@ func Mailer() (*texttmpl.Template, *template.Template) { } customDir := path.Join(setting.CustomPath, "templates", "mail") - - if com.IsDir(customDir) { + isDir, err := util.IsDir(customDir) + if err != nil { + log.Warn("Failed to check if custom directory %s is a directory. %v", err) + } + if isDir { files, err := com.StatDir(customDir) if err != nil { |