up

Author: blotus

cmd/crowdsec-cli/cliconsole/console.go

@@ -12,6 +12,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/fatih/color"
 	"github.com/go-openapi/strfmt"
@@ -107,6 +108,9 @@ func (cli *cliConsole) enroll(ctx context.Context, key string, name string, over
 
 	if autoEnroll {
 		log.Infof("Please visit the following URL to enroll your instance: %s", autoResp.Url)
+		log.Infof("This link is valid for the next %s.", time.Until(time.UnixMilli(autoResp.ExpiresAt)).Round(time.Minute))
+		log.Info("Please restart crowdsec after accepting the enrollment.")
+
 	} else {
 		log.Info("Watcher successfully enrolled. Visit https://app.crowdsec.net to accept it.")
 		log.Info("Please restart crowdsec after accepting the enrollment.")

pkg/apiclient/auth_service.go

@@ -12,15 +12,16 @@ type AuthService service
 
 // Don't add it to the models, as they are used with LAPI, but the enroll endpoint is specific to CAPI
 type enrollRequest struct {
-	EnrollKey  string   `json:"attachment_key"`
+	EnrollKey  string   `json:"attachment_key,omitempty"`
 	Name       string   `json:"name"`
 	Tags       []string `json:"tags"`
-	Overwrite  bool     `json:"overwrite"`
+	Overwrite  bool     `json:"overwrite,omitempty"`
 	AutoEnroll bool     `json:"autoenroll"`
 }
 
 type autoEnrollResponse struct {
-	Url string `json:"url"`
+	Url       string `json:"url"`
+	ExpiresAt int64  `json:"expire_at"`
 }
 
 func (s *AuthService) UnregisterWatcher(ctx context.Context) (*Response, error) {
@@ -76,7 +77,16 @@ func (s *AuthService) AuthenticateWatcher(ctx context.Context, auth models.Watch
 func (s *AuthService) EnrollWatcher(ctx context.Context, enrollKey string, name string, tags []string, overwrite bool, autoEnroll bool) (autoEnrollResponse, *Response, error) {
 	u := fmt.Sprintf("%s/watchers/enroll", s.client.URLPrefix)
 
-	req, err := s.client.PrepareRequest(ctx, http.MethodPost, u, &enrollRequest{EnrollKey: enrollKey, Name: name, Tags: tags, Overwrite: overwrite, AutoEnroll: autoEnroll})
+	b := &enrollRequest{EnrollKey: enrollKey, Name: name, Tags: tags, AutoEnroll: autoEnroll}
+	// Console refuses enroll requests if overwrite or key is set even to falsy values with autoenroll, so we only set them if they are needed
+	if overwrite {
+		b.Overwrite = true
+	}
+	if enrollKey != "" {
+		b.EnrollKey = enrollKey
+	}
+
+	req, err := s.client.PrepareRequest(ctx, http.MethodPost, u, b)
 	if err != nil {
 		return autoEnrollResponse{}, nil, err
 	}

pkg/apiclient/auth_service_test.go

@@ -256,7 +256,7 @@ func TestWatcherEnroll(t *testing.T) {
 			log.Print("good key")
 			w.WriteHeader(http.StatusOK)
 			fmt.Fprint(w, `{"statusCode": 200, "message": "OK"}`)
-		} else if parsedBody["attachment_key"] == "" && parsedBody["autoenroll"].(bool) {
+		} else if parsedBody["attachment_key"] == nil && parsedBody["autoenroll"].(bool) {
 			log.Print("autoenroll")
 			w.WriteHeader(http.StatusOK)
 			fmt.Fprint(w, `{"url": "https://example.com/enroll"}`)