Context Navigation

Changeset 3098464

Timestamp:

06/06/2024 09:42:39 AM (22 months ago)

Author:

glomberg

Message:

Version: 2.134.3.

Location:

security-malware-firewall

Files:

-                      r3041922
+                      r3098464
     public static function isRC()
+    {
+        if (isset($_POST['fswatcher_token']) && $_POST['fswatcher_token'] == md5((string)filemtime(__FILE__))) {
+            return true;
+        }
+        return false;
+        return static::validateFsWatcherToken();
+    }
 …
         return $storage::getProcessingJournal();
+    }
+    /**
+     * Generates token (aka nonce).
+     * The $salt must be used obligatorily
+     *
+     * @param $salt
+     *
+     * @return string
+     */
+    public static function generateFsWatcherToken($salt = '')
+    {
+        return md5(filemtime(__FILE__) . $salt);
+    }
+    public static function validateFsWatcherToken()
+    {
+        return isset($_POST['fswatcher_token']) && $_POST['fswatcher_token'] === static::generateFsWatcherToken();
+    }
+}

-                      r3041922
+                      r3098464
 use CleantalkSP\Common\FSWatcher\Controller;
 use CleantalkSP\Common\FSWatcher\Logger;
+use CleantalkSP\Common\FSWatcher\Service;
 class View
 …
         $html .= '<script type="text/javascript">';
+        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'Service.php';
+        $html .= 'var fswatcherToken = "' . md5((string)filemtime($path)) . '";';
+        $html .= 'var fswatcherToken = "' . Service::generateFsWatcherToken() . '";';
         $html .= 'var fswatcherWebsiteUrl = "' . get_home_url() . '";';
         $html .= file_get_contents(__DIR__ . '/../assets/fswatcher-logic.js');

-                      r3028558
+                      r3098464
+    }
-    /**
-     * Is ajax call is in process
+     *
-     * @return bool
-     */
-    public static function isRC()
+    {
-        if (isset($_POST['fswatcher_token']) && $_POST['fswatcher_token'] == md5((string)filemtime(__FILE__))) {
-            return true;
+        }
-        return false;
+    }
     public static function attachJS($buffer, $file_to_get_md5 = null)
+    {
         return parent::attachJS($buffer, __FILE__);
+    }
+    public static function generateFsWatcherToken($salt = '')
+    {
+        return wp_create_nonce('spbc_secret_fs_watcher_token');
+    }
+    public static function validateFsWatcherToken()
+    {
+        return isset($_POST['fswatcher_token']) && spbc_check_ajax_referer('spbc_secret_fs_watcher_token', 'fswatcher_token');
+    }
+}

-                      r3041922
+                      r3098464
 use CleantalkSP\SpbctWP\FSWatcher\SpbctWpFSWController;
 use CleantalkSP\Common\FSWatcher\View\Phrases;
+use CleantalkSP\SpbctWP\FSWatcher\SpbctWpFSWService;
 class View extends \CleantalkSP\Common\FSWatcher\View\View
 …
         $html .= '<script type="text/javascript">';
+        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'SpbctWpFSWService.php';
+        $html .= 'var fswatcherToken = "' . md5((string)filemtime($path)) . '";';
+        $html .= 'var fswatcherToken = "' . SpbctWpFSWService::generateFsWatcherToken() . '";';
         $html .= 'var fswatcherWebsiteUrl = "' . get_home_url() . '";';
         $html .= file_get_contents(\CleantalkSP\Common\FSWatcher\Storage\FileStorage::getAssetsPath());

-                      r3095959
+                      r3098464
 Tested up to: 6.5
 Requires PHP: 5.6
 Stable tag: 2.134.2
+Stable tag: 2.134.3
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 2.134.3 June 06 2024
+* Upd. FSWatcher. FIle system watcher functionality improved.
 = 2.134.2 June 01 2024

-                      r3095959
+                      r3098464
 Description: Security & Malware scan by CleanTalk to protect your website from online threats and viruses. IP/Country FireWall, Web application FireWall. Detailed stats and logs to have full control.
 Author: CleanTalk Security
 Version: 2.134.2
+Version: 2.134.3
 Author URI: https://cleantalk.org
 Text Domain: security-malware-firewall
 …
 unset($spbc_cron);
-if ($spbc->feature_restrictions->getState($spbc, 'fswatcher')->is_active && $spbc->settings['scanner__fs_watcher']) {
-    $fswatch_params = array(
-        'dir_to_watch' => ABSPATH,
-        'exclude_dirs' => array(),
-        'extensions_to_watch' => array('php'),
-    );
-    FSWatcherController::work($fswatch_params);
+}
 if ( is_admin() || is_network_admin() ) {
     // Async loading for JavaScript
 …
     add_action('login_enqueue_scripts', 'spbc_enqueue_scripts__public');
+}
+add_action('init', function () use ($spbc) {
+    if ( $spbc->feature_restrictions->getState($spbc, 'fswatcher')->is_active && $spbc->settings['scanner__fs_watcher'] ) {
+        $fswatch_params = array(
+            'dir_to_watch' => ABSPATH,
+            'exclude_dirs' => array(),
+            'extensions_to_watch' => array('php'),
+        );
+        FSWatcherController::work($fswatch_params);
+    }
+});
 /**

Note: See TracChangeset for help on using the changeset viewer.