fix: Panic in git config cache ⚓ (#90)

- Wrongly initialized config cache produces a panic when `git config ...` produces an error. (exactly why this happens is still unclear, probably leaking Git env. variables)
gabyx · Apr 4, 2022 · c2609ed · c2609ed
1 parent 6b37a2d
commit c2609ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/githooks/git/git.go b/githooks/git/git.go
@@ -54,12 +54,16 @@ func NewCtxSanitized() *Context {
 }
 
 // SetConfigCache sets the Git config cache to use.
-func (c *Context) InitConfigCache(filter func(string) bool) (err error) {
+func (c *Context) InitConfigCache(filter func(string) bool) error {
 	cache, err := NewConfigCache(*c, filter)
 
+	if err != nil {
+		return err
+	}
+
 	c.cache = &cache
 
-	return
+	return nil
 }
 
 // GetConfig gets a Git configuration value for key `key`.

diff --git a/githooks/git/gitconfig-cache.go b/githooks/git/gitconfig-cache.go
@@ -102,7 +102,7 @@ func NewConfigCache(gitx Context, filterFunc func(string) bool) (ConfigCache, er
 
 	conf, err := gitx.Get("config", "--includes", "--list", "--null", "--show-scope")
 	if err != nil {
-		return ConfigCache{}, nil
+		return ConfigCache{}, err
 	}
 
 	return parseConfig(conf, filterFunc)