truely don't try to send anything with empty online credentials confi…

…guration file (#657) * truely don't try to send anything with empty online credentials config file Co-authored-by: AlteredCoder <AlteredCoder>
crowdsecurity · Mar 2, 2021 · a8b16a6 · a8b16a6
1 parent a627887
commit a8b16a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
@@ -118,7 +118,7 @@ func NewServer(config *csconfig.LocalApiServerCfg) (*APIServer, error) {
 
 	var apiClient *apic
 
-	if config.OnlineClient != nil {
+	if config.OnlineClient != nil && config.OnlineClient.Credentials != nil {
 		log.Printf("Loading CAPI pusher")
 		apiClient, err = NewAPIC(config.OnlineClient, dbClient)
 		if err != nil {

diff --git a/pkg/csconfig/config.go b/pkg/csconfig/config.go
@@ -81,7 +81,6 @@ func (c *GlobalConfig) LoadConfiguration() error {
 	if err := c.LoadSimulation(); err != nil {
 		return err
 	}
-
 	if c.Crowdsec != nil {
 		if c.Crowdsec.AcquisitionFilePath != "" {
 			log.Debugf("non-empty acquisition file path %s", c.Crowdsec.AcquisitionFilePath)
@@ -157,7 +156,6 @@ func (c *GlobalConfig) LoadConfiguration() error {
 			apiclient.InsecureSkipVerify = *c.API.Client.InsecureSkipVerify
 		}
 	}
-
 	if c.API.Server != nil && !c.DisableAPI {
 		c.API.Server.DbConfig = c.DbConfig
 		c.API.Server.LogDir = c.Common.LogDir
@@ -175,10 +173,14 @@ func (c *GlobalConfig) LoadConfiguration() error {
 			if err != nil {
 				return errors.Wrap(err, fmt.Sprintf("failed unmarshaling api server credentials configuration file '%s'", c.API.Server.OnlineClient.CredentialsFilePath))
 			}
-			if c.API.Server.OnlineClient.Credentials == nil {
-				log.Debugf("online credentials not found in '%s', will not use crowdsec api", c.API.Server.OnlineClient.CredentialsFilePath)
+			if c.API.Server.OnlineClient.Credentials.Login == "" || c.API.Server.OnlineClient.Credentials.Password == "" || c.API.Server.OnlineClient.Credentials.URL == "" {
+				log.Debugf("can't load CAPI credentials from '%s' (missing field)", c.API.Server.OnlineClient.CredentialsFilePath)
+				c.API.Server.OnlineClient.Credentials = nil
 			}
 		}
+		if c.API.Server.OnlineClient == nil || c.API.Server.OnlineClient.Credentials == nil {
+			log.Printf("push and pull to crowdsec API disabled")
+		}
 	}
 
 	return nil