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/setting/setting.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 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 708dc28233..79e7751905 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -25,6 +25,7 @@ import ( "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/user" + "code.gitea.io/gitea/modules/util" shellquote "github.com/kballard/go-shellquote" "github.com/unknwon/com" @@ -498,7 +499,11 @@ func NewContext() { createPIDFile(PIDFile) } - if com.IsFile(CustomConf) { + isFile, err := util.IsFile(CustomConf) + if err != nil { + log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err) + } + if isFile { if err := Cfg.Append(CustomConf); err != nil { log.Fatal("Failed to load custom conf '%s': %v", CustomConf, err) } @@ -739,7 +744,11 @@ func NewContext() { return } cfg := ini.Empty() - if com.IsFile(CustomConf) { + isFile, err := util.IsFile(CustomConf) + if err != nil { + log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err) + } + if isFile { if err := cfg.Append(CustomConf); err != nil { log.Error("failed to load custom conf %s: %v", CustomConf, err) return @@ -908,7 +917,10 @@ func NewContext() { UI.SearchRepoDescription = Cfg.Section("ui").Key("SEARCH_REPO_DESCRIPTION").MustBool(true) UI.UseServiceWorker = Cfg.Section("ui").Key("USE_SERVICE_WORKER").MustBool(true) - HasRobotsTxt = com.IsFile(path.Join(CustomPath, "robots.txt")) + HasRobotsTxt, err = util.IsFile(path.Join(CustomPath, "robots.txt")) + if err != nil { + log.Error("Unable to check if %s is a file. Error: %v", path.Join(CustomPath, "robots.txt"), err) + } newMarkup() @@ -1005,7 +1017,11 @@ func loadOrGenerateInternalToken(sec *ini.Section) string { // Save secret cfgSave := ini.Empty() - if com.IsFile(CustomConf) { + isFile, err := util.IsFile(CustomConf) + if err != nil { + log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err) + } + if isFile { // Keeps custom settings if there is already something. if err := cfgSave.Append(CustomConf); err != nil { log.Error("Failed to load custom conf '%s': %v", CustomConf, err) |