Skip to content

Commit

Permalink
refact cscli: decisions, lapi, bouncers, machines (#3306)
Browse files Browse the repository at this point in the history
* refact "cscli decisions import"

* cobra.ExactArgs(0) -> cobra.NoArgs

* refact cscli bouncers

* refact cscli machines

* refact "cscli lapi"

* lint
  • Loading branch information
mmetc authored Oct 30, 2024
1 parent 97c1f60 commit 92662ed
Show file tree
Hide file tree
Showing 34 changed files with 1,781 additions and 1,643 deletions.
4 changes: 2 additions & 2 deletions cmd/crowdsec-cli/clialert/alerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func decisionsFromAlert(alert *models.Alert) string {
for _, decision := range alert.Decisions {
k := *decision.Type
if *decision.Simulated {
k = fmt.Sprintf("(simul)%s", k)
k = "(simul)" + k
}

v := decMap[k]
Expand Down Expand Up @@ -465,7 +465,7 @@ cscli alerts delete --range 1.2.3.0/24
cscli alerts delete -s crowdsecurity/ssh-bf"`,
DisableAutoGenTag: true,
Aliases: []string{"remove"},
Args: cobra.ExactArgs(0),
Args: cobra.NoArgs,
PreRunE: func(cmd *cobra.Command, _ []string) error {
if deleteAll {
return nil
Expand Down
72 changes: 72 additions & 0 deletions cmd/crowdsec-cli/clibouncer/add.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package clibouncer

import (
"context"
"encoding/json"
"errors"
"fmt"

"github.com/spf13/cobra"

middlewares "github.com/crowdsecurity/crowdsec/pkg/apiserver/middlewares/v1"
"github.com/crowdsecurity/crowdsec/pkg/types"
)

func (cli *cliBouncers) add(ctx context.Context, bouncerName string, key string) error {
var err error

keyLength := 32

if key == "" {
key, err = middlewares.GenerateAPIKey(keyLength)
if err != nil {
return fmt.Errorf("unable to generate api key: %w", err)
}
}

_, err = cli.db.CreateBouncer(ctx, bouncerName, "", middlewares.HashSHA512(key), types.ApiKeyAuthType)
if err != nil {
return fmt.Errorf("unable to create bouncer: %w", err)
}

switch cli.cfg().Cscli.Output {
case "human":
fmt.Printf("API key for '%s':\n\n", bouncerName)
fmt.Printf(" %s\n\n", key)
fmt.Print("Please keep this key since you will not be able to retrieve it!\n")
case "raw":
fmt.Print(key)
case "json":
j, err := json.Marshal(key)
if err != nil {
return errors.New("unable to serialize api key")
}

fmt.Print(string(j))
}

return nil
}

func (cli *cliBouncers) newAddCmd() *cobra.Command {
var key string

cmd := &cobra.Command{
Use: "add MyBouncerName",
Short: "add a single bouncer to the database",
Example: `cscli bouncers add MyBouncerName
cscli bouncers add MyBouncerName --key <random-key>`,
Args: cobra.ExactArgs(1),
DisableAutoGenTag: true,
RunE: func(cmd *cobra.Command, args []string) error {
return cli.add(cmd.Context(), args[0], key)
},
}

flags := cmd.Flags()
flags.StringP("length", "l", "", "length of the api key")
_ = flags.MarkDeprecated("length", "use --key instead")
flags.StringVarP(&key, "key", "k", "", "api key for the bouncer")

return cmd
}
Loading

0 comments on commit 92662ed

Please sign in to comment.