Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suricata eve alert payload logging #228

Merged
merged 6 commits into from
Dec 21, 2016
Merged

Suricata eve alert payload logging #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b460b8
add option to log payload data to eve.json alerts
jeffhammett Dec 12, 2016
4b71aec
add options for eve.json alert payload logging
jeffhammett Dec 12, 2016
32b5d63
Update suricata_generate_yaml.php
jeffhammett Dec 13, 2016
010b7a8
bumped portrevision to 11
jeffhammett Dec 13, 2016
a4604f2
remove tab, add space
jeffhammett Dec 13, 2016
3d54f2e
remove spaces, add tab
jeffhammett Dec 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion security/pfSense-pkg-suricata/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= pfSense-pkg-suricata
PORTVERSION= 3.0
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= security
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
13 changes: 12 additions & 1 deletion security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_generate_yaml.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,19 @@

// EVE log output included information
$eve_out_types = "";
if ($suricatacfg['eve_log_alerts'] == 'on')
if (($suricatacfg['eve_log_alerts'] == 'on') && ($suricatacfg['eve_log_alerts_payload'] == 'off'))
$eve_out_types .= "\n - alert";

if (($suricatacfg['eve_log_alerts'] == 'on') && ($suricatacfg['eve_log_alerts_payload'] == 'on')) {
$eve_out_types .= "\n - alert:";
$eve_out_types .= "\n payload: yes # enable dumping payload in Base64";
$eve_out_types .= "\n payload-printable: yes # enable dumping payload in printable (lossy) format";
$eve_out_types .= "\n packet: yes # enable dumping of packet (without stream segments)";
$eve_out_types .= "\n http: yes # enable dumping of http fields";
$eve_out_types .= "\n tls: yes # enable dumping of tls fields";
$eve_out_types .= "\n ssh: yes # enable dumping of ssh fields";
$eve_out_types .= "\n smtp: yes # enable dumping of smtp fields";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use TAB to indent 2 lines above

}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix indent

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

} should be in the begin of the line

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there. ssh and smtp lines are still indented with spaces and } should be at line begin


if ($suricatacfg['eve_log_http'] == 'on') {
$eve_out_types .= "\n - http:";
Expand Down
12 changes: 12 additions & 0 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_interfaces_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@
$pconfig['eve_systemlog_priority'] = "notice";
if (empty($pconfig['eve_log_alerts']))
$pconfig['eve_log_alerts'] = "on";
if (empty($pconfig['eve_log_alerts_payload']))
$pconfig['eve_log_alerts_payload'] = "on";
if (empty($pconfig['eve_log_http']))
$pconfig['eve_log_http'] = "on";
if (empty($pconfig['eve_log_dns']))
Expand Down Expand Up @@ -295,6 +297,7 @@
if ($_POST['eve_systemlog_facility']) $natent['eve_systemlog_facility'] = $_POST['eve_systemlog_facility'];
if ($_POST['eve_systemlog_priority']) $natent['eve_systemlog_priority'] = $_POST['eve_systemlog_priority'];
if ($_POST['eve_log_alerts'] == "on") { $natent['eve_log_alerts'] = 'on'; }else{ $natent['eve_log_alerts'] = 'off'; }
if ($_POST['eve_log_alerts_payload'] == "on") { $natent['eve_log_alerts_payload'] = 'on'; }else{ $natent['eve_log_alerts_payload'] = 'off'; }
if ($_POST['eve_log_http'] == "on") { $natent['eve_log_http'] = 'on'; }else{ $natent['eve_log_http'] = 'off'; }
if ($_POST['eve_log_dns'] == "on") { $natent['eve_log_dns'] = 'on'; }else{ $natent['eve_log_dns'] = 'off'; }
if ($_POST['eve_log_tls'] == "on") { $natent['eve_log_tls'] = 'on'; }else{ $natent['eve_log_tls'] = 'off'; }
Expand Down Expand Up @@ -721,6 +724,14 @@ function suricata_get_config_lists($lists) {
'on'
));

$group->add(new Form_Checkbox(
'eve_log_alerts_payload',
'Alert Payloads',
'Suricata will log additional payload data with alerts.',
$pconfig['eve_log_alerts_payload'] == 'on' ? true:false,
'on'
));

$group->add(new Form_Checkbox(
'eve_log_http',
'HTTP Traffic',
Expand Down Expand Up @@ -1156,6 +1167,7 @@ function enable_change() {
disableInput('eve_output_type', disable);
disableInput('eve_log_info', disable);
disableInput('eve_log_alerts', disable);
disableInput('eve_log_alerts_payload', disable);
disableInput('eve_log_http', disable);
disableInput('eve_log_dns', disable);
disableInput('eve_log_tls', disable);
Expand Down