Upd. React. Refactoring #16.

.github/workflows/frontendBannersTests.yml

@@ -0,0 +1,110 @@
+name: Testing Banners on admin side (frontend)
+
+on:
+  push: # on push to each of these branches
+    branches:
+      - dev
+      - fix
+      - master
+  pull_request:
+    branches:
+      - dev
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      wordpress:
+        image: wordpress:latest
+        ports:
+          - 8080:80
+        env:
+          WORDPRESS_DB_HOST: db
+          WORDPRESS_DB_USER: wordpress
+          WORDPRESS_DB_PASSWORD: wordpress
+          WORDPRESS_DB_NAME: wordpress
+        volumes:
+          - ./:/var/www/html/wp-content/plugins/security-malware-firewall
+          - ./mu-plugins:/var/www/html/wp-content/mu-plugins
+      db:
+        image: mysql:5.7
+        ports:
+          - "3306:3306"
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: wordpress
+          MYSQL_USER: wordpress
+          MYSQL_PASSWORD: wordpress
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Wait for database to be ready
+        run: |
+          echo "Waiting for MySQL to be ready..."
+          for i in {1..30}; do
+          if docker exec $(docker ps -qf "ancestor=mysql:5.7") mysqladmin ping -ppassword --silent; then
+           echo "MySQL is ready!"
+           exit 0
+          fi
+          echo "Attempt $i/30: MySQL not ready yet..."
+          sleep 5
+          done
+          echo "MySQL connection timed out!"
+          exit 1
+
+      - name: Install WordPress using wp-cli
+        run: |
+          WP_CONTAINER_ID=$(docker ps -qf "ancestor=wordpress:latest")
+          DB_CONTAINER_ID=$(docker ps -qf "ancestor=mysql:5.7")
+
+          # Install WordPress using wp-cli
+          docker run --rm \
+            --volumes-from $WP_CONTAINER_ID \
+            --network container:$WP_CONTAINER_ID \
+            -e WORDPRESS_DB_HOST=$DB_CONTAINER_ID \
+            -e WORDPRESS_DB_USER=wordpress \
+            -e WORDPRESS_DB_PASSWORD=wordpress \
+            -e WORDPRESS_DB_NAME=wordpress \
+            wordpress:cli wp core install \
+            --url="http://localhost:8080" \
+            --title="Test Site" \
+            --admin_user="admin" \
+            --admin_password="password" \
+            --admin_email="admin@example.com" \
+            --skip-email
+
+      - name: Install and activate plugin
+        run: |
+          WP_CONTAINER_ID=$(docker ps -qf "ancestor=wordpress:latest")
+          DB_CONTAINER_ID=$(docker ps -qf "ancestor=mysql:5.7")
+
+          # Activate the plugin using wp-cli
+          docker run --rm \
+            --volumes-from $WP_CONTAINER_ID \
+            --network container:$WP_CONTAINER_ID \
+            -e WORDPRESS_DB_HOST=$DB_CONTAINER_ID \
+            -e WORDPRESS_DB_USER=wordpress \
+            -e WORDPRESS_DB_PASSWORD=wordpress \
+            -e WORDPRESS_DB_NAME=wordpress \
+            wordpress:cli wp plugin activate security-malware-firewall
+
+      - name: Set DB_HOST
+        run: echo "DB_HOST=$(docker ps -qf "ancestor=mysql:5.7")" >> $GITHUB_ENV
+
+      - name: Run Banners tests
+        uses: CleanTalk/e2e-tests-banners@spbct
+
+      - name: Matrix notify
+        if: failure()
+        uses: Glomberg/matrix-messenger-action@master
+        with:
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_EXTERNSION_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
+          message: |
+            <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}">SPBCT: Banners tests</a> failed ⛔!
+            Please, check the workflow, <strong>${{ github.actor }}</strong>
+

inc/spbc-admin.php

@@ -6,20 +6,19 @@
 use CleantalkSP\SpbctWP\DTO\ReactDataDTO;
 use CleantalkSP\SpbctWP\Escape;
 use CleantalkSP\SpbctWP\Scanner\DBTrigger\DBTriggerService;
+use CleantalkSP\SpbctWP\Scanner\View\View;
 use CleantalkSP\SpbctWP\Settings\SettingsGeneralReact;
+use CleantalkSP\SpbctWP\ServerRequirementsChecker\View as ServerRequirementsView;
 use CleantalkSP\SpbctWP\SpbcDevLogger;
 use CleantalkSP\SpbctWP\VulnerabilityAlarm\Dto\PluginReport;
 use CleantalkSP\SpbctWP\Firewall\View as FirewallView;
 use CleantalkSP\SpbctWP\VulnerabilityAlarm\Dto\ThemeReport;
-use CleantalkSP\SpbctWP\VulnerabilityAlarm\VulnerabilityAlarmService;
 use CleantalkSP\Variables\Post;
 use CleantalkSP\Variables\Server;
 use CleantalkSP\SpbctWP\LinkConstructor;
 use CleantalkSP\SpbctWP\ListTable;
 use CleantalkSP\SpbctWP\Scanner\Cure;
 use CleantalkSP\SpbctWP\Scanner\OSCron\Storages\OsCronTasksStorage;
-use CleantalkSP\SpbctWP\Scanner\ScannerQueue;
-use CleantalkSP\SpbctWP\SpbcEnqueue;
 use CleantalkSP\SpbctWP\Variables\Cookie;
 use CleantalkSP\SpbctWP\VulnerabilityAlarm\PscCertifiedPluginsController;
 use CleantalkSP\SpbctWP\VulnerabilityAlarm\VulnerabilityAlarm;
@@ -95,9 +94,9 @@ function spbc_admin_init()
     add_action('wp_ajax_spbc_scanner_save_to_pdf', array(ScannerAjaxEndpoints::class, 'downloadPDFReport'));
     add_action('wp_ajax_spbc_scanner_get_pdf_file_name', array(ScannerAjaxEndpoints::class, 'getPDFReportFileName'));
     add_action('wp_ajax_spbc_scanner_clear', array(ScannerAjaxEndpoints::class, 'clearScannerResults')); // Debug. Clear the table
-    add_action('wp_ajax_spbc_scanner__start', 'spbc_scanner__launch');
+    add_action('wp_ajax_spbc_scanner__start', 'spbc_scanner__start');
     add_action('wp_ajax_spbc_scanner__getScannerStatus', 'spbc_scanner__getScannerStatus');
-    add_action('wp_ajax_spbc_scanner__last_scan_info', 'spbc_scanner__last_scan_info');
+    add_action('wp_ajax_spbc_scanner__last_scan_info', array(ScannerAjaxEndpoints::class, 'getLastScanInfo'));
 
     // Scanner buttons
     add_action('wp_ajax_spbc_scanner_file_send', array(ScannerAjaxEndpoints::class, 'sendFileForAnalysis'));
@@ -242,9 +241,15 @@ function spbct_get_tab_data()
         case 'security_certified':
             PscCertifiedPluginsController::ajaxRenderTab();
             break;
+        case 'system_requirements':
+            wp_send_json(ServerRequirementsView::getReactData($data));
+            // no break
         case 'spbct_settings_overview':
             wp_send_json(spbc_field_options_overview_traffic_light());
             // no break
+        case 'scanner':
+            wp_send_json(View::getReactData());
+            // no break
         default:
             wp_send_json_error('Unknown tab');
             // no break

inc/spbc-scanner.php

@@ -2,16 +2,29 @@
 
 // Prevent direct call
 use CleantalkSP\SpbctWP\Cron;
-use CleantalkSP\SpbctWP\Transaction;
+use CleantalkSP\SpbctWP\Scanner\ScanningStagesModule\ScanningStagesStorage;
 
 if ( ! defined('ABSPATH') ) {
     die('Not allowed!');
 }
 
+/**
+ * Ajax wrapper function for launchBackground
+ *
+ * @return bool|string|string[]
+ */
+function spbc_scanner__start()
+{
+    if ( ! spbc_check_ajax_referer('spbc_secret_nonce', 'security', false) ) {
+        wp_send_json(array('error' => 'Nonce had been changed. Please, restart the scan.'));
+    }
+    return spbc_scanner__launch();
+}
+
 /**
  * Cron|RemoteCall wrapper function for launchBackground
  *
- * @return bool|string|string[]|void
+ * @return bool|string|string[]
  */
 function spbc_scanner__launch()
 {
@@ -77,6 +90,8 @@ function spbc_scanner__isScannerIsInProgress()
 
 function spbc_scanner__getScannerStatus()
 {
+    global $spbc;
+
     if ( ! spbc_check_ajax_referer('spbc_secret_nonce', 'security', false) ) {
         wp_send_json(array('error' => 'Nonce had been changed. Please, restart the scan.'));
     }
@@ -86,26 +101,59 @@ function spbc_scanner__getScannerStatus()
         $current_cron_task = Cron::getTask('background_scan');
         if ( $current_cron_task && isset($current_cron_task['params']['stage'], $current_cron_task['params']['offset']) ) {
             $current_stage = $current_cron_task['params']['stage'];
-            $current_offset = $current_cron_task['params']['offset'];
+            $current_offset = (int) $current_cron_task['params']['offset'];
+            $current_stage_class = null;
             $completed_stages = [];
-            foreach ($stages as $stage_key => $stage) {
-                // Convert $stageKey like CleantalkSP\SpbctWP\Scanner\ScanningStagesModule\Stages\GetCmsHashes into get_cms_hashes
+            foreach ($stages as $stage_key => $_stage) {
+                // Convert $stage_key like CleantalkSP\SpbctWP\Scanner\ScanningStagesModule\Stages\GetCmsHashes into get_cms_hashes
                 $stage_class_name = explode('\\', $stage_key);
                 $stage_class_name = end($stage_class_name);
                 $stage_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $stage_class_name));
                 if ($stage_name === $current_stage) {
+                    $current_stage_class = $stage_key;
                     break;
                 }
                 $completed_stages[] = [
                     'stage' => $stage_name,
                     'status' => 'completed',
                 ];
             }
+
+            // Per-stage progress (0-100%), specific only to the currently running stage.
+            // The overall scan progress is already visualized via the completed/current stages
+            // list, so this percentage is intentionally scoped to "how far is the current stage".
+            $current_stage_total = null;
+            if ($current_stage === 'file_system_analysis') {
+                // The total files count is discovered on the stage's first iteration and stored
+                // globally (spbc_scanner-side), not on the stage's own data object.
+                $current_stage_total = isset($spbc->data['scanner']['files_total'])
+                    ? (int) $spbc->data['scanner']['files_total']
+                    : null;
+            } elseif ($current_stage_class !== null) {
+                $stages_storage = new ScanningStagesStorage();
+                $stages_storage->converter->loadCollection();
+                $stage_data_obj = $stages_storage->getStage($current_stage_class);
+                if ( ! empty($stage_data_obj->total_count_files_for_analysis) ) {
+                    // signature_analysis, heuristic_analysis, binary_analysis
+                    $current_stage_total = (int) $stage_data_obj->total_count_files_for_analysis;
+                } elseif ( ! empty($stage_data_obj->total) ) {
+                    // outbound_links, frontend_analysis
+                    $current_stage_total = (int) $stage_data_obj->total;
+                }
+            }
+
+            $current_stage_percent = null;
+            if ($current_stage_total !== null && $current_stage_total > 0) {
+                $current_stage_percent = min(100, (int) round($current_offset / $current_stage_total * 100));
+            }
+
             wp_send_json_success(array(
                 'status' => 'in_progress',
                 'current_stage' => [
                     'stage' => $current_stage,
                     'offset' => $current_offset,
+                    'total' => $current_stage_total,
+                    'percent' => $current_stage_percent,
                     'status' => 'in_progress',
                 ],
                 'completed_stages' => $completed_stages,
@@ -116,4 +164,4 @@ function spbc_scanner__getScannerStatus()
     wp_send_json_success(array(
         'status' => 'end',
     ));
-}
+}