tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2014-08-14 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/ReconServer.pm: Added a separate timing template for
	  network scans, since they can be very slow.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2014-08-14 16:09:55 +00:00
parent 21f74c8a25
commit 7a45b25746
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2014-08-14 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
lib/PandoraFMS/ReconServer.pm: Added a separate timing template for
network scans, since they can be very slow.
2014-08-14 Sancho Lerena <slerena@artica.es> 2014-08-14 Sancho Lerena <slerena@artica.es>
* FreeBSD/pandora_server.conf.new, * FreeBSD/pandora_server.conf.new,

4
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -265,6 +265,7 @@ sub pandora_load_config {
# nmap for recon OS fingerprinting and tcpscan (optional) # nmap for recon OS fingerprinting and tcpscan (optional)
$pa_config->{"nmap"} = "/usr/bin/nmap"; $pa_config->{"nmap"} = "/usr/bin/nmap";
$pa_config->{"nmap_timing_template"} = 2; # > 5.1 $pa_config->{"nmap_timing_template"} = 2; # > 5.1
$pa_config->{"recon_timing_template"} = 3; # > 5.1
# braa for enterprise snmp server # braa for enterprise snmp server
$pa_config->{"braa"} = "/usr/bin/braa"; $pa_config->{"braa"} = "/usr/bin/braa";
@ -611,6 +612,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^nmap_timing_template\s([0-9]*)/i) { elsif ($parametro =~ m/^nmap_timing_template\s([0-9]*)/i) {
$pa_config->{'nmap_timing_template'}= clean_blank($1); $pa_config->{'nmap_timing_template'}= clean_blank($1);
} }
elsif ($parametro =~ m/^recon_timing_template\s([0-9]*)/i) {
$pa_config->{'recon_timing_template'}= clean_blank($1);
}
elsif ($parametro =~ m/^braa\s(.*)/i) { elsif ($parametro =~ m/^braa\s(.*)/i) {
$pa_config->{'braa'}= clean_blank($1); $pa_config->{'braa'}= clean_blank($1);
} }

2
pandora_server/lib/PandoraFMS/ReconServer.pm
View File

@ -142,7 +142,7 @@ sub data_consumer ($$) {
# Call nmap # Call nmap
my $timeout = $pa_config->{'networktimeout'}*1000; my $timeout = $pa_config->{'networktimeout'}*1000;
my $nmap_args = '-nsP -PE --max-retries '.$pa_config->{'icmp_checks'}.' --host-timeout '.$timeout.' -T'.$pa_config->{'nmap_timing_template'}; my $nmap_args = '-nsP -PE --max-retries '.$pa_config->{'icmp_checks'}.' --host-timeout '.$timeout.' -T'.$pa_config->{'recon_timing_template'};
my $np = new PandoraFMS::NmapParser; my $np = new PandoraFMS::NmapParser;
eval { eval {
$np->parsescan($pa_config->{'nmap'}, $nmap_args, ($task->{'subnet'})); $np->parsescan($pa_config->{'nmap'}, $nmap_args, ($task->{'subnet'}));