Nmap filetype not found for .nmap files

The file type for Normal output .nmap files were not being correctly detected and were producing an error on import.
This commit is contained in:
Jeff Odegard 2019-01-21 17:03:12 -07:00 committed by GitHub
parent 1af6091e55
commit 9865904e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,6 +22,7 @@
* - Nov 7, 2016 - Added d parameter documentation * - Nov 7, 2016 - Added d parameter documentation
* - Dec 7, 2016 - Added check for "Interesting ports on {IP}" line * - Dec 7, 2016 - Added check for "Interesting ports on {IP}" line
* - Jan 30, 2017 - Updated to use parse_config.ini file, and added populating new targets with shortened os software string if available. * - Jan 30, 2017 - Updated to use parse_config.ini file, and added populating new targets with shortened os software string if available.
* - Jan 21, 2019 - fixed filetype check for .nmap and .gnmap files.
*/ */
$cmd = getopt("f:", ['debug::', 'help::']); $cmd = getopt("f:", ['debug::', 'help::']);
@ -94,7 +95,13 @@ foreach ($lines as $line_num => $line) {
$line = trim($line, "\t\n\r"); # chomp would be nice... $line = trim($line, "\t\n\r"); # chomp would be nice...
$matches = []; $matches = [];
if (!isset($filetype)) { if (!isset($filetype)) {
if (preg_match('/Starting|\-oN/', $line)) { if (preg_match('/\.nmap/', $cmd['f'])) {
$filetype = "text";
}
elseif (preg_match('/\.gnmap/', $cmd['f'])) {
$filetype = "grep";
}
elseif (preg_match('/Starting|\-oN/', $line)) {
$filetype = "text"; $filetype = "text";
} }
elseif (preg_match('/\-oG/', $line)) { elseif (preg_match('/\-oG/', $line)) {