aboutsummaryrefslogtreecommitdiffstats
path: root/modules/repository/hooks.go
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-11-28 02:42:08 +0000
committerGitHub <noreply@github.com>2020-11-27 21:42:08 -0500
commit742e21aeba5c02935269a2a3681f4486019ce542 (patch)
treee1572ab13c33dec1238321170a90d42851ae4ca2 /modules/repository/hooks.go
parent5b75f17043bc2a6d0e753ae5c9c6759adad5aaac (diff)
downloadgitea-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/repository/hooks.go')
-rw-r--r--modules/repository/hooks.go19
1 files changed, 15 insertions, 4 deletions
diff --git a/modules/repository/hooks.go b/modules/repository/hooks.go
index faf9c98f8a..aba5db6719 100644
--- a/modules/repository/hooks.go
+++ b/modules/repository/hooks.go
@@ -15,7 +15,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
- "github.com/unknwon/com"
"xorm.io/builder"
)
@@ -112,15 +111,27 @@ func CheckDelegateHooks(repoPath string) ([]string, error) {
newHookPath := filepath.Join(hookDir, hookName+".d", "gitea")
cont := false
- if !com.IsExist(oldHookPath) {
+ isExist, err := util.IsExist(oldHookPath)
+ if err != nil {
+ results = append(results, fmt.Sprintf("unable to check if %s exists. Error: %v", oldHookPath, err))
+ }
+ if err == nil && !isExist {
results = append(results, fmt.Sprintf("old hook file %s does not exist", oldHookPath))
cont = true
}
- if !com.IsExist(oldHookPath + ".d") {
+ isExist, err = util.IsExist(oldHookPath + ".d")
+ if err != nil {
+ results = append(results, fmt.Sprintf("unable to check if %s exists. Error: %v", oldHookPath+".d", err))
+ }
+ if err == nil && !isExist {
results = append(results, fmt.Sprintf("hooks directory %s does not exist", oldHookPath+".d"))
cont = true
}
- if !com.IsExist(newHookPath) {
+ isExist, err = util.IsExist(newHookPath)
+ if err != nil {
+ results = append(results, fmt.Sprintf("unable to check if %s exists. Error: %v", newHookPath, err))
+ }
+ if err == nil && !isExist {
results = append(results, fmt.Sprintf("new hook file %s does not exist", newHookPath))
cont = true
}