aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/snort/css/style.css18
-rw-r--r--config/snort/images/new_tab_menu.pngbin3276 -> 3257 bytes
-rw-r--r--config/snort/images/transparent.gifbin0 -> 156 bytes
-rw-r--r--config/snort/javascript/row_helper.js71
-rw-r--r--config/snort/snort.inc5
-rw-r--r--config/snort/snort_alerts.php14
-rw-r--r--config/snort/snort_barnyard.php11
-rw-r--r--config/snort/snort_blocked.php25
-rw-r--r--config/snort/snort_define_servers.php69
-rw-r--r--config/snort/snort_download_updates.php15
-rw-r--r--config/snort/snort_gui.inc27
-rw-r--r--config/snort/snort_interfaces.php16
-rw-r--r--config/snort/snort_interfaces_edit.php29
-rw-r--r--config/snort/snort_interfaces_global.php17
-rw-r--r--config/snort/snort_interfaces_suppress.php3
-rw-r--r--config/snort/snort_interfaces_suppress_edit.php7
-rw-r--r--config/snort/snort_interfaces_whitelist.php3
-rw-r--r--config/snort/snort_interfaces_whitelist_edit.php23
-rw-r--r--config/snort/snort_preprocessors.php27
-rw-r--r--config/snort/snort_rules.php14
-rw-r--r--config/snort/snort_rulesets.php13
-rw-r--r--config/widget-snort/snort_alerts.inc2
-rwxr-xr-xpkg_config.7.xml2
-rwxr-xr-xpkg_config.8.xml2
24 files changed, 287 insertions, 126 deletions
diff --git a/config/snort/css/style.css b/config/snort/css/style.css
index 9c627971..b484966c 100644
--- a/config/snort/css/style.css
+++ b/config/snort/css/style.css
@@ -29,6 +29,24 @@ font-weight: bold;
text-align: center
}
+/* hack fix the hard coded fbegin link */
+#header-left2 {
+position: absolute;
+background-position: center center;
+height: 67px;
+width: 147px;
+top: -77px;
+left: 8px;
+float: left;
+z-index:999;
+}
+#header-left2 #status-link2 {
+ position: relative;
+ top: 3px;
+ left: 2px;
+}
+/* end of fbegin hack */
+
.body2 {
font-family:arial;
font-size:12px;
diff --git a/config/snort/images/new_tab_menu.png b/config/snort/images/new_tab_menu.png
index c27a3e53..f0e4cbeb 100644
--- a/config/snort/images/new_tab_menu.png
+++ b/config/snort/images/new_tab_menu.png
Binary files differ
diff --git a/config/snort/images/transparent.gif b/config/snort/images/transparent.gif
new file mode 100644
index 00000000..e7ccd741
--- /dev/null
+++ b/config/snort/images/transparent.gif
Binary files differ
diff --git a/config/snort/javascript/row_helper.js b/config/snort/javascript/row_helper.js
new file mode 100644
index 00000000..d8b4ffb4
--- /dev/null
+++ b/config/snort/javascript/row_helper.js
@@ -0,0 +1,71 @@
+// Global Variables
+var rowname = new Array(4999);
+var rowtype = new Array(4999);
+var newrow = new Array(4999);
+var rowsize = new Array(4999);
+
+for (i = 0; i < 4999; i++) {
+ rowname[i] = '';
+ rowtype[i] = '';
+ newrow[i] = '';
+ rowsize[i] = '30';
+}
+
+var field_counter_js = 0;
+var loaded = 0;
+var is_streaming_progress_bar = 0;
+var temp_streaming_text = "";
+
+var addRowTo = (function() {
+ return (function (tableId) {
+ var d, tbody, tr, td, bgc, i, ii, j;
+ d = document;
+ tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
+ tr = d.createElement("tr");
+ for (i = 0; i < field_counter_js; i++) {
+ td = d.createElement("td");
+ if(rowtype[i] == 'textbox') {
+ td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' class='formfld unknown' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
+ } else if(rowtype[i] == 'select') {
+ td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='1' name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
+ } else if(rowtype[i] == 'select_source') {
+ td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='1' name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
+ } else {
+ td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
+ }
+ tr.appendChild(td);
+ }
+ td = d.createElement("td");
+ td.rowSpan = "1";
+
+ td.innerHTML = '<input type="image" src="/themes/' + theme + '/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="Delete">';
+ tr.appendChild(td);
+ tbody.appendChild(tr);
+ totalrows++;
+ });
+})();
+
+function removeRow(el) {
+ var cel;
+ while (el && el.nodeName.toLowerCase() != "tr")
+ el = el.parentNode;
+
+ if (el && el.parentNode) {
+ cel = el.getElementsByTagName("td").item(0);
+ el.parentNode.removeChild(el);
+ }
+}
+
+function find_unique_field_name(field_name) {
+ // loop through field_name and strip off -NUMBER
+ var last_found_dash = 0;
+ for (var i = 0; i < field_name.length; i++) {
+ // is this a dash, if so, update
+ // last_found_dash
+ if (field_name.substr(i,1) == "-" )
+ last_found_dash = i;
+ }
+ if (last_found_dash < 1)
+ return field_name;
+ return(field_name.substr(0,last_found_dash));
+}
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index d0488ccf..55f6c045 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -37,7 +37,7 @@ require_once("functions.inc");
require_once("filter.inc");
/* package version */
-$snort_package_version = 'Snort 2.8.6 pkg v. 1.32';
+$snort_package_version = 'Snort 2.8.6 pkg v. 1.33';
/* find out if were in 1.2.3-RELEASE */
$pfsense_ver_chk = exec('/bin/cat /etc/version');
@@ -619,11 +619,14 @@ function snort_postinstall()
exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/logo22.png');
exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/new_tab_menu.png');
exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/page_white_text.png');
+ exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/transparent.gif');
chdir ("/usr/local/www/snort/javascript/");
exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/javascript/jquery.colorbox.js');
exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/javascript/jquery-1.4.2.min.js');
exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/javascript/mootools.js');
exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/javascript/sortableTable.js');
+ exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/javascript/row_helper.js');
+
/* install barnyard2 for 2.0 and 1.2.3 */
chdir ("/usr/local/bin/");
if ($pfsense_stable == 'yes') {
diff --git a/config/snort/snort_alerts.php b/config/snort/snort_alerts.php
index c7fd7088..0ee6a707 100644
--- a/config/snort/snort_alerts.php
+++ b/config/snort/snort_alerts.php
@@ -329,6 +329,9 @@ if ($pconfig['arefresh'] == 'on' || $pconfig['arefresh'] == '')
}
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
@@ -354,7 +357,7 @@ if ($pconfig['arefresh'] == 'on' || $pconfig['arefresh'] == '')
</tr>
<tr>
<td>
- <div id="mainarea">
+ <div id="mainarea2">
<table class="tabcont" width="100%" border="1" cellspacing="0" cellpadding="0">
<tr>
<td width="22%" colspan="0" class="listtopic">
@@ -633,7 +636,14 @@ if (is_array($alerts_array))
</div>
-<?php include("fend.inc"); ?>
+<?php
+
+include("fend.inc");
+
+echo $snort_custom_rnd_box;
+
+?>
+
<script type="text/javascript">
var myTable = {};
diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php
index 28c6d6bf..72c488f3 100644
--- a/config/snort/snort_barnyard.php
+++ b/config/snort/snort_barnyard.php
@@ -283,6 +283,9 @@ include("/usr/local/pkg/snort/snort_head.inc");
echo "{$snort_general_css}\n";
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<noscript><div class="alert" ALIGN=CENTER><img src="../themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</CENTER></div></noscript>
@@ -390,7 +393,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">General Barnyard2 Settings</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vtable">&nbsp;</td>
+ <td width="22%" valign="top" class="vncellreq2">Enable</td>
<td width="78%" class="vtable">
<?php
// <input name="enable" type="checkbox" value="yes" checked onClick="enable_change(false)">
@@ -408,7 +411,7 @@ echo '</div>' . "\n";
?>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Interface</td>
+ <td width="22%" valign="top" class="vncell2">Interface</td>
<td width="78%" class="vtable">
<select name="interface" class="formfld">
<?php
@@ -429,7 +432,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Mysql Settings</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Log to a Mysql Database</td>
+ <td width="22%" valign="top" class="vncell2">Log to a Mysql Database</td>
<td width="78%" class="vtable">
<input name="barnyard_mysql" type="text" class="formfld" id="barnyard_mysql" size="100" value="<?=htmlspecialchars($pconfig['barnyard_mysql']);?>">
<br> <span class="vexpl">Example: output database: alert, mysql, dbname=snort user=snort host=localhost password=xyz<br>
@@ -439,7 +442,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Advanced Settings</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Advanced configuration pass through</td>
+ <td width="22%" valign="top" class="vncell2">Advanced configuration pass through</td>
<td width="78%" class="vtable">
<textarea name="barnconfigpassthru" cols="100" rows="7" id="barnconfigpassthru" class="formpre"><?=htmlspecialchars($pconfig['barnconfigpassthru']);?></textarea>
<br>
diff --git a/config/snort/snort_blocked.php b/config/snort/snort_blocked.php
index c254823e..557ef4a4 100644
--- a/config/snort/snort_blocked.php
+++ b/config/snort/snort_blocked.php
@@ -253,6 +253,9 @@ if ($pconfig['brefresh'] == 'on' || $pconfig['brefresh'] == '')
}
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
@@ -286,7 +289,7 @@ if ($pconfig['brefresh'] == 'on' || $pconfig['brefresh'] == '')
<tr>
<td>
- <div id="mainarea">
+ <div id="mainarea2">
<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
@@ -321,15 +324,15 @@ if ($pconfig['brefresh'] == 'on' || $pconfig['brefresh'] == '')
</form>
</td>
</tr>
- </table>
-
+ </table>
</div>
+ <br>
</td>
</tr>
-
- <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+
+ <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td>
+ <td>
<table id="sortabletable1" class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr id="frheader">
<td width="5%" class="listhdrr">Remove</td>
@@ -460,10 +463,16 @@ if ($blocked_ips_array[0] == '')
</td>
</tr>
</table>
-
</div>
-<?php include("fend.inc"); ?>
+<?php
+
+include("fend.inc");
+
+echo $snort_custom_rnd_box;
+
+?>
+
</body>
</html>
diff --git a/config/snort/snort_define_servers.php b/config/snort/snort_define_servers.php
index e6e8ffde..c9e06c91 100644
--- a/config/snort/snort_define_servers.php
+++ b/config/snort/snort_define_servers.php
@@ -277,6 +277,9 @@ include("/usr/local/pkg/snort/snort_head.inc");
echo "{$snort_general_css}\n";
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<noscript><div class="alert" ALIGN=CENTER><img src="../themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</CENTER></div></noscript>
@@ -370,199 +373,199 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Define Servers</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define DNS_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define DNS_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_dns_servers" type="text" class="formfld" id="def_dns_servers" size="40" value="<?=htmlspecialchars($pconfig['def_dns_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define DNS_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define DNS_PORTS</td>
<td width="78%" class="vtable">
<input name="def_dns_ports" type="text" class="formfld" id="def_dns_ports" size="40" value="<?=htmlspecialchars($pconfig['def_dns_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 53.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SMTP_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define SMTP_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_smtp_servers" type="text" class="formfld" id="def_smtp_servers" size="40" value="<?=htmlspecialchars($pconfig['def_smtp_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SMTP_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define SMTP_PORTS</td>
<td width="78%" class="vtable">
<input name="def_smtp_ports" type="text" class="formfld" id="def_smtp_ports" size="40" value="<?=htmlspecialchars($pconfig['def_smtp_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 25.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define Mail_Ports</td>
+ <td width="22%" valign="top" class="vncell2">Define Mail_Ports</td>
<td width="78%" class="vtable">
<input name="def_mail_ports" type="text" class="formfld" id="def_mail_ports" size="40" value="<?=htmlspecialchars($pconfig['def_mail_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 25,143,465,691.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define HTTP_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define HTTP_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_http_servers" type="text" class="formfld" id="def_http_servers" size="40" value="<?=htmlspecialchars($pconfig['def_http_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define WWW_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define WWW_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_www_servers" type="text" class="formfld" id="def_www_servers" size="40" value="<?=htmlspecialchars($pconfig['def_www_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define HTTP_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define HTTP_PORTS</td>
<td width="78%" class="vtable">
<input name="def_http_ports" type="text" class="formfld" id="def_http_ports" size="40" value="<?=htmlspecialchars($pconfig['def_http_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 80.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SQL_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define SQL_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_sql_servers" type="text" class="formfld" id="def_sql_servers" size="40" value="<?=htmlspecialchars($pconfig['def_sql_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define ORACLE_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define ORACLE_PORTS</td>
<td width="78%" class="vtable">
<input name="def_oracle_ports" type="text" class="formfld" id="def_oracle_ports" size="40" value="<?=htmlspecialchars($pconfig['def_oracle_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 1521.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define MSSQL_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define MSSQL_PORTS</td>
<td width="78%" class="vtable">
<input name="def_mssql_ports" type="text" class="formfld" id="def_mssql_ports" size="40" value="<?=htmlspecialchars($pconfig['def_mssql_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 1433.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define TELNET_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define TELNET_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_telnet_servers" type="text" class="formfld" id="def_telnet_servers" size="40" value="<?=htmlspecialchars($pconfig['def_telnet_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define TELNET_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define TELNET_PORTS</td>
<td width="78%" class="vtable">
<input name="def_telnet_ports" type="text" class="formfld" id="def_telnet_ports" size="40" value="<?=htmlspecialchars($pconfig['def_telnet_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 23.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SNMP_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define SNMP_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_snmp_servers" type="text" class="formfld" id="def_snmp_servers" size="40" value="<?=htmlspecialchars($pconfig['def_snmp_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SNMP_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define SNMP_PORTS</td>
<td width="78%" class="vtable">
<input name="def_snmp_ports" type="text" class="formfld" id="def_snmp_ports" size="40" value="<?=htmlspecialchars($pconfig['def_snmp_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 161.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define FTP_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define FTP_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_ftp_servers" type="text" class="formfld" id="def_ftp_servers" size="40" value="<?=htmlspecialchars($pconfig['def_ftp_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define FTP_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define FTP_PORTS</td>
<td width="78%" class="vtable">
<input name="def_ftp_ports" type="text" class="formfld" id="def_ftp_ports" size="40" value="<?=htmlspecialchars($pconfig['def_ftp_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 21.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SSH_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define SSH_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_ssh_servers" type="text" class="formfld" id="def_ssh_servers" size="40" value="<?=htmlspecialchars($pconfig['def_ssh_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SSH_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define SSH_PORTS</td>
<td width="78%" class="vtable">
<input name="def_ssh_ports" type="text" class="formfld" id="def_ssh_ports" size="40" value="<?=htmlspecialchars($pconfig['def_ssh_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is Pfsense SSH port.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define POP_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define POP_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_pop_servers" type="text" class="formfld" id="def_pop_servers" size="40" value="<?=htmlspecialchars($pconfig['def_pop_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define POP2_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define POP2_PORTS</td>
<td width="78%" class="vtable">
<input name="def_pop2_ports" type="text" class="formfld" id="def_pop2_ports" size="40" value="<?=htmlspecialchars($pconfig['def_pop2_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 109.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define POP3_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define POP3_PORTS</td>
<td width="78%" class="vtable">
<input name="def_pop3_ports" type="text" class="formfld" id="def_pop3_ports" size="40" value="<?=htmlspecialchars($pconfig['def_pop3_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 110.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define IMAP_SERVERS</td>
+ <td width="22%" valign="top" class="vncell2">Define IMAP_SERVERS</td>
<td width="78%" class="vtable">
<input name="def_imap_servers" type="text" class="formfld" id="def_imap_servers" size="40" value="<?=htmlspecialchars($pconfig['def_imap_servers']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define IMAP_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define IMAP_PORTS</td>
<td width="78%" class="vtable">
<input name="def_imap_ports" type="text" class="formfld" id="def_imap_ports" size="40" value="<?=htmlspecialchars($pconfig['def_imap_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 143.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SIP_PROXY_IP</td>
+ <td width="22%" valign="top" class="vncell2">Define SIP_PROXY_IP</td>
<td width="78%" class="vtable">
<input name="def_sip_proxy_ip" type="text" class="formfld" id="def_sip_proxy_ip" size="40" value="<?=htmlspecialchars($pconfig['def_sip_proxy_ip']);?>">
<br> <span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SIP_PROXY_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define SIP_PROXY_PORTS</td>
<td width="78%" class="vtable">
<input name="def_sip_proxy_ports" type="text" class="formfld" id="def_sip_proxy_ports" size="40" value="<?=htmlspecialchars($pconfig['def_sip_proxy_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 5060:5090,16384:32768.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define AUTH_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define AUTH_PORTS</td>
<td width="78%" class="vtable">
<input name="def_auth_ports" type="text" class="formfld" id="def_auth_ports" size="40" value="<?=htmlspecialchars($pconfig['def_auth_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 113.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define FINGER_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define FINGER_PORTS</td>
<td width="78%" class="vtable">
<input name="def_finger_ports" type="text" class="formfld" id="def_finger_ports" size="40" value="<?=htmlspecialchars($pconfig['def_finger_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 79.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define IRC_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define IRC_PORTS</td>
<td width="78%" class="vtable">
<input name="def_irc_ports" type="text" class="formfld" id="def_irc_ports" size="40" value="<?=htmlspecialchars($pconfig['def_irc_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 6665,6666,6667,6668,6669,7000.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define NNTP_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define NNTP_PORTS</td>
<td width="78%" class="vtable">
<input name="def_nntp_ports" type="text" class="formfld" id="def_nntp_ports" size="40" value="<?=htmlspecialchars($pconfig['def_nntp_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 119.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define RLOGIN_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define RLOGIN_PORTS</td>
<td width="78%" class="vtable">
<input name="def_rlogin_ports" type="text" class="formfld" id="def_rlogin_ports" size="40" value="<?=htmlspecialchars($pconfig['def_rlogin_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 513.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define RSH_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define RSH_PORTS</td>
<td width="78%" class="vtable">
<input name="def_rsh_ports" type="text" class="formfld" id="def_rsh_ports" size="40" value="<?=htmlspecialchars($pconfig['def_rsh_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 514.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SSL_PORTS</td>
+ <td width="22%" valign="top" class="vncell2">Define SSL_PORTS</td>
<td width="78%" class="vtable">
<input name="def_ssl_ports" type="text" class="formfld" id="def_ssl_ports" size="40" value="<?=htmlspecialchars($pconfig['def_ssl_ports']);?>">
<br> <span class="vexpl">Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 25,443,465,636,993,995.</span></td>
diff --git a/config/snort/snort_download_updates.php b/config/snort/snort_download_updates.php
index 49007238..19373803 100644
--- a/config/snort/snort_download_updates.php
+++ b/config/snort/snort_download_updates.php
@@ -130,6 +130,9 @@ echo $snort_general_css;
echo $snort_general_css;
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<noscript><div class="alert" ALIGN=CENTER><img src="../themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</CENTER></div></noscript>
@@ -178,12 +181,6 @@ echo $snort_general_css;
<table id="maintable4" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
-
- <div id="mainarea5">
- <table id="maintable5" class="tabcont5" width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <!-- start of main content -->
<!-- grey line -->
<table height="12px" width="725px" border="0" cellpadding="5px" cellspacing="0">
@@ -344,11 +341,7 @@ echo $snort_general_css;
</td>
</tr>
</table>
- <!-- end main content -->
- </td>
- </tr>
- </table>
- </div>
+
</td>
</tr>
</table>
diff --git a/config/snort/snort_gui.inc b/config/snort/snort_gui.inc
index 424ae867..9a3f1377 100644
--- a/config/snort/snort_gui.inc
+++ b/config/snort/snort_gui.inc
@@ -72,8 +72,8 @@ $snort_custom_rnd_box = '
NiftyCheck();
Rounded("div#mainarea2","bl br tr","#FFF","#dddddd","smooth");
- Rounded("div#mainarea3","bl br tr","#FFF","#eeeeee","smooth");
- Rounded("div#mainarea4","all","#FFF","#eeeeee","smooth");
+ Rounded("div#mainarea3","bl br tr","#FFF","#dddddd","smooth");
+ Rounded("div#mainarea4","all","#FFF","#dddddd","smooth");
Rounded("div#mainarea5","all","#eeeeee","#dddddd","smooth");
//-->
@@ -123,7 +123,7 @@ font-size:12px;
}
.tabcont {
-background-color: #eeeeee;
+background-color: #dddddd;
padding-right: 12px;
padding-left: 12px;
padding-top: 12px;
@@ -138,12 +138,21 @@ padding-top: 12px;
padding-bottom: 12px;
}
-.tabcont5 {
-background-color: #dddddd;
-padding-right: 12px;
-padding-left: 12px;
-padding-top: 12px;
-padding-bottom: 12px;
+.vncell2 {
+ background-color: #eeeeee;
+ padding-right: 20px;
+ padding-left: 8px;
+ border-bottom: 1px solid #999999;
+}
+
+.vncellreq2 {
+background-color: #eeeeee;
+padding-right: 20px;
+padding-left: 8px;
+font-weight: bold;
+border-bottom-width: 1px;
+border-bottom-style: solid;
+border-bottom-color: #999999;
}
</style> ' . "\n";
diff --git a/config/snort/snort_interfaces.php b/config/snort/snort_interfaces.php
index 1c26af8a..d43c1e63 100644
--- a/config/snort/snort_interfaces.php
+++ b/config/snort/snort_interfaces.php
@@ -256,8 +256,10 @@ include_once("/usr/local/pkg/snort/snort_head.inc");
</script>
<?php include("fbegin.inc"); ?>
-<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
<?php
echo "{$snort_general_css}\n";
@@ -319,8 +321,8 @@ echo "$snort_interfaces_css\n";
</td></tr>
<tr>
<td>
- <div id="mainarea3">
- <table class="tabcont2" width="100%" border="0" cellpadding="0" cellspacing="0">
+ <div id="mainarea2">
+ <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr id="frheader">
<td width="5%" class="list">&nbsp;</td>
<td width="1%" class="list">&nbsp;</td>
@@ -466,7 +468,7 @@ echo "$snort_interfaces_css\n";
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
<div id="mainarea4">
- <table class="tabcont2" width="100%" border="0" cellpadding="0" cellspacing="0">
+ <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr id="frheader">
<td width="100%">
<span class="red"><strong>Note:</strong></span>
@@ -500,7 +502,7 @@ if ($pkg['tabs'] <> "") {
</form>
</div>
-<br><br>
+<br><br><br>
<style type="text/css">
#footer2
@@ -525,8 +527,8 @@ clear: both;
</style>
<div id="footer2">
- Snort is a registered trademark of Sourcefire, Inc, Barnyard2 is a registered trademark of securixlive.com, Orion copyright Robert Zelaya,
- Emergingthreats is a registered trademark of emergingthreats.net, Mysql is a registered trademark of Mysql.com
+ SNORT registered ® by Sourcefire, Inc, Barnyard2 registered ® by securixlive.com, Orion registered ® by Robert Zelaya,
+ Emergingthreats registered ® by emergingthreats.net, Mysql registered ® by Mysql.com
</div> <!-- Footer DIV -->
<?php
diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php
index af1b8f2f..455a6d01 100644
--- a/config/snort/snort_interfaces_edit.php
+++ b/config/snort/snort_interfaces_edit.php
@@ -395,6 +395,9 @@ include("fbegin.inc");
echo "{$snort_general_css}\n";
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<noscript><div class="alert" ALIGN=CENTER><img src="/themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</strong></div></noscript>
@@ -528,7 +531,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">General Settings</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncellreq">Interface</td>
+ <td width="22%" valign="top" class="vncellreq2">Interface</td>
<td width="22%" valign="top" class="vtable">&nbsp;
<?php
// <input name="enable" type="checkbox" value="yes" checked onClick="enable_change(false)">
@@ -545,7 +548,7 @@ echo '</div>' . "\n";
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncellreq">Interface</td>
+ <td width="22%" valign="top" class="vncellreq2">Interface</td>
<td width="78%" class="vtable">
<select name="interface" class="formfld">
<?php
@@ -563,13 +566,13 @@ echo '</div>' . "\n";
Hint: in most cases, you'll want to use WAN here.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncellreq">Description</td>
+ <td width="22%" valign="top" class="vncellreq2">Description</td>
<td width="78%" class="vtable">
<input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
<br> <span class="vexpl">You may enter a description here for your reference (not parsed).</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Memory Performance</td>
+ <td width="22%" valign="top" class="vncell2">Memory Performance</td>
<td width="78%" class="vtable">
<select name="performance" class="formfld" id="performance">
<?php
@@ -587,7 +590,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Choose the networks snort should inspect and whitelist.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Home net</td>
+ <td width="22%" valign="top" class="vncell2">Home net</td>
<td width="78%" class="vtable">
<select name="homelistname" class="formfld" id="homelistname">
<?php
@@ -619,7 +622,7 @@ echo '</div>' . "\n";
<span class="red">Hint:</span>&nbsp;Most users add a list of friendly ips that the firewall cant see.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">External net</td>
+ <td width="22%" valign="top" class="vncell2">External net</td>
<td width="78%" class="vtable">
<select name="externallistname" class="formfld" id="externallistname">
<?php
@@ -651,13 +654,13 @@ echo '</div>' . "\n";
<span class="red">Hint:</span>&nbsp;Most users should leave this setting at default.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Block offenders</td>
+ <td width="22%" valign="top" class="vncell2">Block offenders</td>
<td width="78%" class="vtable">
<input name="blockoffenders7" type="checkbox" value="on" <?php if ($pconfig['blockoffenders7'] == "on") echo "checked"; ?> onClick="enable_change(false)"><br>
Checking this option will automatically block hosts that generate a Snort alert.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Whitelist</td>
+ <td width="22%" valign="top" class="vncell2">Whitelist</td>
<td width="78%" class="vtable">
<select name="whitelistname" class="formfld" id="whitelistname">
<?php
@@ -689,7 +692,7 @@ echo '</div>' . "\n";
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Suppression and filtering</td>
+ <td width="22%" valign="top" class="vncell2">Suppression and filtering</td>
<td width="78%" class="vtable">
<select name="suppresslistname" class="formfld" id="suppresslistname">
<?php
@@ -722,19 +725,19 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Choose the types of logs snort should create.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Send alerts to main System logs</td>
+ <td width="22%" valign="top" class="vncell2">Send alerts to main System logs</td>
<td width="78%" class="vtable">
<input name="alertsystemlog" type="checkbox" value="on" <?php if ($pconfig['alertsystemlog'] == "on") echo "checked"; ?> onClick="enable_change(false)"><br>
Snort will send Alerts to the Pfsense system logs.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Log to a Tcpdump file</td>
+ <td width="22%" valign="top" class="vncell2">Log to a Tcpdump file</td>
<td width="78%" class="vtable">
<input name="tcpdumplog" type="checkbox" value="on" <?php if ($pconfig['tcpdumplog'] == "on") echo "checked"; ?> onClick="enable_change(false)"><br>
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. <span class="red"><strong>WARNING:</strong></span> File may become large.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Log Alerts to a snort unified2 file</td>
+ <td width="22%" valign="top" class="vncell2">Log Alerts to a snort unified2 file</td>
<td width="78%" class="vtable">
<input name="snortunifiedlog" type="checkbox" value="on" <?php if ($pconfig['snortunifiedlog'] == "on") echo "checked"; ?> onClick="enable_change(false)"><br>
Snort will log Alerts to a file in the UNIFIED2 format. This is a requirement for barnyard2.</td>
@@ -743,7 +746,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Arguments here will be automatically inserted into the snort configuration.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Advanced configuration pass through</td>
+ <td width="22%" valign="top" class="vncell2">Advanced configuration pass through</td>
<td width="78%" class="vtable">
<textarea wrap="off" name="configpassthru" cols="75" rows="12" id="configpassthru" class="formpre2"><?=htmlspecialchars($pconfig['configpassthru']);?></textarea>
</td>
diff --git a/config/snort/snort_interfaces_global.php b/config/snort/snort_interfaces_global.php
index 41a55a12..daa50cbf 100644
--- a/config/snort/snort_interfaces_global.php
+++ b/config/snort/snort_interfaces_global.php
@@ -263,6 +263,9 @@ include_once("fbegin.inc");
echo $snort_general_css;
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
@@ -298,7 +301,7 @@ echo $snort_general_css;
<tr>
<td colspan="2" valign="top" class="listtopic">Please Choose The Type Of Rules You Wish To Download</td>
</tr>
- <td width="22%" valign="top" class="vncell">Install Snort.org rules</td>
+ <td width="22%" valign="top" class="vncell2">Install Snort.org rules</td>
<td width="78%" class="vtable">
<table cellpadding="0" cellspacing="0">
<tr>
@@ -321,19 +324,19 @@ echo $snort_general_css;
<td colspan="2" valign="top" class="optsect_t2">Oinkmaster code</td>
</tr>
<tr>
- <td class="vncell" valign="top">Code</td>
+ <td class="vncell2" valign="top">Code</td>
<td class="vtable"><input name="oinkmastercode" type="text" class="formfld" id="oinkmastercode" size="52" value="<?=htmlspecialchars($pconfig['oinkmastercode']);?>"><br>
Obtain a snort.org Oinkmaster code and paste here.</td>
</table>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Install <strong>Emergingthreats</strong> rules</td>
+ <td width="22%" valign="top" class="vncell2">Install <strong>Emergingthreats</strong> rules</td>
<td width="78%" class="vtable">
<input name="emergingthreats" type="checkbox" value="yes" <?php if ($config['installedpackages']['snortglobal']['emergingthreats']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
Emerging Threats is an open source community that produces fastest moving and diverse Snort Rules.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Update rules automatically</td>
+ <td width="22%" valign="top" class="vncell2">Update rules automatically</td>
<td width="78%" class="vtable">
<select name="autorulesupdate7" class="formfld" id="autorulesupdate7">
<?php
@@ -351,7 +354,7 @@ echo $snort_general_css;
<td colspan="2" valign="top" class="listtopic">General Settings</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Remove blocked hosts every</td>
+ <td width="22%" valign="top" class="vncell2">Remove blocked hosts every</td>
<td width="78%" class="vtable">
<select name="rm_blocked" class="formfld" id="rm_blocked">
<?php
@@ -366,7 +369,7 @@ echo $snort_general_css;
Hint: in most cases, 1 hour is a good choice.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Alerts file description type</td>
+ <td width="22%" valign="top" class="vncell2">Alerts file description type</td>
<td width="78%" class="vtable">
<select name="snortalertlogtype" class="formfld" id="snortalertlogtype">
<?php
@@ -381,7 +384,7 @@ echo $snort_general_css;
Hint: Best pratice is to chose full logging.</span>&nbsp;<span class="red"><strong>WARNING:</strong></span>&nbsp;<strong>On change, alert file will be cleared.</strong></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Keep snort settings after deinstall</td>
+ <td width="22%" valign="top" class="vncell2">Keep snort settings after deinstall</td>
<td width="78%" class="vtable">
<input name="forcekeepsettings" id="forcekeepsettings" type="checkbox" value="yes" <?php if ($config['installedpackages']['snortglobal']['forcekeepsettings']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
Settings will not be removed during deinstall.</td>
diff --git a/config/snort/snort_interfaces_suppress.php b/config/snort/snort_interfaces_suppress.php
index b94075c7..ac0b8623 100644
--- a/config/snort/snort_interfaces_suppress.php
+++ b/config/snort/snort_interfaces_suppress.php
@@ -106,6 +106,9 @@ include("fbegin.inc");
echo $snort_general_css;
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index f1339ffe..6a88ce1b 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -183,6 +183,9 @@ include("fbegin.inc");
echo $snort_general_css;
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
@@ -245,7 +248,7 @@ echo $snort_general_css;
<td colspan="2" valign="top" class="listtopic">Add the name and description of the file.</td>
</tr>
<tr>
- <td valign="top" class="vncellreq">Name</td>
+ <td valign="top" class="vncellreq2">Name</td>
<td class="vtable">
<input name="name" type="text" id="name" size="40" value="<?=htmlspecialchars($pconfig['name']);?>" />
<br />
@@ -255,7 +258,7 @@ echo $snort_general_css;
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Description</td>
+ <td width="22%" valign="top" class="vncell2">Description</td>
<td width="78%" class="vtable">
<input name="descr" type="text" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
<br />
diff --git a/config/snort/snort_interfaces_whitelist.php b/config/snort/snort_interfaces_whitelist.php
index 53c095d4..54ee844d 100644
--- a/config/snort/snort_interfaces_whitelist.php
+++ b/config/snort/snort_interfaces_whitelist.php
@@ -106,6 +106,9 @@ include("fbegin.inc");
echo $snort_general_css;
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
diff --git a/config/snort/snort_interfaces_whitelist_edit.php b/config/snort/snort_interfaces_whitelist_edit.php
index 20758d32..4056f992 100644
--- a/config/snort/snort_interfaces_whitelist_edit.php
+++ b/config/snort/snort_interfaces_whitelist_edit.php
@@ -254,9 +254,12 @@ include("fbegin.inc");
echo $snort_general_css;
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
-<script type="text/javascript" src="/javascript/row_helper.js"></script>
+<script type="text/javascript" src="./javascript/row_helper.js"></script>
<input type='hidden' name='address_type' value='textbox' />
<script type="text/javascript">
@@ -329,7 +332,7 @@ echo $snort_general_css;
<td colspan="2" valign="top" class="listtopic">Add the name and description of the file.</td>
</tr>
<tr>
- <td valign="top" class="vncellreq">Name</td>
+ <td valign="top" class="vncellreq2">Name</td>
<td class="vtable">
<input name="name" type="text" id="name" size="40" value="<?=htmlspecialchars($pconfig['name']);?>" />
<br />
@@ -339,7 +342,7 @@ echo $snort_general_css;
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Description</td>
+ <td width="22%" valign="top" class="vncell2">Description</td>
<td width="78%" class="vtable">
<input name="descr" type="text" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
<br />
@@ -349,7 +352,7 @@ echo $snort_general_css;
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">List Type</td>
+ <td width="22%" valign="top" class="vncell2">List Type</td>
<td width="78%" class="vtable">
<select name="snortlisttype" class="formfld" id="snortlisttype">
<?php
@@ -367,7 +370,7 @@ echo $snort_general_css;
<td colspan="2" valign="top" class="listtopic">Add auto generated ips.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">WAN IPs</td>
+ <td width="22%" valign="top" class="vncell2">WAN IPs</td>
<td width="78%" class="vtable">
<input name="wanips" type="checkbox" id="wanips" size="40" value="yes" <?php if($pconfig['wanips'] == 'yes'){ echo "checked";} if($pconfig['wanips'] == ''){ echo "checked";} ?>/>
<span class="vexpl">
@@ -376,7 +379,7 @@ echo $snort_general_css;
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Wan Gateways</td>
+ <td width="22%" valign="top" class="vncell2">Wan Gateways</td>
<td width="78%" class="vtable">
<input name="wangateips" type="checkbox" id="wangateips" size="40" value="yes" <?php if($pconfig['wangateips'] == 'yes'){ echo "checked";} if($pconfig['wangateips'] == ''){ echo "checked";} ?>/>
<span class="vexpl">
@@ -385,7 +388,7 @@ echo $snort_general_css;
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Wan DNS servers</td>
+ <td width="22%" valign="top" class="vncell2">Wan DNS servers</td>
<td width="78%" class="vtable">
<input name="wandnsips" type="checkbox" id="wandnsips" size="40" value="yes" <?php if($pconfig['wandnsips'] == 'yes'){ echo "checked";} if($pconfig['wandnsips'] == ''){ echo "checked";} ?>/>
<span class="vexpl">
@@ -394,7 +397,7 @@ echo $snort_general_css;
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Virtual IP Addresses</td>
+ <td width="22%" valign="top" class="vncell2">Virtual IP Addresses</td>
<td width="78%" class="vtable">
<input name="vips" type="checkbox" id="vips" size="40" value="yes" <?php if($pconfig['vips'] == 'yes'){ echo "checked";} if($pconfig['vips'] == ''){ echo "checked";} ?>/>
<span class="vexpl">
@@ -403,7 +406,7 @@ echo $snort_general_css;
</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">VPNs</td>
+ <td width="22%" valign="top" class="vncell2">VPNs</td>
<td width="78%" class="vtable">
<input name="vpnips" type="checkbox" id="vpnips" size="40" value="yes" <?php if($pconfig['vpnips'] == 'yes'){ echo "checked";} if($pconfig['vpnips'] == ''){ echo "checked";} ?>/>
<span class="vexpl">
@@ -415,7 +418,7 @@ echo $snort_general_css;
<td colspan="2" valign="top" class="listtopic">Add your own custom ips.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncellreq"><div id="addressnetworkport">IP or CIDR items</div></td>
+ <td width="22%" valign="top" class="vncellreq2"><div id="addressnetworkport">IP or CIDR items</div></td>
<td width="78%" class="vtable">
<table id="maintable">
<tbody>
diff --git a/config/snort/snort_preprocessors.php b/config/snort/snort_preprocessors.php
index 58a13f24..363b9f85 100644
--- a/config/snort/snort_preprocessors.php
+++ b/config/snort/snort_preprocessors.php
@@ -267,6 +267,9 @@ include("/usr/local/pkg/snort/snort_head.inc");
echo "{$snort_general_css}\n";
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<noscript><div class="alert" ALIGN=CENTER><img src="../themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</CENTER></div></noscript>
@@ -360,7 +363,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Performance Statistics</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable</td>
+ <td width="22%" valign="top" class="vncell2">Enable</td>
<td width="78%" class="vtable">
<input name="perform_stat" type="checkbox" value="on" <?php if ($pconfig['perform_stat']=="on") echo "checked"; ?> onClick="enable_change(false)">
Performance Statistics for this interface.</td>
@@ -369,13 +372,13 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">HTTP Inspect Settings</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable</td>
+ <td width="22%" valign="top" class="vncell2">Enable</td>
<td width="78%" class="vtable">
<input name="http_inspect" type="checkbox" value="on" <?php if ($pconfig['http_inspect']=="on") echo "checked"; ?> onClick="enable_change(false)">
Use HTTP Inspect to Normalize/Decode and detect HTTP traffic and protocol anomalies.</td>
</tr>
<tr>
- <td valign="top" class="vncell">HTTP server flow depth</td>
+ <td valign="top" class="vncell2">HTTP server flow depth</td>
<td class="vtable">
<table cellpadding="0" cellspacing="0">
<tr>
@@ -390,7 +393,7 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">Stream5 Settings</td>
</tr>
<tr>
- <td valign="top" class="vncell">Max Queued Bytes</td>
+ <td valign="top" class="vncell2">Max Queued Bytes</td>
<td class="vtable">
<table cellpadding="0" cellspacing="0">
<tr>
@@ -401,7 +404,7 @@ echo '</div>' . "\n";
</td>
</tr>
<tr>
- <td valign="top" class="vncell">Max Queued Segs</td>
+ <td valign="top" class="vncell2">Max Queued Segs</td>
<td class="vtable">
<table cellpadding="0" cellspacing="0">
<tr>
@@ -415,43 +418,43 @@ echo '</div>' . "\n";
<td colspan="2" valign="top" class="listtopic">General Preprocessor Settings</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable <br>RPC Decode and Back Orifice detector</td>
+ <td width="22%" valign="top" class="vncell2">Enable <br>RPC Decode and Back Orifice detector</td>
<td width="78%" class="vtable">
<input name="other_preprocs" type="checkbox" value="on" <?php if ($pconfig['other_preprocs']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
Normalize/Decode RPC traffic and detects Back Orifice traffic on the network.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable <br>FTP and Telnet Normalizer</td>
+ <td width="22%" valign="top" class="vncell2">Enable <br>FTP and Telnet Normalizer</td>
<td width="78%" class="vtable">
<input name="ftp_preprocessor" type="checkbox" value="on" <?php if ($pconfig['ftp_preprocessor']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
Normalize/Decode FTP and Telnet traffic and protocol anomalies.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable <br>SMTP Normalizer</td>
+ <td width="22%" valign="top" class="vncell2">Enable <br>SMTP Normalizer</td>
<td width="78%" class="vtable">
<input name="smtp_preprocessor" type="checkbox" value="on" <?php if ($pconfig['smtp_preprocessor']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
Normalize/Decode SMTP protocol for enforcement and buffer overflows.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable <br>Portscan Detection</td>
+ <td width="22%" valign="top" class="vncell2">Enable <br>Portscan Detection</td>
<td width="78%" class="vtable">
<input name="sf_portscan" type="checkbox" value="on" <?php if ($pconfig['sf_portscan']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
Detects various types of portscans and portsweeps.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable <br>DCE/RPC2 Detection</td>
+ <td width="22%" valign="top" class="vncell2">Enable <br>DCE/RPC2 Detection</td>
<td width="78%" class="vtable">
<input name="dce_rpc_2" type="checkbox" value="on" <?php if ($pconfig['dce_rpc_2']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
The DCE/RPC preprocessor detects and decodes SMB and DCE/RPC traffic.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Enable <br>DNS Detection</td>
+ <td width="22%" valign="top" class="vncell2">Enable <br>DNS Detection</td>
<td width="78%" class="vtable">
<input name="dns_preprocessor" type="checkbox" value="on" <?php if ($pconfig['dns_preprocessor']=="on") echo "checked"; ?> onClick="enable_change(false)"><br>
The DNS preprocessor decodes DNS Response traffic and detects some vulnerabilities.</td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Define SSL_IGNORE</td>
+ <td width="22%" valign="top" class="vncell2">Define SSL_IGNORE</td>
<td width="78%" class="vtable">
<input name="def_ssl_ports_ignore" type="text" class="formfld" id="def_ssl_ports_ignore" size="40" value="<?=htmlspecialchars($pconfig['def_ssl_ports_ignore']);?>">
<br> <span class="vexpl"> Encrypted traffic should be ignored by Snort for both performance reasons and to reduce false positives.<br>
diff --git a/config/snort/snort_rules.php b/config/snort/snort_rules.php
index d61b4131..7a3f5b03 100644
--- a/config/snort/snort_rules.php
+++ b/config/snort/snort_rules.php
@@ -423,6 +423,9 @@ $pgtitle = "Snort: $id $iface_uuid $if_real Category: $currentruleset";
echo "{$snort_general_css}\n";
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<noscript><div class="alert" ALIGN=CENTER><img src="../themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</CENTER></div></noscript>
@@ -492,7 +495,7 @@ echo '</div>' . "\n";
</tr>
<tr>
<td>
- <div id="mainarea">
+ <div id="mainarea2">
<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
@@ -702,6 +705,13 @@ echo '</div>' . "\n";
</div>
-<?php include("fend.inc"); ?>
+<?php
+
+include("fend.inc");
+
+echo $snort_custom_rnd_box;
+
+?>
+
</div></body>
</html>
diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php
index f872fffb..29e4b51a 100644
--- a/config/snort/snort_rulesets.php
+++ b/config/snort/snort_rulesets.php
@@ -190,6 +190,9 @@ include("/usr/local/pkg/snort/snort_head.inc");
echo "{$snort_general_css}\n";
?>
+<!-- hack to fix the hardcoed fbegin link in header -->
+<div id="header-left2"><a href="../index.php" id="status-link2"><img src="./images/transparent.gif" border="0"></img></a></div>
+
<div class="body2">
<noscript><div class="alert" ALIGN=CENTER><img src="../themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</CENTER></div></noscript>
@@ -250,7 +253,7 @@ echo '</div>' . "\n";
</tr>
<tr>
<td>
- <div id="mainarea">
+ <div id="mainarea2">
<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
@@ -310,7 +313,13 @@ echo '</div>' . "\n";
</div>
-<?php include("fend.inc"); ?>
+<?php
+
+include("fend.inc");
+
+echo $snort_custom_rnd_box;
+
+?>
</body>
</html>
diff --git a/config/widget-snort/snort_alerts.inc b/config/widget-snort/snort_alerts.inc
index dad91a35..4f8f58de 100644
--- a/config/widget-snort/snort_alerts.inc
+++ b/config/widget-snort/snort_alerts.inc
@@ -3,7 +3,7 @@
require_once("includes/snort_alerts.inc.php");
$snort_alerts_title = "Snort Alerts";
-$snort_alerts_title_link = "snort/snort_alerts.php";
+$snort_alerts_title_link = "/snort/snort_alerts.php";
$snort_alerts_logfile = "{$g['varlog_path']}/snort/alert";
$nentries = 5;
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 1c7f7682..b8d8bdbe 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -410,7 +410,7 @@
<depends_on_package>mysql-client-5.1.44_1.tbz</depends_on_package>
<depends_on_package>snort-2.8.6_1.tbz</depends_on_package>
<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
- <version>2.8.6 pkg v. 1.32</version>
+ <version>2.8.6 pkg v. 1.33</version>
<required_version>1.2.3</required_version>
<status>Stable</status>
<configurationfile>/snort.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index d7ecb9c1..c21e9adf 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -299,7 +299,7 @@
<build_port_path>/usr/ports/databases/mysql51-client</build_port_path>
<build_port_path>/usr/ports/security/snort</build_port_path>
<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
- <version>2.8.6 pkg v. 1.32</version>
+ <version>2.8.6 pkg v. 1.33</version>
<required_version>2.0</required_version>
<status>Stable</status>
<configurationfile>/snort.xml</configurationfile>