$Lang::tr{'pagerefresh'}
"; - $results .=`/usr/local/bin/oinkmaster.pl -s -u file://$filename -C /var/ipfire/snort/oinkmaster.conf -o /etc/snort/rules 2>&1`; - $results .= ""; + + 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 = "
".$return.""; + } 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); } - } } - - } $checked{'ENABLE_SNORT'}{'off'} = ''; @@ -442,6 +459,37 @@ if ($errormessage) { &Header::closebox(); } +my $return = `pidof oinkmaster.pl -x`; +chomp($return); +if ($return) { + &Header::openbox( 'Waiting', 1, "" ); + print <
+
+END
+ my @output = `tail -20 /var/tmp/log`;
+ foreach (@output) {
+ print "$_";
+ }
+ print <
+
+END
+ &Header::closebox();
+ &Header::closebigbox();
+ &Header::closepage();
+ exit;
+ refreshpage();
+}
+
&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system2'});
print <
@@ -701,56 +749,26 @@ END
&Header::closepage();
sub downloadrulesfile {
- my $return = &geturl($url);
- return undef unless $return;
+ my $peer;
+ my $peerport;
- 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;
-}
-
-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;
-
}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6d15fb288..1cdd90489 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -688,6 +688,7 @@
'download certificate' => 'Zertifikate herunterladen',
'download host certificate' => 'Host Zertifikat herunterladen',
'download new ruleset' => 'Neuen Regelsatz herunterladen',
+'upload new ruleset' => 'Neuen Regelsatz hochladen',
'download pkcs12 file' => 'PKCS12 Datei herunterladen',
'download root certificate' => 'Root Zertifikat herunterladen',
'dpd action' => 'Aktion für Dead Peer Detection',
@@ -1336,6 +1337,7 @@
'pakfire update daily' => 'Täglich nach Updates suchen:',
'pakfire updates' => 'Zur Verfügung stehende Updates:',
'pakfire working' => 'Pakfire führt gerade eine Aufgabe aus... Bitte warten sie, bis diese erfolgreich beendet wurde.',
+'snort working' => 'Snort führt gerade eine Aufgabe aus... Bitte warten sie, bis diese erfolgreich beendet wurde.',
'pap or chap' => 'PAP oder CHAP',
'parentclass' => 'Parentklasse',
'password' => 'Passwort:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index cc75bd957..4ca14d486 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -716,6 +716,7 @@
'download certificate' => 'Download certificate',
'download host certificate' => 'Download host certificate',
'download new ruleset' => 'Download new ruleset',
+'upload new ruleset' => 'Upload new ruleset',
'download pkcs12 file' => 'Download PKCS12 file',
'download root certificate' => 'Download root certificate',
'dpd action' => 'Dead Peer Detection action',
@@ -1365,6 +1366,7 @@
'pakfire update daily' => 'Search for updates daily:',
'pakfire updates' => 'Available Update:',
'pakfire working' => 'Pakfire is working ... Please wait until all operations have completed successfully.',
+'snort working' => 'Snort is working ... Please wait until all operations have completed successfully.',
'pap or chap' => 'PAP or CHAP',
'parentclass' => 'Parentclass',
'password' => 'Password:',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 844cb0a8d..347705379 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -714,6 +714,7 @@
'download certificate' => 'Descargar certificado',
'download host certificate' => 'Descargar certificado de host',
'download new ruleset' => 'Descargar nuevo grupo de reglas',
+'upload new ruleset' => 'Subir nuevo grupo de reglas',
'download pkcs12 file' => 'Descargar archivo PKCS12',
'download root certificate' => 'Descargar certificado root',
'dpd action' => 'Acción al detectar Dead Peer',
@@ -1355,6 +1356,7 @@
'pakfire update daily' => 'Buscar actualizaciones diariamente:',
'pakfire updates' => 'Actualización disponible:',
'pakfire working' => 'Pakfire está trabajando… Por favor espere hasta que todas las operaciones se hallan completado exitosamente.',
+'snort working' => 'Snort está trabajando… Por favor espere hasta que todas las operaciones se hallan completado exitosamente.',
'pap or chap' => 'PAP o CHAP',
'parentclass' => 'Parentclass',
'password' => 'Contraseña',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 6881d1313..401172395 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -716,6 +716,7 @@
'download certificate' => 'Download certificate',
'download host certificate' => 'Download host certificate',
'download new ruleset' => 'Download new ruleset',
+'upload new ruleset' => 'Upload new ruleset',
'download pkcs12 file' => 'Download PKCS12 file',
'download root certificate' => 'Download root certificate',
'dpd action' => 'Dead Peer Detection action',
@@ -1365,6 +1366,7 @@
'pakfire update daily' => 'Search for updates daily:',
'pakfire updates' => 'Available Update:',
'pakfire working' => 'Pakfire is working ... Please wait until all operations have completed successfully.',
+'snort working' => 'Snort is working ... Please wait until all operations have completed successfully.',
'pap or chap' => 'PAP or CHAP',
'parentclass' => 'Parentclass',
'password' => 'Password:',