Merge pull request #89 from cyberperspectives/v1.3.4

V1.3.4
This commit is contained in:
Ryan P 2019-01-17 14:09:32 -05:00 committed by GitHub
commit 27bbeeca80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 511 additions and 468 deletions

Binary file not shown.

View File

@ -5,7 +5,7 @@
* Purpose: Represents a checklist that links a PDI and software package * Purpose: Represents a checklist that links a PDI and software package
* Created: Sep 12, 2013 * Created: Sep 12, 2013
* *
* Portions Copyright 2017: Cyber Perspectives, All rights reserved * Portions Copyright 2017-2019: CyberPerspectives, LLC, All rights reserved
* Released under the Apache v2.0 License * Released under the Apache v2.0 License
* *
* Portions Copyright (c) 2012-2015, Salient Federal Solutions * Portions Copyright (c) 2012-2015, Salient Federal Solutions
@ -406,7 +406,7 @@ class checklist
case (preg_match("/Dot Net|DotNet/i", $this->name) ? true : false): case (preg_match("/Dot Net|DotNet/i", $this->name) ? true : false):
$this->icon = 'Microsoft .NET.png'; $this->icon = 'Microsoft .NET.png';
break; break;
case (preg_match("/Internet Explorer/i", $this->name) ? true : false): case (preg_match("/Internet Explorer|Microsoft IE/i", $this->name) ? true : false):
$this->icon = 'Internet Explorer.png'; $this->icon = 'Internet Explorer.png';
break; break;
case (preg_match("/Windows Phone/i", $this->name) ? true : false): case (preg_match("/Windows Phone/i", $this->name) ? true : false):
@ -452,7 +452,7 @@ class checklist
case (preg_match("/Red ?Hat/i", $this->name) ? true : false): case (preg_match("/Red ?Hat/i", $this->name) ? true : false):
$this->icon = 'RedHat Linux.jpg'; $this->icon = 'RedHat Linux.jpg';
break; break;
case (preg_match("/SUSE Linux/i", $this->name) ? true : false): case (preg_match("/SUSE Linux|SLES/i", $this->name) ? true : false):
$this->icon = 'SUSE Linux.png'; $this->icon = 'SUSE Linux.png';
break; break;
case (preg_match("/Solaris/i", $this->name) ? true : false): case (preg_match("/Solaris/i", $this->name) ? true : false):
@ -461,6 +461,9 @@ class checklist
case (preg_match("/Storage Area/i", $this->name) ? true : false): case (preg_match("/Storage Area/i", $this->name) ? true : false):
$this->icon = 'Storage Area Network.gif'; $this->icon = 'Storage Area Network.gif';
break; break;
case (preg_match("/Ubuntu/i", $this->name) ? true : false):
$this->icon = 'Ubuntu.png';
break;
case (preg_match("/z\/OS/i", $this->name) ? true : false): case (preg_match("/z\/OS/i", $this->name) ? true : false):
$this->icon = 'ZOS.jpg'; $this->icon = 'ZOS.jpg';
break; break;

View File

@ -595,7 +595,7 @@ class software {
if ($regex2['name_match']) { if ($regex2['name_match']) {
foreach (explode(",", $regex2['name_match']) as $idx) { foreach (explode(",", $regex2['name_match']) as $idx) {
if (isset($match[$idx])) { if (isset($match[$idx]) && $match[$idx]) {
$sw['name'] .= " " . $match[$idx]; $sw['name'] .= " " . $match[$idx];
} }
} }
@ -603,7 +603,7 @@ class software {
if ($regex2['ver_match']) { if ($regex2['ver_match']) {
foreach (explode(",", $regex2['ver_match']) as $idx) { foreach (explode(",", $regex2['ver_match']) as $idx) {
if (isset($match[$idx])) { if (isset($match[$idx]) && $match[$idx]) {
$sw['ver'] .= $match[$idx] . " "; $sw['ver'] .= $match[$idx] . " ";
} }
} }

View File

@ -16,6 +16,7 @@
* - May 24, 2018 - Updated constants for 1.3.2 release * - May 24, 2018 - Updated constants for 1.3.2 release
* - Jun 2, 2018 - Added new STIG_EXCLUSIONS constant to permanently exclude STIGs * - Jun 2, 2018 - Added new STIG_EXCLUSIONS constant to permanently exclude STIGs
* - Aug 28, 2018 - Updated constants for 1.3.3 release * - Aug 28, 2018 - Updated constants for 1.3.3 release
* - Jan 15, 2019 - Updated constants for 1.3.4 release
*/ */
// @new // @new
/** /**
@ -31,7 +32,7 @@ define('DOC_ROOT', '{DOC_ROOT}');
define('PWD_FILE', '{PWD_FILE}'); define('PWD_FILE', '{PWD_FILE}');
define('TMP', '{TMP_PATH}'); define('TMP', '{TMP_PATH}');
define('VER', '1.3.4'); define('VER', '1.3.4');
define('REL_DATE', '2018-11-30'); define('REL_DATE', '2019-01-15');
define('LOG_LEVEL', '{E_ERROR}'); define('LOG_LEVEL', '{E_ERROR}');
define('LOG_PATH', '{LOG_PATH}'); define('LOG_PATH', '{LOG_PATH}');
define('SALT', '{SALT}'); define('SALT', '{SALT}');
@ -281,6 +282,13 @@ define('PDI_CATALOG', 'PDI_CATALOG');
*/ */
define('ECHECKLIST_CSV', 'ECHECKLIST_CSV'); define('ECHECKLIST_CSV', 'ECHECKLIST_CSV');
/**
* Constant for a CSV host list
*
* @var string
*/
define('HOST_LIST', 'HOST_LIST');
/** /**
* Constant for unsupported retina CSV file format * Constant for unsupported retina CSV file format
* *

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
* Purpose: Read STIG Viewer checklist files * Purpose: Read STIG Viewer checklist files
* Created: Apr 10, 2014 * Created: Apr 10, 2014
* *
* Portions Copyright 2016-2017: Cyber Perspectives, LLC, All rights reserved * Portions Copyright 2016-2019: CyberPerspectives, LLC, All rights reserved
* Released under the Apache v2.0 License * Released under the Apache v2.0 License
* *
* Portions Copyright (c) 2012-2015, Salient Federal Solutions * Portions Copyright (c) 2012-2015, Salient Federal Solutions
@ -74,6 +74,7 @@ $host_mac = getValue($xml, '//HOST_MAC');
if (!$host_name) { if (!$host_name) {
$db->update_Running_Scan($base_name, ['name' => 'status', 'value' => 'TERMINATED']); $db->update_Running_Scan($base_name, ['name' => 'status', 'value' => 'TERMINATED']);
$db->update_Running_Scan($base_name, ['name' => 'notes', 'value' => 'File parsing was terminated because <HOST_NAME> was empty or absent']);
unset($xml); unset($xml);
rename($cmd['f'], TMP . "/terminated/{$base_name}"); rename($cmd['f'], TMP . "/terminated/{$base_name}");

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB