]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/ids.cgi
ids.cgi: htmlcleanup, change html tags from uppercase to lowercase
[people/teissler/ipfire-2.x.git] / html / cgi-bin / ids.cgi
index 52a57fd4f8584a6e922d4aa1dd0c71f582848eca..984e795e72bf002446ee150166a174ef56c114e5 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 ###############################################################################
 
-
-use LWP::UserAgent;
-use File::Copy;
-use File::Temp qw/ tempfile tempdir /;
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+use File::Copy;
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
+
+$a = new CGI;
+
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -43,8 +44,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='';
@@ -69,7 +68,8 @@ $snortsettings{'ACTION2'} = '';
 $snortsettings{'RULES'} = '';
 $snortsettings{'OINKCODE'} = '';
 $snortsettings{'INSTALLDATE'} = '';
-$snortsettings{'INSTALLMD5'} = '';
+$snortsettings{'FILE'} = '';
+$snortsettings{'UPLOAD'} = '';
 
 &Header::getcgihash(\%snortsettings, {'wantfile' => 1, 'filevar' => 'FH'});
 
@@ -97,7 +97,7 @@ if (-e "/etc/snort/snort.conf") {
        close(FILE);
        open(FILE, ">/etc/snort/snort.conf") or die 'Unable to write snort config file.';
 
-    my @rules = `cd /etc/snort/rules/ && ls *.rules`;    # With this loop the rule might be display with correct rulepath set
+    my @rules = `cd /etc/snort/rules/ && ls *.rules 2>/dev/null`;    # With this loop the rule might be display with correct rulepath set
        foreach (@rules) {
        chomp $_;
        my $temp = join(";",@snortconfig);
@@ -146,7 +146,7 @@ if (-e "/etc/snort/snort.conf") {
                                        # If see more than one dashed line, (start to) create rule file description
                                        if ($dashlinecnt > 1) {
                                                # Check for a line starting with a #
-                                               if ($ruleline =~ /^\#/) {
+                                               if ($ruleline =~ /^\#/ and $ruleline !~ /^\#alert/) {
                                                        # Create tempruleline
                                                        my $tempruleline = $ruleline;
 
@@ -263,22 +263,22 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-       $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-2853_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";
+       $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2953.tar.gz/$snortsettings{'OINKCODE'}";
 } 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-2853.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-       #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsettings{'OINKCODE'}";
+} elsif ($snortsettings{'RULES'} eq 'community') {
+       $url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz";
 } else {
-       $url="http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules-CURRENT.tar.gz";
+       $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
 }
 
 if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" )
 {
        $errormessage = $Lang::tr{'invalid input for oink code'} unless (
            ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/)  ||
-           ($snortsettings{'RULESTYPE'} eq 'nothing' )       );
+           ($snortsettings{'RULES'} eq 'nothing' ) ||
+           ($snortsettings{'RULES'} eq 'emerging' ) ||
+           ($snortsettings{'RULES'} eq 'community' ));
 
        &General::writehash("${General::swroot}/snort/settings", \%snortsettings);
        if ($snortsettings{'ENABLE_SNORT'} eq 'on')
@@ -321,8 +321,14 @@ 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{'IGNOREFILE_CONTENT'};
+                               print IGNOREFILE $snortsettings{'GUARDIAN_IGNOREFILE_CONTENT'};
                        close(IGNOREFILE);
                        open(GUARDIAN, ">/var/ipfire/guardian/guardian.conf") or die "Unable to write guardian conf /var/ipfire/guardian/guardian.conf";
                                print GUARDIAN <<END
@@ -341,24 +347,43 @@ END
         # INSTALLMD5 is not in the form, so not retrieved by getcgihash
        &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";
+if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} || $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'}) {
+
+       my @df = `/bin/df -B M /var`;
+       foreach my $line (@df) {
+               next if $line =~ m/^Filesystem/;
+               my $return;
+
+               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>";
+
+                               if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ){
+
+                                       &downloadrulesfile();
+                                       sleep(3);
+                                       $return = `cat /var/tmp/log 2>/dev/null`;
+
+                               } elsif ( $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'} ) {
+                                       my $upload = $a->param("UPLOAD");
+                                       open UPLOADFILE, ">/var/tmp/snortrules.tar.gz";
+                                       binmode $upload;
+                                       while ( <$upload> ) {
+                                       print UPLOADFILE;
+                                       }
+                                       close UPLOADFILE;
+                               }
+
+                                       if ($return =~ "ERROR"){
+                                               $errormessage = "<br /><pre>".$return."</pre>";
+                                       } else {
+                                               system("/usr/local/bin/oinkmaster.pl -v -s -u file:///var/tmp/snortrules.tar.gz -C /var/ipfire/snort/oinkmaster.conf -o /etc/snort/rules >>/var/tmp/log 2>&1 &");
+                                               sleep(2);
+                                       }
                        }
-                       unlink ($filename);
                }
        }
 }
@@ -380,6 +405,7 @@ $checked{'ENABLE_GUARDIAN'}{'on'} = '';
 $checked{'ENABLE_GUARDIAN'}{$snortsettings{'ENABLE_GUARDIAN'}} = "checked='checked'";
 $selected{'RULES'}{'nothing'} = '';
 $selected{'RULES'}{'community'} = '';
+$selected{'RULES'}{'emerging'} = '';
 $selected{'RULES'}{'registered'} = '';
 $selected{'RULES'}{'subscripted'} = '';
 $selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'";
@@ -387,9 +413,9 @@ $selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'";
 &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
 
 ####################### Added for snort rules control #################################
-print "<SCRIPT LANGUAGE='JavaScript' SRC='/include/snortupdateutility.js'></SCRIPT>";
+print "<script language='JavaScript' src='/include/snortupdateutility.js'></script>";
 print <<END
-<STYLE TYPE="text/css">
+<style type="text/css">
 <!--
 .section {
        border: groove;
@@ -407,13 +433,26 @@ print <<END
        background-color: #DCDCDC;
 }
 -->
-</STYLE>
+</style>
 END
 ;
 #######################  End added for snort rules control  #################################
 
 &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";
@@ -421,7 +460,38 @@ if ($errormessage) {
        &Header::closebox();
 }
 
-&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system2'});
+my $return = `pidof oinkmaster.pl -x`;
+chomp($return);
+if ($return) {
+       &Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='10;'>" );
+       print <<END;
+       <table>
+               <tr><td>
+                               <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
+                       <td>
+                               $Lang::tr{'snort working'}
+               <tr><td colspan='2' align='center'>
+                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
+                       </form>
+               <tr><td colspan='2' align='left'><pre>
+END
+       my @output = `tail -20 /var/tmp/log`;
+       foreach (@output) {
+               print "$_";
+       }
+       print <<END;
+                       </pre>
+               </table>
+END
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit;
+       refreshpage();
+}
+
+&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'});
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'>
 <tr><td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />GREEN Snort
@@ -441,7 +511,7 @@ if ( -e "/var/ipfire/guardian/guardian.conf" ) {
 print <<END
 </td></tr>
 <tr>
-       <td><hr /></td>
+       <td><br><br></td>
 </tr>
 <tr>
        <td><b>$Lang::tr{'ids rules update'}</b></td>
@@ -449,6 +519,7 @@ print <<END
 <tr>
        <td><select name='RULES'>
                                <option value='nothing' $selected{'RULES'}{'nothing'} >$Lang::tr{'no'}</option>
+                               <option value='emerging' $selected{'RULES'}{'emerging'} >$Lang::tr{'emerging rules'}</option>
                                <option value='community' $selected{'RULES'}{'community'} >$Lang::tr{'community rules'}</option>
                                <option value='registered' $selected{'RULES'}{'registered'} >$Lang::tr{'registered user rules'}</option>
                                <option value='subscripted' $selected{'RULES'}{'subscripted'} >$Lang::tr{'subscripted user rules'}</option>
@@ -465,27 +536,22 @@ print <<END
        <td nowrap='nowrap'>Oinkcode:&nbsp;<input type='text' size='40' name='OINKCODE' value='$snortsettings{'OINKCODE'}' /></td>
 </tr>
 <tr>
-       <td width='30%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' />
+       <td width='30%' align='left'><br><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' />
 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 ( -e "/var/tmp/snortrules.tar.gz"){
+       my @Info = stat("/var/tmp/snortrules.tar.gz");
+       $snortsettings{'INSTALLDATE'} = localtime($Info[9]);
 }
+print "&nbsp;$Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>";
+
 print <<END
 </tr>
 </table>
-<hr />
+<br><br>
 <table width='100%'>
 <tr>
-       <td align='center'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+       <td align='right'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
 </tr>
 </table>
 </form>
@@ -503,17 +569,17 @@ 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`;
 print <<END
 </textarea></td></tr>
-<tr><td align='center' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
+<tr><td align='right' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
 </table>
 </form>
 END
@@ -528,7 +594,7 @@ END
 if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable_green" || -e "${General::swroot}/snort/enable_blue" || -e "${General::swroot}/snort/enable_orange" ) {
        &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 "<table width='100%'><tr><td valign='TOP'><table>";
 
                print "<form method='post'>";
 
@@ -542,9 +608,14 @@ 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>";
+                               print "</table></td><td valign='TOP'><table>";
                                $ruledisplaycnt = 0;
                        }
 
@@ -595,21 +666,21 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
                        }
 
                        # Output rule file name and checkbox
-                       print "<TR><TD CLASS='base' VALIGN='TOP'><INPUT TYPE='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <A HREF='$rulefilelink'>$rulefile</A></TD></TR>";
-                       print "<TR><TD CLASS='base' VALIGN='TOP'>";
+                       print "<tr><td class='base' valign='TOP'><input type='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <a href='$rulefilelink'>$rulefile</a></td></tr>";
+                       print "<tr><td class='base' valign='TOP'>";
 
                        # Check for empty 'Description'
                        if ($snortrules{$rulefile}{'Description'} eq '') {
-                               print "<TABLE WIDTH='100%'><TR><TD CLASS='base'>No description available</TD></TR>";
+                               print "<table width='100%'><tr><td class='base'>No description available</td></tr>";
                        } else {
                                # Output rule file 'Description'
-                               print "<TABLE WIDTH='100%'><TR><TD CLASS='base'>$snortrules{$rulefile}{'Description'}</TD></TR>";
+                               print "<table width='100%'><tr><td class='base'>$snortrules{$rulefile}{'Description'}</td></tr>";
                        }
 
                        # Check for display flag
                        if ($displayrulefilerules) {
                                # Rule file definition rule display
-                               print "<TR><TD CLASS='base' VALIGN='TOP'><TABLE border=1><TR>";
+                               print "<tr><td class='base' valign='TOP'><table border='0'><tr>";
 
                                # Local vars
                                my $ruledefdisplaycnt = 0;
@@ -624,7 +695,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 
                                        # If have display 2 rules, start new row
                                        if (($ruledefdisplaycnt % 2) == 0) {
-                                               print "</TR><TR>";
+                                               print "</tr><tr>";
                                                $ruledefdisplaycnt = 0;
                                        }
 
@@ -636,7 +707,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
                                        # Create rule file rule's checkbox
                                        $checkboxname = "SNORT_RULE_$rulefile";
                                        $checkboxname .= "_$ruledef";
-                                       print "<TD CLASS='base'><INPUT TYPE='checkbox' NAME='$checkboxname' $ruledefchecked> $snortrules{$rulefile}{'Definition'}{$ruledef}{'Description'}</TD>";
+                                       print "<td class='base'><input type='checkbox' NAME='$checkboxname' $ruledefchecked> $snortrules{$rulefile}{'Definition'}{$ruledef}{'Description'}</td>";
 
                                        # Increment count
                                        $ruledefdisplaycnt++;
@@ -644,26 +715,24 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 
                                # If do not have second rule for row, create empty cell
                                if (($ruledefdisplaycnt % 2) != 0) {
-                                       print "<TD CLASS='base'></TD>";
+                                       print "<td class='base'></td>";
                                }
 
                                # Close display table
-                               print "</TR></TABLE></TD></TR>";
+                               print "</tr></table></td></tr>";
                }
 
                        # Close display table
-                       print "</TABLE>";
+                       print "</table>";
 
                        # Increment ruledisplaycnt
                $ruledisplaycnt++;
                }
-       print "</TD></TR></TABLE></TD></TR></TABLE>";
+       print "</td></tr></table></td></tr></table>";
        print <<END
 <table width='100%'>
 <tr>
-       <td width='33%'>&nbsp;</td>
-       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
-       <td width='33%'>
+       <td width='100%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
                &nbsp; <!-- space for future online help link -->
        </td>
 </tr>
@@ -678,82 +747,27 @@ 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;
-
-       if (index($return->content, "\037\213") == -1 ) { # \037\213 is .gz beginning
-               $errormessage = $Lang::tr{'invalid loaded file'};
-               return undef;
-       }
-
-       my $filename='';
-       my $fh='';
-       ($fh, $filename) = tempfile('/var/tmp/XXXXXXXX',SUFFIX => '.tar.gz' );#oinkmaster work only with this extension
-       binmode ($fh);
-       syswrite ($fh, $return->content);
-       close($fh);
-       return $filename;
-}
+       my $peer;
+       my $peerport;
 
-sub geturl ($) {
-       my $url=$_[0];
+       unlink("/var/tmp/log");
 
        unless (-e "${General::swroot}/red/active") {
                $errormessage = $Lang::tr{'could not download latest updates'};
                return undef;
        }
 
-       my $downloader = LWP::UserAgent->new;
-       $downloader->timeout(5);
-
        my %proxysettings=();
        &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
 
        if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
-               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
-               if ($proxysettings{'UPSTREAM_USER'}) {
-                       $downloader->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$peer:$peerport/");
-               } else {
-                       $downloader->proxy("http","http://$peer:$peerport/");
-               }
+               ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
        }
 
-       my $return = $downloader->get($url,'Cache-Control','no-cache');
-
-       if ($return->code == 403) {
-               $errormessage = $Lang::tr{'access refused with this oinkcode'};
-               return undef;
-       } elsif (!$return->is_success()) {
-               $errormessage = $Lang::tr{'could not download latest updates'};
-               return undef;
+       if ($peer) {
+               system("wget -r --proxy=on --proxy-user=$proxysettings{'UPSTREAM_USER'} --proxy-passwd=$proxysettings{'UPSTREAM_PASSWORD'} -e http_proxy=http://$peer:$peerport/ -o /var/tmp/log --no-check-certificate --output-document=/var/tmp/snortrules.tar.gz $url");
+       } else {
+               system("wget -r --no-check-certificate -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url");
        }
-
-       return $return;
-
 }