Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-06 02:15:20 +02:00
Code Issues Releases 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

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)