Preserve explicit false values in config defaults

internal/config/config.go

@@ -65,6 +65,9 @@ type InvestigationConfig struct {
 	BackgroundPollInterval Duration `yaml:"background_poll_interval"`
 	BackgroundLookback     Duration `yaml:"background_lookback"`
 	BackgroundBatchSize    int      `yaml:"background_batch_size"`
+
+	enabledDefined         bool
+	spamhausEnabledDefined bool
 }
 
 type OPNsenseConfig struct {
@@ -79,6 +82,42 @@ type OPNsenseConfig struct {
 	EnsureAlias        bool           `yaml:"ensure_alias"`
 	Alias              AliasConfig    `yaml:"alias"`
 	APIPaths           APIPathsConfig `yaml:"api_paths"`
+
+	ensureAliasDefined bool
+}
+
+func (c *InvestigationConfig) UnmarshalYAML(node *yaml.Node) error {
+	type raw InvestigationConfig
+	var decoded raw
+	if err := node.Decode(&decoded); err != nil {
+		return err
+	}
+	*c = InvestigationConfig(decoded)
+	for index := 0; index+1 < len(node.Content); index += 2 {
+		switch node.Content[index].Value {
+		case "enabled":
+			c.enabledDefined = true
+		case "spamhaus_enabled":
+			c.spamhausEnabledDefined = true
+		}
+	}
+	return nil
+}
+
+func (c *OPNsenseConfig) UnmarshalYAML(node *yaml.Node) error {
+	type raw OPNsenseConfig
+	var decoded raw
+	if err := node.Decode(&decoded); err != nil {
+		return err
+	}
+	*c = OPNsenseConfig(decoded)
+	for index := 0; index+1 < len(node.Content); index += 2 {
+		if node.Content[index].Value == "ensure_alias" {
+			c.ensureAliasDefined = true
+			break
+		}
+	}
+	return nil
 }
 
 type AliasConfig struct {
@@ -170,7 +209,7 @@ func (c *Config) applyDefaults() error {
 	if c.Storage.Path == "" {
 		c.Storage.Path = "./data/caddy-opnsense-blocker.db"
 	}
-	if !c.Investigation.Enabled {
+	if !c.Investigation.enabledDefined {
 		c.Investigation.Enabled = true
 	}
 	if c.Investigation.RefreshAfter.Duration == 0 {
@@ -182,7 +221,7 @@ func (c *Config) applyDefaults() error {
 	if strings.TrimSpace(c.Investigation.UserAgent) == "" {
 		c.Investigation.UserAgent = "caddy-opnsense-blocker/0.2"
 	}
-	if !c.Investigation.SpamhausEnabled {
+	if !c.Investigation.spamhausEnabledDefined {
 		c.Investigation.SpamhausEnabled = true
 	}
 	if c.Investigation.BackgroundWorkers == 0 {
@@ -225,7 +264,7 @@ func (c *Config) applyDefaults() error {
 	if c.OPNsense.APIPaths.AliasUtilDelete == "" {
 		c.OPNsense.APIPaths.AliasUtilDelete = "/api/firewall/alias_util/delete/{alias}"
 	}
-	if !c.OPNsense.EnsureAlias {
+	if !c.OPNsense.ensureAliasDefined {
 		c.OPNsense.EnsureAlias = true
 	}