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

print missing "AS" values as empty strings instead of "0 " (#1867)

Browse source
This commit is contained in:
mmetc 2022-11-14 09:55:53 +01:00 committed by GitHub
parent b0889d7751
commit 3beb84bcfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/crowdsec-cli/alerts.go
View file

@ -65,7 +65,7 @@ func AlertsToTable(alerts *models.GetAlertsResponse, printMachine bool) error {
*alertItem.Source.Value, *alertItem.Source.Value,
*alertItem.Scenario, *alertItem.Scenario,
alertItem.Source.Cn, alertItem.Source.Cn,
alertItem.Source.AsNumber + " " + alertItem.Source.AsName, alertItem.Source.GetAsNumberName(),
DecisionsFromAlert(alertItem), DecisionsFromAlert(alertItem),
*alertItem.StartAt, *alertItem.StartAt,
} }

2
cmd/crowdsec-cli/alerts_table.go
View file

@ -32,7 +32,7 @@ func alertsTable(out io.Writer, alerts *models.GetAlertsResponse, printMachine b
displayVal, displayVal,
*alertItem.Scenario, *alertItem.Scenario,
alertItem.Source.Cn, alertItem.Source.Cn,
alertItem.Source.AsNumber + " " + alertItem.Source.AsName, alertItem.Source.GetAsNumberName(),
DecisionsFromAlert(alertItem), DecisionsFromAlert(alertItem),
*alertItem.StartAt, *alertItem.StartAt,
} }

2
cmd/crowdsec-cli/decisions.go
View file

@ -72,7 +72,7 @@ func DecisionsToTable(alerts *models.GetAlertsResponse, printMachine bool) error
*decisionItem.Scenario, *decisionItem.Scenario,
*decisionItem.Type, *decisionItem.Type,
alertItem.Source.Cn, alertItem.Source.Cn,
alertItem.Source.AsNumber + " " + alertItem.Source.AsName, alertItem.Source.GetAsNumberName(),
fmt.Sprintf("%d", *alertItem.EventsCount), fmt.Sprintf("%d", *alertItem.EventsCount),
*decisionItem.Duration, *decisionItem.Duration,
fmt.Sprintf("%t", *decisionItem.Simulated), fmt.Sprintf("%t", *decisionItem.Simulated),

2
cmd/crowdsec-cli/decisions_table.go
View file

@ -29,7 +29,7 @@ func decisionsTable(out io.Writer, alerts *models.GetAlertsResponse, printMachin
*decisionItem.Scenario, *decisionItem.Scenario,
*decisionItem.Type, *decisionItem.Type,
alertItem.Source.Cn, alertItem.Source.Cn,
alertItem.Source.AsNumber + " " + alertItem.Source.AsName, alertItem.Source.GetAsNumberName(),
strconv.Itoa(int(*alertItem.EventsCount)), strconv.Itoa(int(*alertItem.EventsCount)),
*decisionItem.Duration, *decisionItem.Duration,
strconv.Itoa(int(alertItem.ID)), strconv.Itoa(int(alertItem.ID)),

11
pkg/models/helpers.go
View file

@ -63,3 +63,14 @@ func (s Source) GetScope() string {
} }
return *s.Scope return *s.Scope
} }
func (s Source) GetAsNumberName() string {
ret := ""
if s.AsNumber != "0" {
ret += s.AsNumber
}
if s.AsName != "" {
ret += " " + s.AsName
}
return ret
}

4
tests/bats/80_alerts.bats
View file

@ -58,11 +58,11 @@ teardown() {
run -0 cscli alerts list -o raw run -0 cscli alerts list -o raw
assert_line "id,scope,value,reason,country,as,decisions,created_at" assert_line "id,scope,value,reason,country,as,decisions,created_at"
assert_line --regexp ".*,Ip,10.20.30.40,manual 'ban' from 'githubciXXXXXXXXXXXXXXXXXXXXXXXX([a-zA-Z0-9]{16})?',,\" \",ban:1,.*" assert_line --regexp ".*,Ip,10.20.30.40,manual 'ban' from 'githubciXXXXXXXXXXXXXXXXXXXXXXXX([a-zA-Z0-9]{16})?',,,ban:1,.*"
run -0 cscli alerts list -o raw --machine run -0 cscli alerts list -o raw --machine
assert_line "id,scope,value,reason,country,as,decisions,created_at,machine" assert_line "id,scope,value,reason,country,as,decisions,created_at,machine"
assert_line --regexp "^[0-9]+,Ip,10.20.30.40,manual 'ban' from 'githubciXXXXXXXXXXXXXXXXXXXXXXXX([a-zA-Z0-9]{16})?',,\" \",ban:1,.*,githubciXXXXXXXXXXXXXXXXXXXXXXXX([a-zA-Z0-9]{16})?$" assert_line --regexp "^[0-9]+,Ip,10.20.30.40,manual 'ban' from 'githubciXXXXXXXXXXXXXXXXXXXXXXXX([a-zA-Z0-9]{16})?',,,ban:1,.*,githubciXXXXXXXXXXXXXXXXXXXXXXXX([a-zA-Z0-9]{16})?$"
} }
@test "cscli alerts inspect" { @test "cscli alerts inspect" {