* Fix secrets config mapping for HIBP

* Prevent nil pointer dereference in ConfigureSecret() Signed-off-by: Chris Cummer <[email protected]>
wtfutil · May 2, 2020 · 79d3787 · 79d3787
1 parent 2462789
commit 79d3787
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cfg/secrets.go b/cfg/secrets.go
@@ -42,7 +42,11 @@ func ConfigureSecret(
 	secret *string, // unfortunate order dependency...
 ) {
 	notWanted := func(out *string) bool {
-		return out == nil && *out != ""
+		if out == nil {
+			return false
+		}
+
+		return *out != ""
 	}
 
 	// Don't try to fetch from cred store if nothing is wanted.

diff --git a/modules/hibp/settings.go b/modules/hibp/settings.go
@@ -44,9 +44,10 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
 		globalConfig,
 		"https://haveibeenpwned.com/api",
 		"",
-		&settings.apiKey,
 		nil,
+		&settings.apiKey,
 	)
+
 	settings.colors.ok = ymlConfig.UString("colors.ok", "white")
 	settings.colors.pwned = ymlConfig.UString("colors.pwned", "red")