beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add console enroll name and tags in this PR

Browse source
This commit is contained in:
alteredCoder 2021-10-13 18:36:29 +02:00
parent ed010fe7d6
commit 21d279c66b
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/crowdsec-cli/console.go
View file

@ -82,6 +82,9 @@ func NewConsoleCmd() *cobra.Command {
}, },
} }
name := ""
tags := []string{}
cmdEnroll := &cobra.Command{ cmdEnroll := &cobra.Command{
Use: "enroll [enroll-key]", Use: "enroll [enroll-key]",
Short: "Enroll this instance to https://app.crowdsec.net [requires local API]", Short: "Enroll this instance to https://app.crowdsec.net [requires local API]",
@ -126,14 +129,15 @@ After running this command your will need to validate the enrollment in the weba
URL: apiURL, URL: apiURL,
VersionPrefix: "v2", VersionPrefix: "v2",
}) })
_, err = c.Auth.EnrollWatcher(context.Background(), args[0]) _, err = c.Auth.EnrollWatcher(context.Background(), args[0], name, tags)
if err != nil { if err != nil {
log.Fatalf("Could not enroll instance: %s", err) log.Fatalf("Could not enroll instance: %s", err)
} }
log.Infof("Watcher successfully enrolled. Visit https://app.crowdsec.net to accept it.") log.Infof("Watcher successfully enrolled. Visit https://app.crowdsec.net to accept it.")
}, },
} }
cmdEnroll.Flags().StringVarP(&name, "name", "n", "", "Name to appear in the console")
cmdEnroll.Flags().StringSliceVarP(&tags, "tags", "t", tags, "Tags to appear in the console")
cmdConsole.AddCommand(cmdEnroll) cmdConsole.AddCommand(cmdEnroll)
var enableAll, disableAll bool var enableAll, disableAll bool

8
pkg/apiclient/auth_service.go
View file

@ -13,7 +13,9 @@ type AuthService service
// Don't add it to the models, as they are used with LAPI, but the enroll endpoint is specific to CAPI // Don't add it to the models, as they are used with LAPI, but the enroll endpoint is specific to CAPI
type enrollRequest struct { type enrollRequest struct {
EnrollKey string `json:"attachment_key"` EnrollKey string `json:"attachment_key"`
Name string `json:"name"`
Tags []string `json:"tags"`
} }
func (s *AuthService) UnregisterWatcher(ctx context.Context) (*Response, error) { func (s *AuthService) UnregisterWatcher(ctx context.Context) (*Response, error) {
@ -61,9 +63,9 @@ func (s *AuthService) AuthenticateWatcher(ctx context.Context, auth models.Watch
return resp, nil return resp, nil
} }
func (s *AuthService) EnrollWatcher(ctx context.Context, enrollKey string) (*Response, error) { func (s *AuthService) EnrollWatcher(ctx context.Context, enrollKey string, name string, tags []string) (*Response, error) {
u := fmt.Sprintf("%s/watchers/enroll", s.client.URLPrefix) u := fmt.Sprintf("%s/watchers/enroll", s.client.URLPrefix)
req, err := s.client.NewRequest("POST", u, &enrollRequest{EnrollKey: enrollKey}) req, err := s.client.NewRequest("POST", u, &enrollRequest{EnrollKey: enrollKey, Name: name, Tags: tags})
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
pkg/apiclient/auth_service_test.go
View file

@ -228,11 +228,11 @@ func TestWatcherEnroll(t *testing.T) {
log.Fatalf("new api client: %s", err.Error()) log.Fatalf("new api client: %s", err.Error())
} }
_, err = client.Auth.EnrollWatcher(context.Background(), "goodkey") _, err = client.Auth.EnrollWatcher(context.Background(), "goodkey", "", []string{})
if err != nil { if err != nil {
t.Fatalf("unexpect auth err: %s", err) t.Fatalf("unexpect enroll err: %s", err)
} }
_, err = client.Auth.EnrollWatcher(context.Background(), "badkey") _, err = client.Auth.EnrollWatcher(context.Background(), "badkey", "", []string{})
assert.Contains(t, err.Error(), "the attachment key provided is not valid") assert.Contains(t, err.Error(), "the attachment key provided is not valid")
} }