yaml.v3: handle empty files

crowdsecurity · Mar 4, 2024 · cbee069 · cbee069
1 parent 881b9de
commit cbee069
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/pkg/csconfig/api.go b/pkg/csconfig/api.go
@@ -98,7 +98,9 @@ func (o *OnlineApiClientCfg) Load() error {
 
 	err = dec.Decode(o.Credentials)
 	if err != nil {
-		return fmt.Errorf("failed unmarshaling api server credentials configuration file '%s': %w", o.CredentialsFilePath, err)
+		if !errors.Is(err, io.EOF) {
+			return fmt.Errorf("failed unmarshaling api server credentials configuration file '%s': %w", o.CredentialsFilePath, err)
+		}
 	}
 
 	switch {
@@ -129,7 +131,9 @@ func (l *LocalApiClientCfg) Load() error {
 
 	err = dec.Decode(&l.Credentials)
 	if err != nil {
-		return fmt.Errorf("failed unmarshaling api client credential configuration file '%s': %w", l.CredentialsFilePath, err)
+		if !errors.Is(err, io.EOF) {
+			return fmt.Errorf("failed unmarshaling api client credential configuration file '%s': %w", l.CredentialsFilePath, err)
+		}
 	}
 
 	if l.Credentials == nil || l.Credentials.URL == "" {

diff --git a/pkg/csconfig/config.go b/pkg/csconfig/config.go
@@ -3,7 +3,9 @@
 package csconfig
 
 import (
+	"errors"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -63,8 +65,10 @@ func NewConfig(configFile string, disableAgent bool, disableAPI bool, inCli bool
 
 	err = dec.Decode(&cfg)
 	if err != nil {
-		// this is actually the "merged" yaml
-		return nil, "", fmt.Errorf("%s: %w", configFile, err)
+		if !errors.Is(err, io.EOF) {
+			// this is actually the "merged" yaml
+			return nil, "", fmt.Errorf("%s: %w", configFile, err)
+		}
 	}
 
 	if cfg.Prometheus == nil {

diff --git a/pkg/csconfig/simulation.go b/pkg/csconfig/simulation.go
@@ -2,7 +2,9 @@ package csconfig
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
+	"io"
 	"path/filepath"
 
 	"gopkg.in/yaml.v3"
@@ -44,7 +46,9 @@ func (c *Config) LoadSimulation() error {
 	dec := yaml.NewDecoder(bytes.NewReader(rcfg))
 	dec.KnownFields(true)
 	if err := dec.Decode(&simCfg); err != nil {
-		return fmt.Errorf("while unmarshaling simulation file '%s' : %s", c.ConfigPaths.SimulationFilePath, err)
+		if !errors.Is(err, io.EOF) {
+			return fmt.Errorf("while unmarshaling simulation file '%s' : %s", c.ConfigPaths.SimulationFilePath, err)
+		}
 	}
 	if simCfg.Simulation == nil {
 		simCfg.Simulation = new(bool)