snort, correct line endings, finx cron loglimit code

author: robiscool <robrob2626@yahoo.com> 2010-09-09 23:44:05 -0700
committer: robiscool <robrob2626@yahoo.com> 2010-09-09 23:44:05 -0700
commit: 9541bd01267fe9d34dd0127e20c269aab82353da (patch)
tree: fe92437e599204e5570ca4d783b79565acfd8c2c /config/snort/snort_rulesets.php
parent: dc553fe8e5fd9d05a27c678c46873df0ce71c7fe (diff)
download: pfsense-packages-9541bd01267fe9d34dd0127e20c269aab82353da.tar.gz
pfsense-packages-9541bd01267fe9d34dd0127e20c269aab82353da.tar.bz2
pfsense-packages-9541bd01267fe9d34dd0127e20c269aab82353da.zip
1 files changed, 186 insertions, 175 deletions
diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php
index e7838c9f..42dc27e6 100644
--- a/config/snort/snort_rulesets.php
+++ b/config/snort/snort_rulesets.php
@@ -1,32 +1,32 @@
 <?php
 /* $Id$ */
 /*
-	snort_rulesets.php
-	Copyright (C) 2006 Scott Ullrich
-	Copyright (C) 2009 Robert Zelaya
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
+ snort_rulesets.php
+ Copyright (C) 2006 Scott Ullrich
+ Copyright (C) 2009 Robert Zelaya
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
 
 require_once("guiconfig.inc");
 require_once("/usr/local/pkg/snort/snort_gui.inc");
@@ -42,8 +42,8 @@ $a_nat = &$config['installedpackages']['snortglobal']['rule'];
 
 $id = $_GET['id'];
 if (isset($_POST['id']))
-	$id = $_POST['id'];
-	
+$id = $_POST['id'];
+
 
 if (isset($id) && $a_nat[$id]) {
 
@@ -66,34 +66,34 @@ $pgtitle = "Snort: Interface $id $iface_uuid $if_real Categories";
 $isrulesfolderempty = exec("ls -A /usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules/*.rules");
 if ($isrulesfolderempty == "") {
 
-include("/usr/local/pkg/snort/snort_head.inc");
-include("fbegin.inc");
+	include("/usr/local/pkg/snort/snort_head.inc");
+	include("fbegin.inc");
 
-echo "<p class=\"pgtitle\">";
-if($pfsense_stable == 'yes'){echo $pgtitle;}
-echo "</p>\n";
+	echo "<p class=\"pgtitle\">";
+	if($pfsense_stable == 'yes'){echo $pgtitle;}
+	echo "</p>\n";
 
-echo "<body link=\"#000000\" vlink=\"#000000\" alink=\"#000000\">";
+	echo "<body link=\"#000000\" vlink=\"#000000\" alink=\"#000000\">";
 
-echo "
+	echo "
 <table width=\"99%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n
    <tr>\n
    		<td>\n";
-	
-echo '<div class="snorttabs" style="margin:1px 0px; width:775px;">' . "\n";
-echo '<!-- Tabbed bar code -->' . "\n";
-echo '<ul class="snorttabs">' . "\n";
+
+	echo '<div class="snorttabs" style="margin:1px 0px; width:775px;">' . "\n";
+	echo '<!-- Tabbed bar code -->' . "\n";
+	echo '<ul class="snorttabs">' . "\n";
 	echo '<li><a href="/snort/snort_interfaces.php"><span>Snort Interfaces</span></a></li>' . "\n";
 	echo "<li><a href=\"/snort/snort_interfaces_edit.php?id={$id}\"><span>If Settings</span></a></li>\n";
-    echo "<li class=\"snorttabs_active\"><a href=\"/snort/snort_rulesets.php?id={$id}\"><span>Categories</span></a></li>\n";
-    echo "<li><a href=\"/snort/snort_rules.php?id={$id}\"><span>Rules</span></a></li>\n";
+	echo "<li class=\"snorttabs_active\"><a href=\"/snort/snort_rulesets.php?id={$id}\"><span>Categories</span></a></li>\n";
+	echo "<li><a href=\"/snort/snort_rules.php?id={$id}\"><span>Rules</span></a></li>\n";
 	echo "<li><a href=\"/snort/snort_define_servers.php?id={$id}\"><span>Servers</span></a></li>\n";
-    echo "<li><a href=\"/snort/snort_preprocessors.php?id={$id}\"><span>Preprocessors</span></a></li>\n";
-    echo "<li><a href=\"/snort/snort_barnyard.php?id={$id}\"><span>Barnyard2</span></a></li>\n";
-echo '</ul>' . "\n";
-echo '</div>' . "\n";		
+	echo "<li><a href=\"/snort/snort_preprocessors.php?id={$id}\"><span>Preprocessors</span></a></li>\n";
+	echo "<li><a href=\"/snort/snort_barnyard.php?id={$id}\"><span>Barnyard2</span></a></li>\n";
+	echo '</ul>' . "\n";
+	echo '</div>' . "\n";
 
-echo  		"</td>\n
+	echo  		"</td>\n
   </tr>\n
   <tr>\n
     <td>\n
@@ -114,74 +114,75 @@ echo  		"</td>\n
 \n
 <p>\n\n";
 
-echo "Please click on the Update Rules tab to install your selected rule sets. $isrulesfolderempty";
-include("fend.inc");
+	echo "Please click on the Update Rules tab to install your selected rule sets. $isrulesfolderempty";
+	include("fend.inc");
 
-echo "</body>";
-echo "</html>";
+	echo "</body>";
+	echo "</html>";
 
-exit(0);
+	exit(0);
 
 }
 
-	/* alert file */
+/* alert file */
 $d_snortconfdirty_path = "/var/run/snort_conf_{$iface_uuid}_{$if_real}.dirty";
-	
-	/* this will exec when alert says apply */
-	if ($_POST['apply']) {
-		
-		if (file_exists($d_snortconfdirty_path)) {
+
+/* this will exec when alert says apply */
+if ($_POST['apply']) {
+
+	if (file_exists($d_snortconfdirty_path)) {
 			
-			write_config();
+		write_config();
 			
-			sync_snort_package_all($id, $if_real, $iface_uuid);
-			sync_snort_package();
+		sync_snort_package_all($id, $if_real, $iface_uuid);
+		sync_snort_package();
 			
-			unlink($d_snortconfdirty_path);
+		unlink($d_snortconfdirty_path);
 			
-		}
-		
 	}
 
-	if ($_POST["Submit"]) {
+}
+
+if ($_POST["Submit"]) {
 	$enabled_items = "";
 	$isfirst = true;
 	if (is_array($_POST['toenable'])) {
-	foreach($_POST['toenable'] as $toenable) {
-		if(!$isfirst)
+		foreach($_POST['toenable'] as $toenable) {
+			if(!$isfirst)
 			$enabled_items .= "||";
-		$enabled_items .= "{$toenable}";
-		$isfirst = false;
-	}
+			$enabled_items .= "{$toenable}";
+			$isfirst = false;
+		}
 	}else{
-	$enabled_items = $_POST['toenable'];
+		$enabled_items = $_POST['toenable'];
 	}
 	$a_nat[$id]['rulesets'] = $enabled_items;
-	
+
 	write_config();
-	
+
 	touch($d_snortconfdirty_path);
-	
-		header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' );
-		header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
-		header( 'Cache-Control: no-store, no-cache, must-revalidate' );
-		header( 'Cache-Control: post-check=0, pre-check=0', false );
-		header( 'Pragma: no-cache' );
-		sleep(2);
-		sync_snort_package_all($id, $if_real, $iface_uuid);
-		header("Location: /snort/snort_rulesets.php?id=$id");
+
+	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' );
+	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
+	header( 'Cache-Control: no-store, no-cache, must-revalidate' );
+	header( 'Cache-Control: post-check=0, pre-check=0', false );
+	header( 'Pragma: no-cache' );
+	sleep(2);
+	sync_snort_package_all($id, $if_real, $iface_uuid);
+	header("Location: /snort/snort_rulesets.php?id=$id");
 
 }
 
 $enabled_rulesets = $a_nat[$id]['rulesets'];
 if($enabled_rulesets)
-	$enabled_rulesets_array = split("\|\|", $enabled_rulesets);
+$enabled_rulesets_array = split("\|\|", $enabled_rulesets);
 
 include("/usr/local/pkg/snort/snort_head.inc");
 
 ?>
 
-<body link="#000000" vlink="#000000" alink="#000000">
+<body
+	link="#000000" vlink="#000000" alink="#000000">
 
 <?php include("fbegin.inc"); ?>
 <?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
@@ -191,120 +192,130 @@ 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 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>
+<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>
 
 <?php
 
 echo "<form action=\"snort_rulesets.php?id={$id}\" method=\"post\" name=\"iform\" id=\"iform\">";
 
-?>
-
-<?php
+?> <?php
 
-	/* Display message */
+/* Display message */
 
-	if ($input_errors) {
+if ($input_errors) {
 	print_input_errors($input_errors); // TODO: add checks
-	}
+}
 
-	if ($savemsg) {
+if ($savemsg) {
 	print_info_box2($savemsg);
-	}
+}
 
-	if (file_exists($d_snortconfdirty_path)) {
+if (file_exists($d_snortconfdirty_path)) {
 	echo '<p>';
 
-		if($savemsg) {
-			print_info_box_np2("{$savemsg}");
-		}else{
-			print_info_box_np2('
+	if($savemsg) {
+		print_info_box_np2("{$savemsg}");
+	}else{
+		print_info_box_np2('
 			The Snort configuration has changed and snort needs to be restarted on this interface.<br>
 			You must apply the changes in order for them to take effect.<br>
 			');
-		}
 	}
+}
 
 ?>
 
 <table width="99%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-   		<td>
-		
-<?php
-echo '<div class="snorttabs" style="margin:1px 0px; width:775px;">' . "\n";
-echo '<!-- Tabbed bar code -->' . "\n";
-echo '<ul class="snorttabs">' . "\n";
-	echo '<li><a href="/snort/snort_interfaces.php"><span>Snort Interfaces</span></a></li>' . "\n";
-	echo "<li><a href=\"/snort/snort_interfaces_edit.php?id={$id}\"><span>If Settings</span></a></li>\n";
-    echo "<li class=\"snorttabs_active\"><a href=\"/snort/snort_rulesets.php?id={$id}\"><span>Categories</span></a></li>\n";
-    echo "<li><a href=\"/snort/snort_rules.php?id={$id}\"><span>Rules</span></a></li>\n";
-	echo "<li><a href=\"/snort/snort_define_servers.php?id={$id}\"><span>Servers</span></a></li>\n";
-    echo "<li><a href=\"/snort/snort_preprocessors.php?id={$id}\"><span>Preprocessors</span></a></li>\n";
-    echo "<li><a href=\"/snort/snort_barnyard.php?id={$id}\"><span>Barnyard2</span></a></li>\n";
-echo '</ul>' . "\n";
-echo '</div>' . "\n";
-?>
-
-	</td>
+	<tr>
+		<td><?php
+		echo '<div class="snorttabs" style="margin:1px 0px; width:775px;">' . "\n";
+		echo '<!-- Tabbed bar code -->' . "\n";
+		echo '<ul class="snorttabs">' . "\n";
+		echo '<li><a href="/snort/snort_interfaces.php"><span>Snort Interfaces</span></a></li>' . "\n";
+		echo "<li><a href=\"/snort/snort_interfaces_edit.php?id={$id}\"><span>If Settings</span></a></li>\n";
+		echo "<li class=\"snorttabs_active\"><a href=\"/snort/snort_rulesets.php?id={$id}\"><span>Categories</span></a></li>\n";
+		echo "<li><a href=\"/snort/snort_rules.php?id={$id}\"><span>Rules</span></a></li>\n";
+		echo "<li><a href=\"/snort/snort_define_servers.php?id={$id}\"><span>Servers</span></a></li>\n";
+		echo "<li><a href=\"/snort/snort_preprocessors.php?id={$id}\"><span>Preprocessors</span></a></li>\n";
+		echo "<li><a href=\"/snort/snort_barnyard.php?id={$id}\"><span>Barnyard2</span></a></li>\n";
+		echo '</ul>' . "\n";
+		echo '</div>' . "\n";
+		?></td>
 	</tr>
-		<tr>
+	<tr>
 		<td>
 		<div id="mainarea2">
-			<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td>
-						<table id="sortabletable1" class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
-						    <tr id="frheader">
-								<td width="5%" class="listhdrr">Enabled</td>
-								<td class="listhdrr"><?php if($snort_arch == 'x86'){echo 'Ruleset: Rules that end with "so.rules" are shared object rules.';}else{echo 'Shared object rules are "so.rules" and not available on Pfsense 2.0 64 bit.';}?></td>
-								<!-- <td class="listhdrr">Description</td> -->
-							</tr>
-<?php
-	$dir = "/usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules/";
-	$dh  = opendir($dir);
-	while (false !== ($filename = readdir($dh))) {
-   		$files[] = $filename;
-	}
-	sort($files);
-	foreach($files as $file) {
-		if(!stristr($file, ".rules"))
-			continue;
-		echo "<tr>\n";
-		echo "<td align=\"center\" valign=\"top\">";
-		if(is_array($enabled_rulesets_array))
-			if(in_array($file, $enabled_rulesets_array)) {
-				$CHECKED = " checked=\"checked\"";
-			} else {
-				$CHECKED = "";
-			}
-		else
-			$CHECKED = "";
-		echo "	\n<input type='checkbox' name='toenable[]' value='$file' {$CHECKED} />\n";
-		echo "</td>\n";
-		echo "<td>\n";
-		echo "<a href='snort_rules.php?id={$id}&openruleset=/usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules/" . urlencode($file) . "'>{$file}</a>\n";
-		echo "</td>\n</tr>\n\n";
-		//echo "<td>";
-		//echo "description";
-		//echo "</td>";
-	}
-
-?>
-						</table>
-		    		</td>
-		  		</tr>
-		  		<tr><td>&nbsp;</td></tr>
-		  		<tr><td>Check the rulesets that you would like Snort to load at startup.</td></tr>
-		  		<tr><td>&nbsp;</td></tr>
-		  		<tr><td><input value="Save" type="submit" name="Submit" id="Submit" /></td></tr>
-			</table>
+		<table id="maintable" class="tabcont" width="100%" border="0"
+			cellpadding="0" cellspacing="0">
+			<tr>
+				<td>
+				<table id="sortabletable1" class="sortable" width="100%" border="0"
+					cellpadding="0" cellspacing="0">
+					<tr id="frheader">
+						<td width="5%" class="listhdrr">Enabled</td>
+						<td class="listhdrr"><?php if($snort_arch == 'x86'){echo 'Ruleset: Rules that end with "so.rules" are shared object rules.';}else{echo 'Shared object rules are "so.rules" and not available on Pfsense 2.0 64 bit.';}?></td>
+						<!-- <td class="listhdrr">Description</td> -->
+					</tr>
+					<?php
+					$dir = "/usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules/";
+					$dh  = opendir($dir);
+					while (false !== ($filename = readdir($dh))) {
+						$files[] = $filename;
+					}
+					sort($files);
+					foreach($files as $file) {
+						if(!stristr($file, ".rules"))
+						continue;
+						echo "<tr>\n";
+						echo "<td align=\"center\" valign=\"top\">";
+						if(is_array($enabled_rulesets_array))
+						if(in_array($file, $enabled_rulesets_array)) {
+							$CHECKED = " checked=\"checked\"";
+						} else {
+							$CHECKED = "";
+						}
+						else
+						$CHECKED = "";
+						echo "	\n<input type='checkbox' name='toenable[]' value='$file' {$CHECKED} />\n";
+						echo "</td>\n";
+						echo "<td>\n";
+						echo "<a href='snort_rules.php?id={$id}&openruleset=/usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules/" . urlencode($file) . "'>{$file}</a>\n";
+						echo "</td>\n</tr>\n\n";
+						//echo "<td>";
+						//echo "description";
+						//echo "</td>";
+					}
+
+					?>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td>Check the rulesets that you would like Snort to load at startup.</td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td><input value="Save" type="submit" name="Submit" id="Submit" /></td>
+			</tr>
+		</table>
 		</div>
-	</td>
-  </tr>
+		</td>
+	</tr>
 </table>
 
 </form>
@@ -313,20 +324,20 @@ echo '</div>' . "\n";
 
 </div>
 
-<?php
+					<?php
 
-include("fend.inc");
+					include("fend.inc");
 
-echo $snort_custom_rnd_box;
+					echo $snort_custom_rnd_box;
 
-?>
+					?>
 
 </body>
 </html>
 
-<?php
+					<?php
 
-	function get_snort_rule_file_description($filename) {
+					function get_snort_rule_file_description($filename) {
 		$filetext = file_get_contents($filename);
 
 	}
author	robiscool <robrob2626@yahoo.com>	2010-09-09 23:44:05 -0700
committer	robiscool <robrob2626@yahoo.com>	2010-09-09 23:44:05 -0700
commit	9541bd01267fe9d34dd0127e20c269aab82353da (patch)
tree	fe92437e599204e5570ca4d783b79565acfd8c2c /config/snort/snort_rulesets.php
parent	dc553fe8e5fd9d05a27c678c46873df0ce71c7fe (diff)
download	pfsense-packages-9541bd01267fe9d34dd0127e20c269aab82353da.tar.gz pfsense-packages-9541bd01267fe9d34dd0127e20c269aab82353da.tar.bz2 pfsense-packages-9541bd01267fe9d34dd0127e20c269aab82353da.zip