- |
+ |
1)
- echo "{$counter}" . gettext(" host IP addresses are currently being blocked.");
+ print($counter . gettext(" host IP addresses are currently being blocked by Snort."));
else
- echo "{$counter}" . gettext(" host IP address is currently being blocked.");
+ print($counter . gettext(" host IP address is currently being blocked Snort."));
}
else {
- echo gettext("There are currently no hosts being blocked by Snort.");
+ print(gettext("There are currently no hosts being blocked by Snort."));
}
?>
|
diff --git a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_download_updates.php b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_download_updates.php
index 4467dc9e7e31..4c87532081b2 100644
--- a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_download_updates.php
+++ b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_download_updates.php
@@ -143,33 +143,30 @@
$savemsg = gettext("Snort Rules Update logfile has been cleared.");
}
-if (isset($_POST['update'])) {
- header("Location: /snort/snort_download_rules.php");
- exit;
-}
+if (isset($_POST['mode'])) {
+// header("Location: /snort/snort_download_rules.php");
-if ($_POST['force']) {
- // Mount file system R/W since we need to remove files
- conf_mount_rw();
+ if ($_POST['mode'] == 'force') {
+ // Mount file system R/W since we need to remove files
+ conf_mount_rw();
- // Remove the existing MD5 signature files to force a download
- unlink_if_exists("{$snortdir}/{$emergingthreats_filename}.md5");
- unlink_if_exists("{$snortdir}/{$snort_community_rules_filename}.md5");
- unlink_if_exists("{$snortdir}/{$snort_rules_file}.md5");
- unlink_if_exists("{$snortdir}/{$snort_openappid_filename}.md5");
+ // Remove the existing MD5 signature files to force a download
+ unlink_if_exists("{$snortdir}/{$emergingthreats_filename}.md5");
+ unlink_if_exists("{$snortdir}/{$snort_community_rules_filename}.md5");
+ unlink_if_exists("{$snortdir}/{$snort_rules_file}.md5");
+ unlink_if_exists("{$snortdir}/{$snort_openappid_filename}.md5");
- // Revert file system to R/O.
- conf_mount_ro();
+ // Revert file system to R/O.
+ conf_mount_ro();
+ }
// Go download the updates
- header("Location: /snort/snort_download_rules.php");
+ include("/usr/local/pkg/snort/snort_check_for_rule_updates.php");
exit;
}
$pgtitle = array(gettext("Services"), gettext("Snort"), gettext("Update Rules"));
include("head.inc");
-if ($input_errors)
- print_input_errors($input_errors);
if ($savemsg) {
print_info_box($savemsg, 'success');
@@ -192,52 +189,48 @@
-
-
-
-
-
- |
- |
- |
-
-
-
-
- |
- |
- |
-
+
+
+
+
- |
- |
- |
+ |
+ |
+ |
-
- |
- |
- |
-
-
- |
- |
- |
-
-
-
+
+
+
+ |
+ |
+ |
+
+
+ |
+ |
+ |
+
+
+ |
+ |
+ |
+
+
+ |
+ |
+ |
+
+
+
+
add(new Form_StaticText(
- '',
- $last_rule_upd_time
-));
if (stristr('success', $last_rule_upd_status)) {
$last_rule_upd_status = '' . $last_rule_upd_status . '';
@@ -248,25 +241,25 @@
$group->add(new Form_StaticText(
'',
- 'Result: ' . $last_rule_upd_status
+ $last_rule_upd_time . 'Result: ' . $last_rule_upd_status . ''
));
$section->add($group);
$group = new Form_Group('Update Rules');
$group->add(new Form_Button(
'update',
- ' ' . 'Update Rules',
- '/snort/snort_download_rules.php',
+ 'Update Rules',
+ '#',
'fa-check'
-))->removeClass('btn-primary')->addClass('btn-info')->addClass('btn-sm');
+))->removeClass('btn-primary')->addClass('btn-info')->addClass('btn-sm')->setAttribute('title', gettext("Check for and install only new updates"));
$group->add(new Form_Button(
'force',
- ' ' . 'Force Update',
- null,
+ 'Force Update',
+ '#',
'fa-download'
))->removeClass('btn-primary')->addClass('btn-warning')->addClass('btn-sm')->setAttribute('title', gettext("Force an update of all enabled rule sets"));
$group->setHelp('Click UPDATE RULES to check for and automatically apply any new posted updates for selected rules packages. Clicking FORCE UPDATE ' .
- 'will zero out the MD5 hashes and force the download and application of the latest versions of the enabled rules packages.');
+ 'will zero out the MD5 hashes and force the download and application of the latest versions of the enabled rules packages.');
$section->add($group);
$form->add($section);
@@ -276,14 +269,14 @@
$group->add(new Form_Button(
'view',
- ' ' . 'View Log',
+ 'View Log',
'#',
'fa-file-text-o'
))->removeClass('btn-primary')->addClass('btn-info')->addClass('btn-sm')->setAttribute('title', gettext('View rules update log'))->setAttribute('data-target', '#vwupdlog')->setAttribute('data-toggle', 'modal');
$group->add(new Form_Button(
'clear',
- ' ' . 'Clear Log',
+ 'Clear Log',
null,
'fa-trash'
))->removeClass('btn-primary')->addClass('btn-danger')->addClass('btn-sm')->setAttribute('title', gettext('Clear rules update log'));
@@ -314,6 +307,15 @@
))->removeClass('form-control')->addClass('row-fluid col-sm-10')->setAttribute('rows', '10')->setAttribute('wrap', 'off');
$form->add($modal);
+// Create a Modal Dialog for displaying a spinning icon "please wait" message while
+// updating the rule sets
+$modal = new Modal('Rules Update Task', 'updrulesdlg', false, 'Close');
+$modal->addInput(new Form_StaticText (
+ null,
+ 'Checking for updated rule sets may take a while ... please wait ' . ''
+));
+$form->add($modal);
+
$form->add($section);
print($form);
@@ -341,10 +343,42 @@ function getRuleUpdateLog() {
});
}
+ function doRuleUpdates(mode) {
+ var ajaxRequest;
+ if (typeof mode == "undefined") {
+ var mode = "update";
+ }
+
+ // Show the "please wait" modal
+ $('#updrulesdlg').modal('show');
+
+ ajaxRequest = $.ajax({
+ url: "/snort/snort_download_updates.php",
+ type: "post",
+ data: { mode: mode }
+ });
+
+ // Deal with the results of the above ajax call
+ ajaxRequest.done(function (response, textStatus, jqXHR) {
+
+ // Close the "please wait" modal
+ $('#updrulesdlg').modal('hide');
+ });
+ }
+
$('#vwupdlog').on('shown.bs.modal', function() {
getRuleUpdateLog();
});
+ //-- Click handlers ---------------------------------
+ $('#update').click(function() {
+ doRuleUpdates('update');
+ });
+
+ $('#force').click(function() {
+ doRuleUpdates('force');
+ });
+
});
//]]>
diff --git a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_interface_logs.php b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_interface_logs.php
index dcda85477989..b56b5b2f8057 100644
--- a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_interface_logs.php
+++ b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_interface_logs.php
@@ -99,7 +99,7 @@
print_info_box($savemsg);
function build_logfile_list() {
- global $snortlogdir;
+ global $snortlogdir, $if_real;
$list = array();
@@ -173,7 +173,6 @@ function build_logfile_list() {
print($form);
?>
-