From d0389b60606873f62936e700121987cc4a3026b1 Mon Sep 17 00:00:00 2001 From: Mark Unwin Date: Tue, 19 Dec 2023 11:10:53 +1000 Subject: [PATCH] Bump version to 5.0.3. --- app/Config/OpenAudit.php | 4 ++-- app/Controllers/Applications.php | 2 +- app/Controllers/Attributes.php | 2 +- app/Controllers/Baselines.php | 2 +- app/Controllers/BaselinesPolicies.php | 2 +- app/Controllers/BaselinesResults.php | 2 +- app/Controllers/Buildings.php | 2 +- app/Controllers/Charts.php | 2 +- app/Controllers/Cli.php | 2 +- app/Controllers/Clouds.php | 2 +- app/Controllers/Clusters.php | 2 +- app/Controllers/Collections.php | 2 +- app/Controllers/Collectors.php | 2 +- app/Controllers/Components.php | 2 +- app/Controllers/Configuration.php | 2 +- app/Controllers/Connections.php | 2 +- app/Controllers/Credentials.php | 2 +- app/Controllers/Dashboards.php | 2 +- app/Controllers/Database.php | 2 +- app/Controllers/Devices.php | 2 +- app/Controllers/Discoveries.php | 2 +- app/Controllers/Fields.php | 2 +- app/Controllers/Groups.php | 2 +- app/Controllers/Help.php | 2 +- app/Controllers/Input.php | 2 +- app/Controllers/Integrations.php | 2 +- app/Controllers/Licenses.php | 2 +- app/Controllers/Locations.php | 2 +- app/Controllers/Logon.php | 2 +- app/Controllers/Networks.php | 2 +- app/Controllers/Orgs.php | 2 +- app/Controllers/Queries.php | 2 +- app/Controllers/Queue.php | 2 +- app/Controllers/Reports.php | 2 +- app/Controllers/Roles.php | 2 +- app/Controllers/Scripts.php | 2 +- app/Controllers/Search.php | 2 +- app/Controllers/Summaries.php | 2 +- app/Controllers/Tasks.php | 2 +- app/Controllers/Test.php | 2 +- app/Controllers/Users.php | 2 +- app/Controllers/Util.php | 2 +- app/Controllers/Widgets.php | 2 +- app/Models/DatabaseModel.php | 4 ++++ app/Models/db_upgrades/db_5.0.3.php | 17 +++++++++++++++++ other/audit_aix.sh | 4 ++-- other/audit_esxi.sh | 4 ++-- other/audit_hpux.sh | 4 ++-- other/audit_linux.sh | 4 ++-- other/audit_osx.sh | 4 ++-- other/audit_solaris.sh | 4 ++-- other/audit_windows.vbs | 4 ++-- other/discover_domain.vbs | 2 +- other/discover_subnet.sh | 2 +- other/discover_subnet.vbs | 2 +- other/execute.sh | 2 +- other/execute.vbs | 2 +- other/generate_auth_token.pl | 2 +- other/nmap_windows.vbs | 2 +- other/open-audit.sql | 4 ++-- other/test_windows_client.vbs | 2 +- 61 files changed, 89 insertions(+), 68 deletions(-) create mode 100644 app/Models/db_upgrades/db_5.0.3.php diff --git a/app/Config/OpenAudit.php b/app/Config/OpenAudit.php index 17eb113fc..f46cdc68e 100755 --- a/app/Config/OpenAudit.php +++ b/app/Config/OpenAudit.php @@ -11,8 +11,8 @@ class OpenAudit extends BaseConfig { - public string $displayVersion = '5.0.2'; - public int $appVersion = 20231207; + public string $displayVersion = '5.0.3'; + public int $appVersion = 20231219; public array $enterprise_collections = array('applications' => 'cud', 'baselines' => 'crud', 'baselines_policies' => 'crud', 'baselines_results' => 'crud', 'clouds' => 'crud', 'collectors' => 'crud', 'dashboards' => 'cud', 'discovery_scan_options' => 'cud', 'files' => 'crud', 'integrations' => 'crud', 'racks' => 'crud', 'roles' => 'cu'); public array $professional_collections = array('applications' => 'r', 'clusters' => 'crud', 'dashboards' => 'r', 'discovery_scan_options' => 'r', 'maps' => 'crud', 'rules' => 'crud', 'tasks' => 'crud', 'widgets' => 'crud'); diff --git a/app/Controllers/Applications.php b/app/Controllers/Applications.php index 8b2edea93..b6362440f 100644 --- a/app/Controllers/Applications.php +++ b/app/Controllers/Applications.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Attributes.php b/app/Controllers/Attributes.php index 951e6f5c5..770f7ef2a 100644 --- a/app/Controllers/Attributes.php +++ b/app/Controllers/Attributes.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Baselines.php b/app/Controllers/Baselines.php index 2a62b2b38..430bcd1c3 100644 --- a/app/Controllers/Baselines.php +++ b/app/Controllers/Baselines.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/BaselinesPolicies.php b/app/Controllers/BaselinesPolicies.php index fbd010955..5693ef427 100644 --- a/app/Controllers/BaselinesPolicies.php +++ b/app/Controllers/BaselinesPolicies.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/BaselinesResults.php b/app/Controllers/BaselinesResults.php index 0ffc5a63a..a1f9864df 100644 --- a/app/Controllers/BaselinesResults.php +++ b/app/Controllers/BaselinesResults.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Buildings.php b/app/Controllers/Buildings.php index 33edb7e05..4d6cd8ea0 100644 --- a/app/Controllers/Buildings.php +++ b/app/Controllers/Buildings.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Charts.php b/app/Controllers/Charts.php index c92e62f56..9b14382a8 100644 --- a/app/Controllers/Charts.php +++ b/app/Controllers/Charts.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Cli.php b/app/Controllers/Cli.php index f1b78b067..8253175ff 100644 --- a/app/Controllers/Cli.php +++ b/app/Controllers/Cli.php @@ -28,7 +28,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Clouds.php b/app/Controllers/Clouds.php index 49ac47115..a48edd96e 100644 --- a/app/Controllers/Clouds.php +++ b/app/Controllers/Clouds.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Clusters.php b/app/Controllers/Clusters.php index d27dd32be..43b098e4f 100644 --- a/app/Controllers/Clusters.php +++ b/app/Controllers/Clusters.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Collections.php b/app/Controllers/Collections.php index 5db5a241c..2f5fc5cce 100644 --- a/app/Controllers/Collections.php +++ b/app/Controllers/Collections.php @@ -16,7 +16,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Collectors.php b/app/Controllers/Collectors.php index eaa09aa0a..ee9181b81 100644 --- a/app/Controllers/Collectors.php +++ b/app/Controllers/Collectors.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Components.php b/app/Controllers/Components.php index 17af72d79..b238a097e 100644 --- a/app/Controllers/Components.php +++ b/app/Controllers/Components.php @@ -16,7 +16,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Configuration.php b/app/Controllers/Configuration.php index 35473de05..375b22098 100644 --- a/app/Controllers/Configuration.php +++ b/app/Controllers/Configuration.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Connections.php b/app/Controllers/Connections.php index 63d2b3b6f..766cbb185 100644 --- a/app/Controllers/Connections.php +++ b/app/Controllers/Connections.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Credentials.php b/app/Controllers/Credentials.php index 111fe2fa4..07cf1dad9 100644 --- a/app/Controllers/Credentials.php +++ b/app/Controllers/Credentials.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Dashboards.php b/app/Controllers/Dashboards.php index f60614d02..17aa593b4 100644 --- a/app/Controllers/Dashboards.php +++ b/app/Controllers/Dashboards.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Database.php b/app/Controllers/Database.php index 80b422f25..11336b846 100644 --- a/app/Controllers/Database.php +++ b/app/Controllers/Database.php @@ -16,7 +16,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Devices.php b/app/Controllers/Devices.php index 28415de6c..645d1697a 100644 --- a/app/Controllers/Devices.php +++ b/app/Controllers/Devices.php @@ -16,7 +16,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Discoveries.php b/app/Controllers/Discoveries.php index 5c9670c2f..87636c8d0 100644 --- a/app/Controllers/Discoveries.php +++ b/app/Controllers/Discoveries.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Fields.php b/app/Controllers/Fields.php index a327e364b..c97123561 100644 --- a/app/Controllers/Fields.php +++ b/app/Controllers/Fields.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Groups.php b/app/Controllers/Groups.php index 8e33df9c5..d9b698281 100644 --- a/app/Controllers/Groups.php +++ b/app/Controllers/Groups.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Help.php b/app/Controllers/Help.php index 00e2643f9..15793cae0 100644 --- a/app/Controllers/Help.php +++ b/app/Controllers/Help.php @@ -16,7 +16,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Input.php b/app/Controllers/Input.php index b6ac6b6d1..213a6b42d 100644 --- a/app/Controllers/Input.php +++ b/app/Controllers/Input.php @@ -17,7 +17,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Integrations.php b/app/Controllers/Integrations.php index d5be0b61a..fab9f28ef 100644 --- a/app/Controllers/Integrations.php +++ b/app/Controllers/Integrations.php @@ -16,7 +16,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Licenses.php b/app/Controllers/Licenses.php index 26267b643..6a15756b9 100644 --- a/app/Controllers/Licenses.php +++ b/app/Controllers/Licenses.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Locations.php b/app/Controllers/Locations.php index 35b2ed18c..aa784b572 100644 --- a/app/Controllers/Locations.php +++ b/app/Controllers/Locations.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Logon.php b/app/Controllers/Logon.php index 34424d7b8..0ab148011 100644 --- a/app/Controllers/Logon.php +++ b/app/Controllers/Logon.php @@ -22,7 +22,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Networks.php b/app/Controllers/Networks.php index ef9aca226..2d6729955 100644 --- a/app/Controllers/Networks.php +++ b/app/Controllers/Networks.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Orgs.php b/app/Controllers/Orgs.php index 55246920e..7d5fbb99b 100755 --- a/app/Controllers/Orgs.php +++ b/app/Controllers/Orgs.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Queries.php b/app/Controllers/Queries.php index c8863e409..d9b6f59dc 100644 --- a/app/Controllers/Queries.php +++ b/app/Controllers/Queries.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Queue.php b/app/Controllers/Queue.php index 6a74a52f6..c80f65221 100644 --- a/app/Controllers/Queue.php +++ b/app/Controllers/Queue.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Reports.php b/app/Controllers/Reports.php index 71aec455d..46a95fc05 100644 --- a/app/Controllers/Reports.php +++ b/app/Controllers/Reports.php @@ -16,7 +16,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Roles.php b/app/Controllers/Roles.php index b9ef2ecac..9a59b3f57 100644 --- a/app/Controllers/Roles.php +++ b/app/Controllers/Roles.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Scripts.php b/app/Controllers/Scripts.php index 79b363e9b..873ea9ad4 100644 --- a/app/Controllers/Scripts.php +++ b/app/Controllers/Scripts.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Search.php b/app/Controllers/Search.php index 9999b1821..5c5223d63 100644 --- a/app/Controllers/Search.php +++ b/app/Controllers/Search.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Summaries.php b/app/Controllers/Summaries.php index a6ee12be3..96a956fe5 100644 --- a/app/Controllers/Summaries.php +++ b/app/Controllers/Summaries.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Tasks.php b/app/Controllers/Tasks.php index 16c362e20..245de24c8 100644 --- a/app/Controllers/Tasks.php +++ b/app/Controllers/Tasks.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Test.php b/app/Controllers/Test.php index 36725fafa..2b8ef1df0 100755 --- a/app/Controllers/Test.php +++ b/app/Controllers/Test.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Users.php b/app/Controllers/Users.php index 107d580d8..063c3a6d4 100644 --- a/app/Controllers/Users.php +++ b/app/Controllers/Users.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Util.php b/app/Controllers/Util.php index 1cba611af..48bfbb68a 100644 --- a/app/Controllers/Util.php +++ b/app/Controllers/Util.php @@ -19,7 +19,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Controllers/Widgets.php b/app/Controllers/Widgets.php index 8ee09bf98..316aa54ad 100644 --- a/app/Controllers/Widgets.php +++ b/app/Controllers/Widgets.php @@ -14,7 +14,7 @@ * @author Mark Unwin * @copyright 2023 FirstWave * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 - * @version GIT: Open-AudIT_5.0.2 + * @version GIT: Open-AudIT_5.0.3 * @link http://www.open-audit.org */ diff --git a/app/Models/DatabaseModel.php b/app/Models/DatabaseModel.php index 37e575e17..87b3cf079 100644 --- a/app/Models/DatabaseModel.php +++ b/app/Models/DatabaseModel.php @@ -327,6 +327,10 @@ public function update($id = null, $data = null): bool include "db_upgrades/db_5.0.2.php"; } + if (intval(config('Openaudit')->internal_version) < 20231219) { + include "db_upgrades/db_5.0.3.php"; + } + $instance = & get_instance(); $instance->data = $output; return true; diff --git a/app/Models/db_upgrades/db_5.0.3.php b/app/Models/db_upgrades/db_5.0.3.php new file mode 100644 index 000000000..66bff4702 --- /dev/null +++ b/app/Models/db_upgrades/db_5.0.3.php @@ -0,0 +1,17 @@ +query($sql); +$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n"; +log_message('info', (string)$db->getLastQuery()); + +$sql = "UPDATE `configuration` SET `value` = '5.0.3' WHERE `name` = 'display_version'"; +$db->query($sql); +$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n"; +log_message('info', (string)$db->getLastQuery()); + +$output .= "Upgrade database to 5.0.3 completed.\n\n"; +config('Openaudit')->internal_version = 20231219; +config('Openaudit')->display_version = '5.0.3'; diff --git a/other/audit_aix.sh b/other/audit_aix.sh index 2a6e602cd..72dd9749a 100755 --- a/other/audit_aix.sh +++ b/other/audit_aix.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 @@ -47,7 +47,7 @@ url="http://localhost/open-audit/index.php/input/devices" debugging=1 # Version -version="5.0.2" +version="5.0.3" discovery_id="" help="" diff --git a/other/audit_esxi.sh b/other/audit_esxi.sh index 72a340d32..84b3c5277 100755 --- a/other/audit_esxi.sh +++ b/other/audit_esxi.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 @@ -74,7 +74,7 @@ self_delete='n' debugging=2 # Version -version="5.0.2" +version="5.0.3" discovery_id="" diff --git a/other/audit_hpux.sh b/other/audit_hpux.sh index b484c6adf..ffe38df84 100755 --- a/other/audit_hpux.sh +++ b/other/audit_hpux.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 @@ -45,7 +45,7 @@ url="http://localhost/open-audit/index.php/input/devices" debugging=1 # Version -version="5.0.2" +version="5.0.3" discovery_id="" help="" diff --git a/other/audit_linux.sh b/other/audit_linux.sh index 0643b1a2d..4a9d811e3 100755 --- a/other/audit_linux.sh +++ b/other/audit_linux.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 @@ -73,7 +73,7 @@ self_delete="n" debugging=2 # Version -version="5.0.2" +version="5.0.3" # Display help help="n" diff --git a/other/audit_osx.sh b/other/audit_osx.sh index 96186abe5..d9e86a978 100755 --- a/other/audit_osx.sh +++ b/other/audit_osx.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 @@ -44,7 +44,7 @@ system_id="" last_seen_by="audit" # Version -version="5.0.2" +version="5.0.3" # DO NOT REMOVE THE LINE BELOW # Configuration from web UI here diff --git a/other/audit_solaris.sh b/other/audit_solaris.sh index f74bac264..f7caab1ae 100755 --- a/other/audit_solaris.sh +++ b/other/audit_solaris.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 @@ -69,7 +69,7 @@ self_delete="n" debugging=2 # Version -version="5.0.2" +version="5.0.3" # Display help help="n" diff --git a/other/audit_windows.vbs b/other/audit_windows.vbs index d08dc7ec5..a216486a5 100755 --- a/other/audit_windows.vbs +++ b/other/audit_windows.vbs @@ -23,7 +23,7 @@ ' @package Open-AudIT ' @author Mark Unwin -' @version GIT: Open-AudIT_5.0.0 +' @version GIT: Open-AudIT_5.0.3 ' @copyright Copyright (c) 2022, Firstwave ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 @@ -103,7 +103,7 @@ self_delete = "n" debugging = "1" ' Version - NOTE, special formatted so we match the *nix scripts and can do find/replace -version="5.0.2" +version="5.0.3" ' In normal use, DO NOT SET THIS. ' This value is passed in when running the audit_domain script. diff --git a/other/discover_domain.vbs b/other/discover_domain.vbs index 556b19e0e..5497b6dfe 100755 --- a/other/discover_domain.vbs +++ b/other/discover_domain.vbs @@ -23,7 +23,7 @@ ' @package Open-AudIT ' @author Mark Unwin -' @version GIT: Open-AudIT_5.0.0 +' @version GIT: Open-AudIT_5.0.3 ' @copyright Copyright (c) 2022, Firstwave ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 diff --git a/other/discover_subnet.sh b/other/discover_subnet.sh index 401e97984..4dbc201e5 100755 --- a/other/discover_subnet.sh +++ b/other/discover_subnet.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 diff --git a/other/discover_subnet.vbs b/other/discover_subnet.vbs index 56f385470..ce48698cd 100755 --- a/other/discover_subnet.vbs +++ b/other/discover_subnet.vbs @@ -23,7 +23,7 @@ ' @package Open-AudIT ' @author Mark Unwin -' @version GIT: Open-AudIT_5.0.0 +' @version GIT: Open-AudIT_5.0.3 ' @copyright Copyright (c) 2022, Firstwave ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 diff --git a/other/execute.sh b/other/execute.sh index 00c31b75c..16b5ce227 100755 --- a/other/execute.sh +++ b/other/execute.sh @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 diff --git a/other/execute.vbs b/other/execute.vbs index e528edd5b..f98391cad 100755 --- a/other/execute.vbs +++ b/other/execute.vbs @@ -23,7 +23,7 @@ ' @package Open-AudIT ' @author Mark Unwin -' @version GIT: Open-AudIT_5.0.0 +' @version GIT: Open-AudIT_5.0.3 ' @copyright Copyright (c) 2022, Firstwave ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 diff --git a/other/generate_auth_token.pl b/other/generate_auth_token.pl index 0b2bf7887..385cd199b 100755 --- a/other/generate_auth_token.pl +++ b/other/generate_auth_token.pl @@ -24,7 +24,7 @@ # @package Open-AudIT # @author Mark Unwin -# @version GIT: Open-AudIT_5.0.0 +# @version GIT: Open-AudIT_5.0.3 # @copyright Copyright (c) 2022, Firstwave # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 diff --git a/other/nmap_windows.vbs b/other/nmap_windows.vbs index 4fecba456..8b5b1f34e 100755 --- a/other/nmap_windows.vbs +++ b/other/nmap_windows.vbs @@ -23,7 +23,7 @@ ' @package Open-AudIT ' @author Mark Unwin -' @version GIT: Open-AudIT_5.0.0 +' @version GIT: Open-AudIT_5.0.3 ' @copyright Copyright (c) 2022, Firstwave ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3 diff --git a/other/open-audit.sql b/other/open-audit.sql index e44e77720..6cc94a776 100644 --- a/other/open-audit.sql +++ b/other/open-audit.sql @@ -908,7 +908,7 @@ INSERT INTO `configuration` VALUES (NULL,'discovery_use_dns','y','bool','y','sys INSERT INTO `configuration` VALUES (NULL,'discovery_use_ipmi','y','bool','y','system','2000-01-01 00:00:00','Should we use ipmitool for discovering management ports if ipmitool is installed.'); INSERT INTO `configuration` VALUES (NULL,'discovery_use_org_id_match','n','bool','y','system','2000-01-01 00:00:00','When matching a device and assign_devices_to_org is set, use that attribute in the relevant match rules.'); INSERT INTO `configuration` VALUES (NULL,'discovery_use_vintage_service','n','bool','y','system','2000-01-01 00:00:00','On Windows, use the old way of running discovery with the Apache service account.'); -INSERT INTO `configuration` VALUES (NULL,'display_version','5.0.2','text','n','system','2000-01-01 00:00:00','The version shown on the web pages.'); +INSERT INTO `configuration` VALUES (NULL,'display_version','5.0.3','text','n','system','2000-01-01 00:00:00','The version shown on the web pages.'); INSERT INTO `configuration` VALUES (NULL,'download_reports','n','bool','y','system','2000-01-01 00:00:00','Tells Open-AudIT to advise the browser to download as a file or display the csv, xml, json reports.'); INSERT INTO `configuration` VALUES (NULL,'mail_domain','','text','y','system','2000-01-01 00:00:00','Email domain to use.'); INSERT INTO `configuration` VALUES (NULL,'mail_from','','text','y','system','2000-01-01 00:00:00','Email address used for as the sender.'); @@ -921,7 +921,7 @@ INSERT INTO `configuration` VALUES (NULL,'firstwave_prompt','2000-01-01','date', INSERT INTO `configuration` VALUES (NULL,'graph_days','30','number','y','system','2000-01-01 00:00:00','The number of days to report on for the Enterprise graphs.'); INSERT INTO `configuration` VALUES (NULL,'gui_trim_characters','25','number','y','system','2000-01-01 00:00:00','When showing a table of information in the web GUI, replace characters greater than this with \"...\".'); INSERT INTO `configuration` VALUES (NULL,'homepage','summaries','text','y','system','2000-01-01 00:00:00','Any links to the default page should be directed to this endpoint.'); -INSERT INTO `configuration` VALUES (NULL,'internal_version','20231207','number','n','system','2000-01-01 00:00:00','The internal numerical version.'); +INSERT INTO `configuration` VALUES (NULL,'internal_version','20231219','number','n','system','2000-01-01 00:00:00','The internal numerical version.'); INSERT INTO `configuration` VALUES (NULL,'maps_api_key','','text','y','system','2000-01-01 00:00:00','Your API key for Google Maps.'); INSERT INTO `configuration` VALUES (NULL,'match_dbus','n','bool','y','system','2000-01-01 00:00:00','Should we match a device based on its dbus id.'); INSERT INTO `configuration` VALUES (NULL,'match_dns_fqdn','n','bool','y','system','2000-01-01 00:00:00','Should we match a device based on its DNS fqdn.'); diff --git a/other/test_windows_client.vbs b/other/test_windows_client.vbs index 2b7c8264e..5bbc5b878 100755 --- a/other/test_windows_client.vbs +++ b/other/test_windows_client.vbs @@ -23,7 +23,7 @@ ' @package Open-AudIT ' @author Mark Unwin -' @version GIT: Open-AudIT_5.0.0 +' @version GIT: Open-AudIT_5.0.3 ' @copyright Copyright (c) 2022, Firstwave ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3