From a07f5b7ff39c281a51b8c87f7b3ac2f28c90ccf1 Mon Sep 17 00:00:00 2001 From: Cliff Parnitzky Date: Fri, 12 Mar 2021 00:30:01 +0100 Subject: [PATCH 1/5] Create FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..2be9520 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: cliffparnitzky From 119df19fafc466ba751b2ee0f3ab3f033c35429d Mon Sep 17 00:00:00 2001 From: Kirsten Roschanski Date: Fri, 20 Aug 2021 15:47:33 +0200 Subject: [PATCH 2/5] Change to Contao-Manager --- .../classes/MonitoringScanClientWorker.php | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php index 1e34f0a..ee8d820 100644 --- a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php +++ b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php @@ -116,7 +116,46 @@ private function scanClientWorkOffMonitoringEntry($objMonitoringEntry) if ($objMonitoringEntry != null && !$objMonitoringEntry->disable && $objMonitoringEntry->client_scan_active) { $monitoringScanClient = new \MonitoringScanClient(); - $response = $monitoringScanClient->scanClient($objMonitoringEntry->client_url, $objMonitoringEntry->client_token); + $response = []; + $response_contao = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/contao' ,$objMonitoringEntry->client_token); + if (is_array($response_contao)) + { + foreach($response_contao as $responseKey=>$responseValue) + { + $response['contao.' . $responseKey ] = $responseValue; + } + } + else + { + \Message::addError($response); + } + + $response_server = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/self-update' ,$objMonitoringEntry->client_token); + if (is_array($response_server)) + { + foreach($response_server as $responseKey=>$responseValue) + { + $response['contao_manager.' . $responseKey ] = $responseValue; + } + } + else + { + \Message::addError($response); + } + + $response_config = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/config' ,$objMonitoringEntry->client_token); + if (is_array($response_config)) + { + foreach($response_config as $responseKey=>$responseValue) + { + $response['server.' . $responseKey ] = $responseValue; + } + } + else + { + \Message::addError($response); + } + if (is_array($response)) { if (isset($GLOBALS['TL_HOOKS']['monitoringScanClientWork']) && is_array($GLOBALS['TL_HOOKS']['monitoringScanClientWork'])) @@ -160,4 +199,4 @@ private function logDebugMsg($msg, $origin) } } -?> \ No newline at end of file +?> From d832066ebc0ecb71d6dd8beb9c117b1f5dff68f6 Mon Sep 17 00:00:00 2001 From: Kirsten Roschanski Date: Tue, 21 Sep 2021 17:05:47 +0200 Subject: [PATCH 3/5] Update MonitoringScanClientWorker.php --- .../classes/MonitoringScanClientWorker.php | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php index ee8d820..ac4010f 100644 --- a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php +++ b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php @@ -118,42 +118,50 @@ private function scanClientWorkOffMonitoringEntry($objMonitoringEntry) $monitoringScanClient = new \MonitoringScanClient(); $response = []; $response_contao = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/contao' ,$objMonitoringEntry->client_token); - if (is_array($response_contao)) - { + + if( is_array($response_contao) && !array_key_exist('monitoring.server.agent', $response_contao) ) { + foreach($response_contao as $responseKey=>$responseValue) { $response['contao.' . $responseKey ] = $responseValue; } - } - else - { - \Message::addError($response); - } - $response_server = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/self-update' ,$objMonitoringEntry->client_token); - if (is_array($response_server)) - { - foreach($response_server as $responseKey=>$responseValue) + $response_server = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/self-update' ,$objMonitoringEntry->client_token); + if (is_array($response_server)) { - $response['contao_manager.' . $responseKey ] = $responseValue; + foreach($response_server as $responseKey=>$responseValue) + { + $response['contao_manager.' . $responseKey ] = $responseValue; + } + } + else + { + \Message::addError($response_server); } - } - else - { - \Message::addError($response); - } - $response_config = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/config' ,$objMonitoringEntry->client_token); - if (is_array($response_config)) + $response_config = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/config' ,$objMonitoringEntry->client_token); + if (is_array($response_config)) + { + foreach($response_config as $responseKey=>$responseValue) + { + $response['server.' . $responseKey ] = $responseValue; + } + } + else + { + \Message::addError($response_config); + } + } + elseif (is_array($response_contao) && array_key_exist('monitoring.server.agent', $response_contao)) { - foreach($response_config as $responseKey=>$responseValue) + foreach($response_contao as $responseKey=>$responseValue) { - $response['server.' . $responseKey ] = $responseValue; + $response[$responseKey ] = $responseValue; } } else { - \Message::addError($response); + \Message::addError($response_contao); } if (is_array($response)) @@ -198,5 +206,3 @@ private function logDebugMsg($msg, $origin) } } } - -?> From 8ab753e0e65e355938e021e0ba1b816642a50b1b Mon Sep 17 00:00:00 2001 From: Kirsten Roschanski Date: Tue, 21 Sep 2021 17:19:27 +0200 Subject: [PATCH 4/5] Update MonitoringScanClientWorker.php --- .../classes/MonitoringScanClientWorker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php index ac4010f..30708d9 100644 --- a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php +++ b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php @@ -156,7 +156,7 @@ private function scanClientWorkOffMonitoringEntry($objMonitoringEntry) { foreach($response_contao as $responseKey=>$responseValue) { - $response[$responseKey ] = $responseValue; + $response[$responseKey] = $responseValue; } } else From 1bfb09b78be3299e8d8ff5fb2dcbf34bef069721 Mon Sep 17 00:00:00 2001 From: Kirsten Roschanski Date: Tue, 21 Sep 2021 17:23:28 +0200 Subject: [PATCH 5/5] Update MonitoringScanClientWorker.php --- .../classes/MonitoringScanClientWorker.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php index 30708d9..4ead703 100644 --- a/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php +++ b/system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php @@ -119,7 +119,7 @@ private function scanClientWorkOffMonitoringEntry($objMonitoringEntry) $response = []; $response_contao = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/contao' ,$objMonitoringEntry->client_token); - if( is_array($response_contao) && !array_key_exist('monitoring.server.agent', $response_contao) ) { + if( is_array($response_contao) && !array_key_exists('monitoring.server.agent', $response_contao) ) { foreach($response_contao as $responseKey=>$responseValue) { @@ -152,7 +152,7 @@ private function scanClientWorkOffMonitoringEntry($objMonitoringEntry) \Message::addError($response_config); } } - elseif (is_array($response_contao) && array_key_exist('monitoring.server.agent', $response_contao)) + elseif (is_array($response_contao) && array_key_exists('monitoring.server.agent', $response_contao)) { foreach($response_contao as $responseKey=>$responseValue) {