README.md

@@ -33,16 +33,12 @@ _Keen insight. Sound judgment. Wise decisions. Sagacity._
 
 ### Software Requirements
 Sagacity has the following software requirements. The versions listed are the minimum required for operation. For PHP, we recommend the closest version you can get to the one listed, further versions may deprecate features before we have the chance to update the code.
-
-*Please note:  Sagacity is not fully compatible with XAMPP 7.3.x or PHP 7.3.  Please use XAMPP 7.2 / PHP 7.2 instead.*
-
 - PHP 7.2
 - MySQL 5.7+ or MariaDB 10+
 - Apache 2.4+
 
 For Windows, you can install XAMPP 7.2.x from https://www.apachefriends.org/download.html
 
-
 ## Installation
 
 See README.pdf for complete installation instructions.

exec/export-ckl.php

@@ -90,7 +90,7 @@ if ($tgt_count = count($tgts)) {
     print "Target: {$tgt->get_Name()}" . PHP_EOL;
 
     foreach ($tgt->checklists as $key => $chk) {
-      if ($chk->name == 'Orphan' || $chk->type == 'benchmark') {
+      if ($chk->name == 'Orphan' || $chk->type != 'manual') {
         unset($tgt->checklists[$key]);
       }
     }

exec/parse_nessus.php

@@ -148,8 +148,7 @@ class nessus_parser extends scan_xml_parser
         "cpe:\/o:microsoft:windows_2003_server::sp([\d]).*" => "cpe:/o:microsoft:windows_2003_server:-:sp$1",
         "cpe:\/o:microsoft:windows_server_2008:r2::x64.*"   => "cpe:/o:microsoft:windows_server_2008:r2",
         "cpe:\/o:redhat:enterprise_linux:([\d]+)::.*"       => "cpe:/o:redhat:enterprise_linux:$1",
-        "cpe:\/o:sun:sunos:([\d]+)::.*"             		=> "cpe:/o:oracle:solaris:$1",
-		"cpe:\/o:vmware:esx_server.*" 						=> "cpe:/o:vmware:esxi:5.0",
+        "cpe:\/o:sun:sunos:([\d]+)::x([\d]+).*"             => "cpe:/o:oracle:solaris:$1",
         "cpe:\/o:centos:centos:([\d]+).*"                   => "cpe:/o:centos:centos:$1",
     ];
 

exec/parse_nmap.php

@@ -22,7 +22,6 @@
  *  - Nov 7, 2016 - Added d parameter documentation
  *  - 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 21, 2019 - fixed filetype check for .nmap and .gnmap files.
  */
 $cmd = getopt("f:", ['debug::', 'help::']);
 
@@ -95,13 +94,7 @@ foreach ($lines as $line_num => $line) {
     $line = trim($line, "\t\n\r"); # chomp would be nice...
     $matches = [];
     if (!isset($filetype)) {
-        if (preg_match('/\.nmap/', $cmd['f'])) {
-			$filetype = "text";
-		}
-		elseif (preg_match('/\.gnmap/', $cmd['f'])) {
-            $filetype = "grep";
-        }
-		elseif (preg_match('/Starting|\-oN/', $line)) {
+        if (preg_match('/Starting|\-oN/', $line)) {
             $filetype = "text";
         }
         elseif (preg_match('/\-oG/', $line)) {