cscli capi register: no error if online_api_credentials.yaml does not exist (#3645)

Author: mmetc

.golangci.yml

@@ -217,7 +217,7 @@ linters:
         - name: cyclomatic
           arguments:
             # lower this after refactoring
-            - 38
+            - 39
         - name: defer
           disabled: true
         - name: empty-block

cmd/crowdsec-cli/clicapi/capi.go

@@ -42,14 +42,6 @@ func (cli *cliCapi) NewCommand() *cobra.Command {
 		Use:               "capi [action]",
 		Short:             "Manage interaction with Central API (CAPI)",
 		DisableAutoGenTag: true,
-		PersistentPreRunE: func(_ *cobra.Command, _ []string) error {
-			cfg := cli.cfg()
-			if err := require.LAPI(cfg); err != nil {
-				return err
-			}
-
-			return require.CAPI(cfg)
-		},
 	}
 
 	cmd.AddCommand(cli.newRegisterCmd())
@@ -142,6 +134,15 @@ func (cli *cliCapi) newRegisterCmd() *cobra.Command {
 		Args:              args.NoArgs,
 		DisableAutoGenTag: true,
 		RunE: func(cmd *cobra.Command, _ []string) error {
+			cfg := cli.cfg()
+			if err := require.LAPINoOnlineCreds(cfg); err != nil {
+				return err
+			}
+
+			if err := require.CAPI(cfg); err != nil {
+				return err
+			}
+
 			return cli.register(cmd.Context(), capiUserPrefix, outputFile)
 		},
 	}
@@ -272,6 +273,14 @@ func (cli *cliCapi) newStatusCmd() *cobra.Command {
 			cfg := cli.cfg()
 			ctx := cmd.Context()
 
+			if err := require.LAPI(cfg); err != nil {
+				return err
+			}
+
+			if err := require.CAPI(cfg); err != nil {
+				return err
+			}
+
 			hub, err := require.Hub(cfg, nil)
 			if err != nil {
 				return err

cmd/crowdsec-cli/clisupport/support.go

@@ -479,7 +479,7 @@ func (cli *cliSupport) dump(ctx context.Context, outFile string) error {
 		log.Warn(err)
 	}
 
-	if err = cfg.LoadAPIServer(true); err != nil {
+	if err = cfg.LoadAPIServer(true, false); err != nil {
 		log.Warnf("could not load LAPI, skipping CAPI check")
 
 		skipCAPI = true

cmd/crowdsec-cli/require/require.go

@@ -13,8 +13,8 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/database"
 )
 
-func LAPI(c *csconfig.Config) error {
-	if err := c.LoadAPIServer(true); err != nil {
+func _lapi(c *csconfig.Config, skipOnlineCreds bool) error {
+	if err := c.LoadAPIServer(true, skipOnlineCreds); err != nil {
 		return fmt.Errorf("failed to load Local API: %w", err)
 	}
 
@@ -25,6 +25,15 @@ func LAPI(c *csconfig.Config) error {
 	return nil
 }
 
+func LAPI(c *csconfig.Config) error {
+	return _lapi(c, false)
+}
+
+// LAPINoOnlineCreds is a variant of LAPI that does not attempt to load and use capi credentials.
+func LAPINoOnlineCreds(c *csconfig.Config) error {
+	return _lapi(c, true)
+}
+
 func CAPI(c *csconfig.Config) error {
 	if c.API.Server.OnlineClient == nil {
 		return fmt.Errorf("no configuration for Central API (CAPI) in '%s'", c.FilePath)

cmd/crowdsec/main.go

@@ -274,7 +274,7 @@ func LoadConfig(configFile string, disableAgent bool, disableAPI bool, quiet boo
 	}
 
 	if !cConfig.DisableAPI {
-		if err := cConfig.LoadAPIServer(false); err != nil {
+		if err := cConfig.LoadAPIServer(false, false); err != nil {
 			return nil, err
 		}
 	}

pkg/csconfig/api.go

@@ -94,6 +94,7 @@ func (a *CTICfg) Load() error {
 	return nil
 }
 
+// Load loads the online credentials from the specified file, returning fs.ErrNotExist if the file does not exist.
 func (o *OnlineApiClientCfg) Load() error {
 	o.Credentials = new(ApiCredentialsCfg)
 
@@ -302,7 +303,7 @@ func (c *LocalApiServerCfg) ClientURL() string {
 	return ""
 }
 
-func (c *Config) LoadAPIServer(inCli bool) error {
+func (c *Config) LoadAPIServer(inCli bool, skipOnlineCreds bool) error {
 	if c.DisableAPI {
 		log.Warning("crowdsec local API is disabled from flag")
 	}
@@ -348,7 +349,7 @@ func (c *Config) LoadAPIServer(inCli bool) error {
 		c.API.Server.PapiLogLevel = &logLevel
 	}
 
-	if c.API.Server.OnlineClient != nil && c.API.Server.OnlineClient.CredentialsFilePath != "" {
+	if c.API.Server.OnlineClient != nil && c.API.Server.OnlineClient.CredentialsFilePath != "" && !skipOnlineCreds {
 		if err := c.API.Server.OnlineClient.Load(); err != nil {
 			return fmt.Errorf("loading online client credentials: %w", err)
 		}

pkg/csconfig/api_test.go

@@ -259,7 +259,7 @@ func TestLoadAPIServer(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			err := tc.input.LoadAPIServer(false)
+			err := tc.input.LoadAPIServer(false, false)
 			cstest.RequireErrorContains(t, err, tc.expectedErr)
 
 			if tc.expectedErr != "" {