<?=gentitle($pgtitle);?>

+ + + + + + + + +

+ + +

+ + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

General Settings
Interface	+ + "> + Enable or Disable +
Interface	+ + + Choose which interface this rule applies to. + Hint: in most cases, you'll want to use WAN here. +
Description	+ + + You may enter a description here for your reference (not parsed). +
Memory Performance	+ + + Lowmem and ac-bnfa are recommended for low end systems, Ac: high memory, best performance, ac-std: moderate + memory,high performance, acs: small memory, moderateperformance, ac-banded: small memory,moderate performance, ac-sparsebands: small memory, high performance. + +
Choose the networks snort should inspect and whitelist.
Home net	+ + + Choose the home net you will like this rule to use. Note: Default homenet adds only local networks. + + Hint: Most users add a list offriendly ips that the firewall cant see. +
External net	+ + + Choose the external net you will like this rule to use. Note: Default external net, networks that are not home net. + + Hint: Most users should leave this setting at default. +
Block offenders	+ > + + Checking this option will automatically block hosts that generate a Snort alerts with SnortSam. +
Suppression and filtering	+ + + Choose the suppression or filtering file you will like this rule to use. + Note: Default option disables suppression and filtering. +
Choose the types of logs snort should create.
Send alerts to mainSystem logs	+ > + + Snort will send Alerts to the Pfsense system logs. +
Log to a Tcpdump file	+ > + + Snort will log packets to a tcpdump-formatted file. The file then can be analyzed by an application such as Wireshark which understands pcap file formats. + WARNING: File may become large. +
Log Alerts to a snort unified2 file	+ > + + Snort will log Alerts to a file in the UNIFIED2 format. This is a requirement for barnyard2. +
Arguments here will be automatically inserted into the snort configuration.
Advanced configuration pass through	+ <?=base64_decode($a_list['configpassthru']); ?> +
	+ + + + +
	+ Note: + Please save your settings before you click start. +

+ + + +

@@ -183,8 +181,10 @@ jQuery(document).ready(function(){ + - + + @@ -365,23 +365,22 @@ jQuery(document).ready(function(){ + + - +

-
- WARNING: This will reset all global and interface settings. -	Note: Changing any settings on this page will affect all interfaces. Please, double check if your oink code is correct and the type of snort.org account you hold.

diff --git a/config/snort-dev/snort_interfaces_suppress_edit.php b/config/snort-dev/snort_interfaces_suppress_edit.php index aa3c9905..28bb7868 100644 --- a/config/snort-dev/snort_interfaces_suppress_edit.php +++ b/config/snort-dev/snort_interfaces_suppress_edit.php @@ -120,12 +120,13 @@ if ($a_list == '') - - - - - - + + + + + + +

diff --git a/config/snort-dev/snort_interfaces_whitelist_edit.php b/config/snort-dev/snort_interfaces_whitelist_edit.php index eb6d2edb..0e426159 100644 --- a/config/snort-dev/snort_interfaces_whitelist_edit.php +++ b/config/snort-dev/snort_interfaces_whitelist_edit.php @@ -143,11 +143,12 @@ $vpnips_on = ($vpnips_chk == 'on' ? 'checked' : ''); - - - - - + + + + + + diff --git a/config/snort-dev/snort_json_post.php b/config/snort-dev/snort_json_post.php index 6ae100b1..8aa5b8ea 100644 --- a/config/snort-dev/snort_json_post.php +++ b/config/snort-dev/snort_json_post.php @@ -65,8 +65,9 @@ if ($_POST['RMlistDelRow'] == 1) // general settings save if ($_POST['snortSaveSettings'] == 1) { - - if ($_POST['dbTable'] == 'SnortSettings') + + // Save general settings + if ($_POST['dbTable'] == 'SnortSettings') { if ($_POST['ifaceTab'] == 'snort_interfaces_global') @@ -76,13 +77,18 @@ if ($_POST['snortSaveSettings'] == 1) } - if ($_POST['ifaceTab'] == 'snort_alerts_blocked') + if ($_POST['ifaceTab'] == 'snort_alerts') { - if (isset($_POST['alertnumber'])) - $_POST['arefresh'] = ($_POST['arefresh'] == '' ? off : $_POST['arefresh']); + if (!isset($_POST['arefresh'])) + $_POST['arefresh'] = ($_POST['arefresh'] == '' ? off : $_POST['arefresh']); + + } + + if ($_POST['ifaceTab'] == 'snort_blocked') + { - if (isset($_POST['blertnumber'])) + if (!isset($_POST['brefresh'])) $_POST['brefresh'] = ($_POST['brefresh'] == '' ? off : $_POST['brefresh']); } @@ -99,14 +105,64 @@ if ($_POST['snortSaveSettings'] == 1) //return true; conf_mount_rw(); - snortSql_updateSettings($_POST, 'id', '1'); + snortSql_updateSettings($_POST['dbName'], $_POST, 'id', '1'); conf_mount_ro(); } // end of dbTable SnortSettings - + + // Save rules settings + if ($_POST['dbTable'] == 'Snortrules') + { + + if ($_POST['ifaceTab'] == 'snort_interfaces_edit') + { + + if (!isset($_POST['enable'])) + $_POST['enable'] = ($_POST['enable'] == '' ? off : $_POST['enable']); + + if (!isset($_POST['blockoffenders7'])) + $_POST['blockoffenders7'] = ($_POST['blockoffenders7'] == '' ? off : $_POST['blockoffenders7']); + + if (!isset($_POST['alertsystemlog'])) + $_POST['alertsystemlog'] = ($_POST['alertsystemlog'] == '' ? off : $_POST['alertsystemlog']); + + if (!isset($_POST['tcpdumplog'])) + $_POST['tcpdumplog'] = ($_POST['tcpdumplog'] == '' ? off : $_POST['tcpdumplog']); + + if (!isset($_POST['snortunifiedlog'])) + $_POST['snortunifiedlog'] = ($_POST['snortunifiedlog'] == '' ? off : $_POST['snortunifiedlog']); + + // convert textbox to base64 + $_POST['configpassthru'] = base64_encode($_POST['configpassthru']); + + } + + // unhide tabs Json + if ($_POST['ifaceTab'] == 'snort_interfaces_edit') + { + $snortUnhideTabs = ', "snortUnhideTabs": "true"'; + } + + // unset POSTs that are markers not in db + unset($_POST['snortSaveSettings']); + unset($_POST['ifaceTab']); + + // update date on every save + $_POST['date'] = date(U); + + + //print_r($_POST); + //return true; + + conf_mount_rw(); + snortSql_updateSettings($_POST['dbName'], $_POST, 'uuid', $_POST['uuid']); + conf_mount_ro(); + + } // end of dbTable Snortrules + echo ' { - "snortgeneralsettings": "success" + "snortgeneralsettings": "success"' . $snortUnhideTabs . ' } '; return true; @@ -136,7 +192,7 @@ if ($_POST['snortSaveSuppresslist'] == 1) $_POST['suppresspassthru'] = base64_encode($_POST['suppresspassthru']); //conf_mount_rw(); - snortSql_updateSettings($_POST, 'uuid', $_POST['uuid']); + snortSql_updateSettings($_POST['dbName'], $_POST, 'uuid', $_POST['uuid']); //conf_mount_ro(); echo ' @@ -181,8 +237,11 @@ if ($_POST['snortSaveWhitelist'] == 1) $genSettings['date'] = date(U); + //print_r($_POST); + //return true; + //conf_mount_rw(); - snortSql_updateSettings($genSettings, 'uuid', $genSettings['uuid']); + snortSql_updateSettings($_POST['dbName'], $genSettings, 'uuid', $genSettings['uuid']); if ($_POST['list'] != '') { snortSql_updateWhitelistIps($_POST['dbTable'], $_POST['list'], $genSettings['filename']); diff --git a/config/snort-dev/snort_new.inc b/config/snort-dev/snort_new.inc index 5530a854..b16ec6fc 100644 --- a/config/snort-dev/snort_new.inc +++ b/config/snort-dev/snort_new.inc @@ -78,13 +78,14 @@ function snortSql_fetchAllSettingsList($table, $listFilename) } // Update settings to database -function snortSql_updateSettings($settings, $type, $id_uuid) { +function snortSql_updateSettings($dbname, $settings, $type, $id_uuid) { - $db = '/usr/local/pkg/snort/snortDB'; + $db = "/usr/local/pkg/snort/$dbname"; $mydb = sqlite_open("$db"); $table = $settings['dbTable']; // unset POSTs that are markers not in db + unset($settings['dbName']); unset($settings['dbTable']); // START add new row if not set @@ -176,7 +177,7 @@ function snortSql_fetchAllWhitelistTypes($table, $table2) $result = sqlite_query($db, - "SELECT description, filename, uuid, id FROM {$table} where id > 0; + "SELECT * FROM {$table} where id > 0; "); $chktable = sqlite_fetch_all($result, SQLITE_ASSOC); @@ -204,6 +205,8 @@ function snortSql_fetchAllWhitelistTypes($table, $table2) $final2['uuid'] = $value['uuid']; $final2['filename'] = $value['filename']; $final2['description'] = $value['description']; + $final2['snortlisttype'] = $value['snortlisttype']; + $final2['list'] = $chktable2; diff --git a/config/snort-dev/testing.php b/config/snort-dev/testing.php index 20411304..f36a9edd 100644 --- a/config/snort-dev/testing.php +++ b/config/snort-dev/testing.php @@ -1,52 +1,26 @@ ' . "\n\n"; - print_r($generalSettings); + print_r($a_suppresst); + + //foreach ($a_whitelist as $value) + //{ + //echo $value['filename'] . "\n"; + //} echo "\n" . ''; - + ?> diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php index 6b3b3a55..5ac9c186 100644 --- a/config/snort/snort_interfaces_edit.php +++ b/config/snort/snort_interfaces_edit.php @@ -428,7 +428,6 @@ echo " document.iform.performance.disabled = endis; document.iform.blockoffenders7.disabled = endis; document.iform.alertsystemlog.disabled = endis; - document.iform.whitelistname.disabled = endis; document.iform.externallistname.disabled = endis; document.iform.homelistname.disabled = endis; document.iform.suppresslistname.disabled = endis; -- cgit v1.2.3

Add the name and description of the file.