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

Revert "Send installed appsec rules as part of the scenarios on login"

Browse source 
This reverts commit f99f003a50.
This commit is contained in:
Sebastien Blot 2024-01-08 10:54:39 +01:00
parent f99f003a50
commit ecd1a8bfed
No known key found for this signature in database
GPG key ID: DFC2902F40449F6A
1 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cmd/crowdsec/output.go
View file

@ -76,15 +76,6 @@ func runOutput(input chan types.Event, overflow chan types.Event, buckets *leaky
return fmt.Errorf("loading list of installed hub scenarios: %w", err) return fmt.Errorf("loading list of installed hub scenarios: %w", err)
} }
appsecRules, err := hub.GetInstalledItemNames(cwhub.APPSEC_RULES)
if err != nil {
return fmt.Errorf("loading list of installed hub appsec rules: %w", err)
}
installedScenariosAndAppsecRules := make([]string, 0, len(scenarios)+len(appsecRules))
installedScenariosAndAppsecRules = append(installedScenariosAndAppsecRules, scenarios...)
installedScenariosAndAppsecRules = append(installedScenariosAndAppsecRules, appsecRules...)
apiURL, err := url.Parse(apiConfig.URL) apiURL, err := url.Parse(apiConfig.URL)
if err != nil { if err != nil {
return fmt.Errorf("parsing api url ('%s'): %w", apiConfig.URL, err) return fmt.Errorf("parsing api url ('%s'): %w", apiConfig.URL, err)
@ -96,27 +87,14 @@ func runOutput(input chan types.Event, overflow chan types.Event, buckets *leaky
password := strfmt.Password(apiConfig.Password) password := strfmt.Password(apiConfig.Password)
Client, err := apiclient.NewClient(&apiclient.Config{ Client, err := apiclient.NewClient(&apiclient.Config{
MachineID: apiConfig.Login, MachineID: apiConfig.Login,
Password: password, Password: password,
Scenarios: installedScenariosAndAppsecRules, Scenarios: scenarios,
UserAgent: fmt.Sprintf("crowdsec/%s", version.String()), UserAgent: fmt.Sprintf("crowdsec/%s", version.String()),
URL: apiURL, URL: apiURL,
PapiURL: papiURL, PapiURL: papiURL,
VersionPrefix: "v1", VersionPrefix: "v1",
UpdateScenario: func() ([]string, error) { UpdateScenario: func() ([]string, error) {return hub.GetInstalledItemNames(cwhub.SCENARIOS)},
scenarios, err := hub.GetInstalledItemNames(cwhub.SCENARIOS)
if err != nil {
return nil, err
}
appsecRules, err := hub.GetInstalledItemNames(cwhub.APPSEC_RULES)
if err != nil {
return nil, err
}
ret := make([]string, 0, len(scenarios)+len(appsecRules))
ret = append(ret, scenarios...)
ret = append(ret, appsecRules...)
return ret, nil
},
}) })
if err != nil { if err != nil {
return fmt.Errorf("new client api: %w", err) return fmt.Errorf("new client api: %w", err)
@ -124,7 +102,7 @@ func runOutput(input chan types.Event, overflow chan types.Event, buckets *leaky
authResp, _, err := Client.Auth.AuthenticateWatcher(context.Background(), models.WatcherAuthRequest{ authResp, _, err := Client.Auth.AuthenticateWatcher(context.Background(), models.WatcherAuthRequest{
MachineID: &apiConfig.Login, MachineID: &apiConfig.Login,
Password: &password, Password: &password,
Scenarios: installedScenariosAndAppsecRules, Scenarios: scenarios,
}) })
if err != nil { if err != nil {
return fmt.Errorf("authenticate watcher (%s): %w", apiConfig.Login, err) return fmt.Errorf("authenticate watcher (%s): %w", apiConfig.Login, err)