X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fids.cgi;h=353643d736a14332e4f5a03e7ed4e9dc9fb50697;hp=1cf5b8dec5bcf88e574847115be9064ad5ac52c7;hb=ce0e83b3badfd2b4048762ffffc8041c7f92cb19;hpb=d192af92100ad3a7a712e2b22b3a12342b68a907

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 1cf5b8dec5..353643d736 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -43,8 +43,6 @@ my %checked=();
 my %selected=();
 my %netsettings=();
 our $errormessage = '';
-our $md5 = '0';# not '' to avoid displaying the wrong message when INSTALLMD5 not set
-our $realmd5 = '';
 our $results = '';
 our $tempdir = '';
 our $url='';
@@ -64,13 +62,11 @@ $snortsettings{'GUARDIAN_ALERTFILE'} = '/var/log/snort/alert';
 $snortsettings{'GUARDIAN_IGNOREFILE'} = '/var/ipfire/guardian/guardian.ignore';
 $snortsettings{'GUARDIAN_TARGETFILE'} = '/var/ipfire/guardian/guardian.target';
 $snortsettings{'GUARDIAN_TIMELIMIT'} = '86400';
-$snortsettings{'GUARDIAN_IGNOREFILE_CONTENT'} = `cat $snortsettings{'GUARDIAN_IGNOREFILE'}`;
 $snortsettings{'ACTION'} = '';
 $snortsettings{'ACTION2'} = '';
 $snortsettings{'RULES'} = '';
 $snortsettings{'OINKCODE'} = '';
 $snortsettings{'INSTALLDATE'} = '';
-$snortsettings{'INSTALLMD5'} = '';
 
 &Header::getcgihash(\%snortsettings, {'wantfile' => 1, 'filevar' => 'FH'});
 
@@ -105,7 +101,7 @@ if (-e "/etc/snort/snort.conf") {
     if ( $temp =~ /$_/ ){next;}
     else { push(@snortconfig,"#include \$RULE_PATH/".$_);}
   	}
-  	
+
 	# Loop over each line
 	foreach my $line (@snortconfig) {
 		# Trim the line
@@ -226,7 +222,7 @@ if (-e "/etc/snort/snort.conf") {
 				if (!exists $snortsettings{"SNORT_RULE_$rule"}) {
 					$line = "# $line";
 				}
-				
+
 			}
 
 			# Check for rule state
@@ -264,13 +260,15 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-	$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
+	#$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
+	$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2860_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
 	#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
-	$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
+	#$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
+	$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2860.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
 	#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
 } else {
-	$url="http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules-CURRENT.tar.gz";
+	$url="http://www.emergingthreats.net/rules/emerging.rules.tar.gz";
 }
 
 if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" )
@@ -285,19 +283,19 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} e
 		system ('/usr/bin/touch', "${General::swroot}/snort/enable");
 	} else {
 		unlink "${General::swroot}/snort/enable";
-	} 
+	}
 	if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
 	{
 		system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
 	} else {
 		unlink "${General::swroot}/snort/enable_green";
-	} 
+	}
 	if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
 	{
 		system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
 	} else {
 		unlink "${General::swroot}/snort/enable_blue";
-	} 
+	}
 	if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
 	{
 		system ('/usr/bin/touch', "${General::swroot}/snort/enable_orange");
@@ -309,7 +307,7 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} e
 		system ('/usr/bin/touch', "${General::swroot}/snort/enable_preprocessor_http_inspect");
 	} else {
 		unlink "${General::swroot}/snort/enable_preprocessor_http_inspect";
-	}		
+	}
 	if ($snortsettings{'ENABLE_GUARDIAN'} eq 'on')
 	{
 		system ('/usr/bin/touch', "${General::swroot}/guardian/enable");
@@ -320,6 +318,12 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} e
 	system('/usr/local/bin/snortctrl restart >/dev/null');
 
 } elsif ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "guardian" ){
+			foreach my $key (keys %snortsettings){
+				if ( $key !~ /^GUARDIAN/ ){
+					delete $snortsettings{$key};
+				}
+			}
+			&General::writehashpart("${General::swroot}/snort/settings", \%snortsettings);
 			open(IGNOREFILE, ">$snortsettings{'GUARDIAN_IGNOREFILE'}") or die "Unable to write guardian ignore file $snortsettings{'GUARDIAN_IGNOREFILE'}";
 				print IGNOREFILE $snortsettings{'GUARDIAN_IGNOREFILE_CONTENT'};
 			close(IGNOREFILE);
@@ -341,25 +345,30 @@ END
 	&General::readhash("${General::swroot}/snort/settings", \%snortsettings);
 
 if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'}) {
-	$md5 = &getmd5;
-	if (($snortsettings{'INSTALLMD5'} ne $md5) && defined $md5 ) {
-		chomp($md5);
-		my $filename = &downloadrulesfile();
-		if (defined $filename) {
-			# Check MD5sum
-			$realmd5 = `/usr/bin/md5sum $filename`;
-			chomp ($realmd5);
-			$realmd5 =~ s/^(\w+)\s.*$/$1/;
-			if ( $md5 ne $realmd5 ) {
-				$errormessage = "$Lang::tr{'invalid md5sum'} - $md5 - $realmd5";
+
+	my @df = `/bin/df -B M /var`;
+	foreach my $line (@df) {
+		next if $line =~ m/^Filesystem/;
+
+		if ($line =~ m/dev/ ) {
+		$line =~ m/^.* (\d+)M.*$/;
+		my @temp = split(/ +/,$line);
+			if ($1<300) {
+				$errormessage = "$Lang::tr{'not enough disk space'} < 300MB, /var $1MB";
 			} else {
-				$results = "<b>$Lang::tr{'installed updates'}</b>\n<pre>";
-				$results .=`/usr/local/bin/oinkmaster.pl -s -u file://$filename -C /var/ipfire/snort/oinkmaster.conf -o /etc/snort/rules 2>&1`;
-				$results .= "</pre>";
+				my $filename = &downloadrulesfile();
+				if (defined $filename) {
+						$results = "<b>$Lang::tr{'installed updates'}</b>\n<pre>";
+						$results .=`/usr/local/bin/oinkmaster.pl -s -u file://$filename -C /var/ipfire/snort/oinkmaster.conf -o /etc/snort/rules 2>&1`;
+						$results .= "</pre>";
+					}
+					unlink ($filename);
 			}
-			unlink ($filename);
+			
 		}
 	}
+
+
 }
 
 $checked{'ENABLE_SNORT'}{'off'} = '';
@@ -388,7 +397,7 @@ $selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'";
 ####################### Added for snort rules control #################################
 print "<SCRIPT LANGUAGE='JavaScript' SRC='/include/snortupdateutility.js'></SCRIPT>";
 print <<END
-<STYLE TYPE="text/css">   
+<STYLE TYPE="text/css">
 <!--
 .section {
 	border: groove;
@@ -413,6 +422,19 @@ END
 
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
+###############
+# DEBUG DEBUG
+# &Header::openbox('100%', 'left', 'DEBUG');
+# my $debugCount = 0;
+# foreach my $line (sort keys %snortsettings) {
+# print "$line = $snortsettings{$line}<br />\n";
+# $debugCount++;
+# }
+# print "&nbsp;Count: $debugCount\n";
+# &Header::closebox();
+# DEBUG DEBUG
+###############
+
 if ($errormessage) {
 	&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
 	print "<class name='base'>$errormessage\n";
@@ -456,9 +478,8 @@ print <<END
 </tr>
 <tr>
 	<td><br />
-		$Lang::tr{'ids rules license'} <a href='http://www.snort.org/' target='_blank'>http://www.snort.org</a>.<br />
-		<br />
-		$Lang::tr{'ids rules license2'} <a href='http://www.snort.org/reg-bin/userprefs.cgi' target='_blank'>USER PREFERENCES</a>, $Lang::tr{'ids rules license3'}<br />
+		$Lang::tr{'ids rules license'} <a href='https://www.snort.org/signup' target='_blank'>www.snort.org</a>$Lang::tr{'ids rules license1'}<br /><br />
+		$Lang::tr{'ids rules license2'} <a href='https://www.snort.org/account/oinkcode' target='_blank'>Get an Oinkcode</a>, $Lang::tr{'ids rules license3'}
 	</td>
 </tr>
 <tr>
@@ -469,16 +490,12 @@ print <<END
 END
 ;
 
-if ($snortsettings{'INSTALLMD5'} eq $md5) {
-	print "&nbsp;$Lang::tr{'rules already up to date'}</td>";
-} else {
-	if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} && $md5 eq $realmd5 ) {
-		$snortsettings{'INSTALLMD5'} = $realmd5;
-		$snortsettings{'INSTALLDATE'} = `/bin/date +'%Y-%m-%d'`;
-		&General::writehash("${General::swroot}/snort/settings", \%snortsettings);
-	}
-	print "&nbsp;$Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>";
+if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ) {
+	$snortsettings{'INSTALLDATE'} = `/bin/date +'%Y-%m-%d'`;
+	&General::writehash("${General::swroot}/snort/settings", \%snortsettings);
 }
+print "&nbsp;$Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>";
+
 print <<END
 </tr>
 </table>
@@ -503,11 +520,11 @@ if ( -e "/var/ipfire/guardian/guardian.conf" ) {
 	&Header::openbox('100%', 'LEFT', $Lang::tr{'guardian configuration'});
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian interface'}</td><td align='left'><input type='text' name='INTERFACE' value='$snortsettings{'GUARDIAN_INTERFACE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian timelimit'}</td><td align='left'><input type='text' name='TIMELIMIT' value='$snortsettings{'GUARDIAN_TIMELIMIT'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian logfile'}</td><td align='left'><input type='text' name='LOGFILE' value='$snortsettings{'GUARDIAN_LOGFILE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian alertfile'}</td><td align='left'><input type='text' name='ALERTFILE' value='$snortsettings{'GUARDIAN_ALERTFILE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian interface'}</td><td align='left'><input type='text' name='GUARDIAN_INTERFACE' value='$snortsettings{'GUARDIAN_INTERFACE'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian timelimit'}</td><td align='left'><input type='text' name='GUARDIAN_TIMELIMIT' value='$snortsettings{'GUARDIAN_TIMELIMIT'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian logfile'}</td><td align='left'><input type='text' name='GUARDIAN_LOGFILE' value='$snortsettings{'GUARDIAN_LOGFILE'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian alertfile'}</td><td align='left'><input type='text' name='GUARDIAN_ALERTFILE' value='$snortsettings{'GUARDIAN_ALERTFILE'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='GUARDIAN_IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'>
 END
 ;
 	print `cat /var/ipfire/guardian/guardian.ignore`;
@@ -529,7 +546,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 	&Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
 		# Output display table for rule files
 		print "<TABLE width='100%'><TR><TD VALIGN='TOP'><TABLE>";
-		
+
 		print "<form method='post'>";
 
 		# Local vars
@@ -542,6 +559,11 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 		foreach my $rulefile (sort keys(%snortrules)) {
 			my $rulechecked = '';
 
+			# Hide inkompatible Block rules
+			if ($rulefile =~'-BLOCK.rules') {
+				next;
+			}
+
 			# Check if reached half-way through rule file rules to start new column
  		if ($ruledisplaycnt > $rulecnt) {
 				print "</TABLE></TD><TD VALIGN='TOP'><TABLE>";
@@ -641,7 +663,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 					# Increment count
 					$ruledefdisplaycnt++;
 				}
-	
+
 				# If do not have second rule for row, create empty cell
 				if (($ruledefdisplaycnt % 2) != 0) {
 					print "<TD CLASS='base'></TD>";
@@ -678,31 +700,6 @@ END
 &Header::closebigbox();
 &Header::closepage();
 
-sub getmd5 {
-	# Retrieve MD5 sum from $url.md5 file
-
-	my $md5buf;
-	if ($snortsettings{'RULES'} eq 'subscripted') {
-		$md5buf = &geturl("http://dl.snort.org/reg-rules/snortrules-snapshot-2.8_s.tar.gz.md5?oink_code=$snortsettings{'OINKCODE'}");
-	} elsif ($snortsettings{'RULES'} eq 'registered') {
-		$md5buf = &geturl("http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz.md5?oink_code=$snortsettings{'OINKCODE'}");
-	} else {
-		$md5buf = &geturl("http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules-CURRENT.tar.gz.md5");
-	}
-
-	return undef unless $md5buf;
-
-	if (0) { # 1 to debug
-		my $filename='';
-		my $fh='';
-		($fh, $filename) = tempfile('/var/tmp/XXXXXXXX',SUFFIX => '.md5' );
-		binmode ($fh);
-		syswrite ($fh, $md5buf->content);
-		close($fh);
-	}
-	
-	return $md5buf->content;
-}
 sub downloadrulesfile {
 	my $return = &geturl($url);
 	return undef unless $return;