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

pfSense-pkg-suricata-3.0_5 - Bug fix update #90

Merged
merged 5 commits into from
Apr 1, 2016
Merged

pfSense-pkg-suricata-3.0_5 - Bug fix update #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e82211e
Fix typo in function name (user reported crash when updating rules).
bmeeks8 Apr 1, 2016
a05cc53
Fix out-of-memory crash when viewing huge rule sets on RULES tab.
bmeeks8 Apr 1, 2016
def66bf
Fix wrong variable name used in Bootstrap checkbox on IP REP tab.
bmeeks8 Apr 1, 2016
470ebba
Add check and warn user about chksum, segment and LRO offloading in I…
bmeeks8 Apr 1, 2016
aef0019
Bump pfSense-pkg-suricata version to 3.0_5
bmeeks8 Apr 1, 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= 4
PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
2 changes: 1 addition & 1 deletion ...ity/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_check_for_rule_updates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ function suricata_fetch_new_rules($file_url, $file_dst, $file_md5, $desc = "") {

// Test integrity of the rules file. Turn off update if file has wrong md5 hash
if ($file_md5 != trim(md5_file($file_dst))){
$update_status(gettext("{$desc} file MD5 checksum failed!") . "\n");
update_status(gettext("{$desc} file MD5 checksum failed!") . "\n");
log_error(gettext("[Suricata] {$desc} file download failed. Bad MD5 checksum."));
log_error(gettext("[Suricata] Downloaded File MD5: " . md5_file($file_dst)));
log_error(gettext("[Suricata] Expected File MD5: {$file_md5}"));
Expand Down
5 changes: 5 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 @@ -510,6 +510,11 @@ function suricata_get_config_lists($lists) {
print_info_box($savemsg);
}

if ($pconfig['enable'] == 'on' && $pconfig['ips_mode'] == 'ips_mode_inline' && (!isset($config['system']['disablechecksumoffloading']) || !isset($config['system']['disablesegmentationoffloading']) || !isset($config['system']['disablelargereceiveoffloading']))) {
print_info_box(gettext('IPS inline mode requires that Hardware Checksum, Hardware TCP Segmentation and Hardware Large Receive Offloading ' .
'all be disabled on the ') . '<b>' . gettext('System > Advanced > Networking ') . '</b>' . gettext('tab.'));
}

$tab_array = array();
$tab_array[] = array(gettext("Interfaces"), true, "/suricata/suricata_interfaces.php");
$tab_array[] = array(gettext("Global Settings"), false, "/suricata/suricata_global.php");
Expand Down
2 changes: 1 addition & 1 deletion security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_ip_reputation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
'enable_iprep',
'Enable',
'Use IP Reputation Lists on this interface. Default is NOT Checked.',
$pconfig['reverse'],
$pconfig['enable_iprep'],
'on'
));

Expand Down
80 changes: 58 additions & 22 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_rules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,19 @@ function add_title_attribute($tag, $title) {
$enablesid = suricata_load_sid_mods($a_rule[$id]['rule_sid_on']);
$disablesid = suricata_load_sid_mods($a_rule[$id]['rule_sid_off']);

/* Process AJAX request to view content of a specific rule */
if ($_POST['action'] == 'loadRule') {
if (isset($_POST['gid']) && isset($_POST['sid'])) {
$gid = $_POST['gid'];
$sid = $_POST['sid'];
print(base64_encode($rules_map[$gid][$sid]['rule']));
}
else {
print(base64_encode(gettext('Invalid rule signature - no matching rule was found!')));
}
exit;
}

if (isset($_POST['toggle']) && is_numeric($_POST['sid']) && is_numeric($_POST['gid']) && !empty($rules_map)) {

// Get the GID:SID tags embedded in the clicked rule icon.
Expand Down Expand Up @@ -694,6 +707,8 @@ function build_cat_list() {
$ruleset = $currentruleset;
$style = "";

// Determine which icons to display in the first column for rule state.
// See if the rule is auto-managed by the SID MGMT tab feature
if ($v['managed'] == 1) {
if ($v['disabled'] == 1 && $v['state_toggled'] == 1) {
$textss = '<span class="text-muted">';
Expand All @@ -708,29 +723,33 @@ function build_cat_list() {
}
$managed_count++;
}
elseif (isset($disablesid[$gid][$sid])) {
// See if the rule is in our list of user-disabled overrides
if (isset($disablesid[$gid][$sid])) {
$textss = "<span class=\"text-muted\">";
$textse = "</span>";
$disable_cnt++;
$user_disable_cnt++;
$iconb_class = 'class="fa fa-times-circle text-danger text-left"';
$title = gettext("Disabled by user. Click to toggle to enabled state");
}
elseif (($v['disabled'] == 1) && ($v['state_toggled'] == 0) && (!isset($enablesid[$gid][$sid]))) {
$textss = "<span class=\"text-muted\">";
$textse = "</span>";
$disable_cnt++;
$iconb_class = 'class="fa fa-times-circle-o text-danger text-left"';
$title = gettext("Disabled by default. Click to toggle to enabled state");
}
// See if the rule is in our list of user-enabled overrides
elseif (isset($enablesid[$gid][$sid])) {
$textss = $textse = "";
$enable_cnt++;
$user_enable_cnt++;
$iconb_class = 'class="fa fa-check-circle text-success text-left"';
$title = gettext("Enabled by user. Click to toggle to disabled state");
}
else {
// These last two checks handle normal cases of default-enabled or default disabled rules
// with no user overrides.
elseif (($v['disabled'] == 1) && ($v['state_toggled'] == 0) && (!isset($enablesid[$gid][$sid]))) {
$textss = "<span class=\"text-muted\">";
$textse = "</span>";
$disable_cnt++;
$iconb_class = 'class="fa fa-times-circle-o text-danger text-left"';
$title = gettext("Disabled by default. Click to toggle to enabled state");
}
elseif ($v['disabled'] == 0 && $v['state_toggled'] == 0) {
$textss = $textse = "";
$enable_cnt++;
$iconb_class = 'class="fa fa-check-circle-o text-success text-left"';
Expand Down Expand Up @@ -766,30 +785,30 @@ function build_cat_list() {
<i class="fa fa-adn text-warning text-left" title="<?=gettext('Action or content modified by settings on SID Mgmt tab'); ?>"></i><?=$textse; ?>
<?php endif; ?>
</td>
<td ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<?=$textss . $gid . $textse;?>
</td>
<td ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<a href="javascript: void(0)"
onclick="showRuleContents('<?=base64_encode($v['rule']);?>');"
onclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');"
title="<?=$sid_tooltip;?>"><?=$textss . $sid . $textse;?></a>
</td>
<td ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<?=$textss . $protocol . $textse;?>
</td>
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<?=$srcspan . $source;?></span>
</td>
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<?=$srcprtspan . $source_port;?></span>
</td>
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<?=$dstspan . $destination;?></span>
</td>
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td style="text-overflow: ellipsis; overflow: hidden; white-space:no-wrap" ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<?=$dstprtspan . $destination_port;?></span>
</td>
<td style="word-wrap:break-word; white-space:normal" ondblclick="showRuleContents('<?=base64_encode($v['rule']);?>');">
<td style="word-wrap:break-word; white-space:normal" ondblclick="showRuleContents('<?=$gid;?>','<?=$sid;?>');">
<?=$textss . $message . $textse;?>
</td>
</tr>
Expand All @@ -809,8 +828,8 @@ function build_cat_list() {
<div class="panel-body">
<div class="text-info content">
<b><?=gettext("Total Rules: ");?></b><?=gettext($counter);?>&nbsp;&nbsp;&nbsp;&nbsp;
<b><?=gettext("Enabled: ");?></b><?=gettext($enable_cnt);?>&nbsp;&nbsp;&nbsp;&nbsp;
<b><?=gettext("Disabled: ");?></b><?=gettext($disable_cnt);?>&nbsp;&nbsp;&nbsp;&nbsp;
<b><?=gettext("Default Enabled: ");?></b><?=gettext($enable_cnt);?>&nbsp;&nbsp;&nbsp;&nbsp;
<b><?=gettext("Default Disabled: ");?></b><?=gettext($disable_cnt);?>&nbsp;&nbsp;&nbsp;&nbsp;
<b><?=gettext("User Enabled: ");?></b><?=gettext($user_enable_cnt);?>&nbsp;&nbsp;&nbsp;&nbsp;
<b><?=gettext("User Disabled: ");?></b><?=gettext($user_disable_cnt);?>&nbsp;&nbsp;&nbsp;&nbsp;
<b><?=gettext("Auto-Managed: ");?></b><?=gettext($managed_count);?>
Expand Down Expand Up @@ -861,11 +880,28 @@ function wopen(url, name)
win.focus();
}

function showRuleContents(content) {
function showRuleContents(gid, sid) {
// Show the modal dialog with rule text
$('#rulesviewer').modal('show');
$('#modal_rule_category').html($('#selectbox').val());
$('#rulesviewer_text').text(atob(content));

$.ajax(
"<?=$_SERVER['SCRIPT_NAME'];?>",
{
type: 'post',
data: {
sid: sid,
gid: gid,
openruleset: $('#selectbox').val(),
action: 'loadRule'
},
complete: loadComplete
}
);
}

function loadComplete(req) {
$('#rulesviewer_text').text(atob(req.responseText));
$('#rulesviewer_text').attr('readonly', true);
}

Expand Down