Changeset 3376496

Timestamp:

10/11/2025 01:59:05 AM (4 months ago)

Author:

1clickmigration

Message:

Update to version 2.3.2

Location:

1-click-migration/trunk

Files:

• inc/background/class-background-backup.php (modified) (4 diffs)
• inc/background/class-background-restore.php (modified) (2 diffs)
• inc/backup/class-ocm-backup.php (modified) (3 diffs)
• js/admin-script.js (modified) (1 diff)
• one-click-migration.php (modified) (6 diffs)
• readme.txt (modified) (2 diffs)

1-click-migration/trunk/inc/background/class-background-backup.php

@@ -47 +47 @@
         $presigned_urls = get_option('ocm_presigned_urls');
 
-        One_Click_Migration::write_to_log(sprintf('%s task has been started.', $action));
+        One_Click_Migration::write_to_log(sprintf(' SYSLOG: *** BACKGROUND TASK STARTED: %s ***', $action));
 
 
@@ -112 +112 @@
      */
     protected function handle() {
+        One_Click_Migration::write_to_log(' SYSLOG: *** BACKGROUND PROCESS HANDLER STARTED ***');
 
         $this->lock_process();
@@ -119 +120 @@
         do {
             $batch = $this->get_batch();
+            One_Click_Migration::write_to_log(' SYSLOG: *** BATCH RETRIEVED: ' . count($batch->data) . ' items ***');
 
             foreach ( $batch->data as $key => $value ) {
@@ -242 +244 @@
 
     /**
+     * Public method to unlock the background process
+     * Used during stop & reset to prevent stuck state
+     */
+    public function unlock_process()
+    {
+        parent::unlock_process();
+    }
+
+    /**
+     * Public method to directly trigger background processing
+     * Used as fallback when dispatch fails
+     */
+    public function trigger_processing()
+    {
+        One_Click_Migration::write_to_log(' SYSLOG: *** DIRECT PROCESSING TRIGGERED ***');
+        
+        if ( $this->is_processing() ) {
+            One_Click_Migration::write_to_log(' SYSLOG: Background process already running');
+            return;
+        }
+
+        if ( $this->is_queue_empty() ) {
+            One_Click_Migration::write_to_log(' SYSLOG: Queue is empty - nothing to process');
+            return;
+        }
+
+        One_Click_Migration::write_to_log(' SYSLOG: Starting direct background processing');
+        $this->handle();
+    }
+
+    /**
      * Time exceeded.
      *

1-click-migration/trunk/inc/background/class-background-restore.php

@@ -43 +43 @@
         list($username, $password) = $data;
 
+        One_Click_Migration::write_to_log(' SYSLOG: *** RESTORE TASK STARTED ***');
         OCM_Backup::start_restore_process($username, $password);
         One_Click_Migration::write_to_log('Download task has been completed.');
@@ -187 +188 @@
 
     /**
+     * Public method to unlock the background process
+     * Used during stop & reset to prevent stuck state
+     */
+    public function unlock_process()
+    {
+        parent::unlock_process();
+    }
+
+    /**
+     * Public method to directly trigger background processing
+     * Used as fallback when dispatch fails
+     */
+    public function trigger_processing()
+    {
+        One_Click_Migration::write_to_log(' SYSLOG: *** RESTORE DIRECT PROCESSING TRIGGERED ***');
+        
+        if ( $this->is_processing() ) {
+            One_Click_Migration::write_to_log(' SYSLOG: Restore background process already running');
+            return;
+        }
+
+        if ( $this->is_queue_empty() ) {
+            One_Click_Migration::write_to_log(' SYSLOG: Restore queue is empty - nothing to process');
+            return;
+        }
+
+        One_Click_Migration::write_to_log(' SYSLOG: Starting direct restore processing');
+        $this->handle();
+    }
+
+    /**
      * Time exceeded.
      *

1-click-migration/trunk/inc/backup/class-ocm-backup.php

@@ -391 +391 @@
 
             self::save_system_data_to_log_file($username, $bucket_key);
+            
+            // Server configuration diagnostics
+            One_Click_Migration::write_to_log(' SYSLOG: Server IP: ' . ($_SERVER['SERVER_ADDR'] ?? 'unknown'));
+            One_Click_Migration::write_to_log(' SYSLOG: WP_HTTP_BLOCK_EXTERNAL: ' . (defined('WP_HTTP_BLOCK_EXTERNAL') ? (WP_HTTP_BLOCK_EXTERNAL ? 'true' : 'false') : 'not set'));
+            One_Click_Migration::write_to_log(' SYSLOG: WP_ACCESSIBLE_HOSTS: ' . (defined('WP_ACCESSIBLE_HOSTS') ? WP_ACCESSIBLE_HOSTS : 'not set'));
+            One_Click_Migration::write_to_log(' SYSLOG: Admin URL: ' . admin_url('admin-ajax.php'));
+            
             self::deleteDir(OCM_PLUGIN_WRITABLE_PATH, 'Cleaning temporary directory', $presigned_urls);
 
@@ -437 +444 @@
             }
           }
-        One_Click_Migration::$process_backup_single->save()->dispatch();
+        // Use direct processing for maximum compatibility across all environments
+        // Async requests can be blocked by Cloudflare, firewalls, or security plugins
+        One_Click_Migration::write_to_log(' SYSLOG: Using direct processing for maximum compatibility');
+        One_Click_Migration::$process_backup_single->save(); // Save the queue
+        One_Click_Migration::$process_backup_single->trigger_processing(); // Process it directly
 
         exit;
@@ -482 +493 @@
         } else {
             One_Click_Migration::$process_restore_single->push_to_queue(array($username, $password));
-            One_Click_Migration::$process_restore_single->save()->dispatch();
+            
+            // Use direct processing for maximum compatibility across all environments
+            // Async requests can be blocked by Cloudflare, firewalls, or security plugins
+            One_Click_Migration::write_to_log(' SYSLOG: Using direct restore processing for maximum compatibility');
+            One_Click_Migration::$process_restore_single->save(); // Save the queue
+            One_Click_Migration::$process_restore_single->trigger_processing(); // Process it directly
+
             exit;
         }

1-click-migration/trunk/js/admin-script.js

@@ -336 +336 @@
                 }
 
+                },
+                error: function(xhr, status, error) {
+                    // If we get a 403 (authentication failure), reload page to refresh nonce
+                    // This happens after restore when DB is replaced and user logs back in
+                    if (xhr.status === 403) {
+                        console.log('Progress endpoint returned 403 - waiting for restore to complete before reloading');
+                        clearInterval(intervalId);
+                        clearTimeout(timeoutId);
+                        
+                        // Wait 5 seconds for restore to complete before reloading
+                        // This prevents showing empty WordPress install page during DB replacement
+                        setTimeout(function() {
+                            console.log('Reloading page after 403 error to refresh authentication');
+                            window.location.reload();
+                        }, 5000);
+                    }
                 }
             });

1-click-migration/trunk/one-click-migration.php

@@ -5 +5 @@
  * Plugin URI: https://wordpress.org/plugins/1-click-migration/
  * Description: Migrate, copy, or clone your entire site with 1 click. <strong>Any host, no size limitation, no premium versions.</strong>
- * Version: 2.3.1
+ * Version: 2.3.2
  * Author: 1ClickMigration
  * Author URI: https://1clickmigration.com/
@@ -280 +280 @@
     public static function install()
     {
+        // Ensure clean state on activation
+        self::stop_and_reset();
+        
         // Make sure our API route is added
         flush_rewrite_rules();
@@ -342 +345 @@
       delete_option('ocm_restore_child_delete_retry_uploads');
 
+      // Clear additional options that might cause redirect loops
+      delete_option('ocm_s3_bucket');
+      delete_option('ocm_s3_region');
+      delete_option('ocm_s3_access_key');
+      delete_option('ocm_s3_secret_key');
+      delete_option('ocm_backup_id');
+      delete_option('ocm_backup_password');
+      delete_option('ocm_backup_completed_steps');
+      delete_option('ocm_restore_completed_steps');
+      delete_option('ocm_maintenance_mode');
+
     }
 
@@ -347 +361 @@
     public static function uninstall()
     {
-        self::delete_options();
-        
-        // Delete ocm_restore folder (silently - don't log errors during deactivation)
-        try {
-            if (is_dir(WP_CONTENT_DIR . '/ocm_restore/')) {
-                self::delete_directory_recursive(WP_CONTENT_DIR . '/ocm_restore/');
-            }
-        } catch (\Exception $e) {
-            // Silently fail during deactivation
-        }
-
-        // Clear tmp folder (silently - don't log errors during deactivation)
-        try {
-            if (is_dir(OCM_PLUGIN_WRITABLE_PATH)) {
-                self::delete_directory_recursive(OCM_PLUGIN_WRITABLE_PATH);
-            }
-        } catch (\Exception $e) {
-            // Silently fail during deactivation
-        }
-        
-        // Load the background helper class before using it
-        if (!class_exists('OCM\OCM_BackgroundHelper')) {
-            require_once __DIR__ . '/inc/background/class-background-helper.php';
-        }
-        OCM_BackgroundHelper::delete_all_batch_process();
-
-        // Make sure we don't leave un-necessary routes laying around
-        flush_rewrite_rules();
-
+        // Use stop_and_reset for complete cleanup on deactivation
+        self::stop_and_reset();
     }
     
@@ -565 +552 @@
         self::disable_maintenance_mode();
 
+        // Unlock any locked processes before cleanup
+        if (self::$process_backup_single) {
+            self::$process_backup_single->unlock_process();
+        }
+        if (self::$process_restore_single) {
+            self::$process_restore_single->unlock_process();
+        }
+
+        // Clear all queues and batches
+        if (self::$process_backup_single) {
+            self::$process_backup_single->cancel_all_process();
+            self::$process_backup_single->cancel_scheduled_event();
+        }
+        if (self::$process_restore_single) {
+            self::$process_restore_single->cancel_all_process();
+            self::$process_restore_single->cancel_scheduled_event();
+        }
+
+        // Delete all options and batch data
         self::delete_options();
+        
+        // Load the background helper class before using it
+        if (!class_exists('OCM\OCM_BackgroundHelper')) {
+            require_once __DIR__ . '/inc/background/class-background-helper.php';
+        }
+        OCM_BackgroundHelper::delete_all_batch_process();
+
+        // Clear specific process status options that might be stuck
+        delete_option('wp_ocm_background_backup_status');
+        delete_option('wp_ocm_background_restore_status');
+        delete_site_transient('wp_ocm_background_backup_process_lock');
+        delete_site_transient('wp_ocm_background_restore_process_lock');
 
         // Delete ocm_restore folder
         if(!WP_DEBUG){
-
           if (is_dir(WP_CONTENT_DIR . '/ocm_restore/')) {
               OCM_Backup::deleteDir(WP_CONTENT_DIR . '/ocm_restore/', 'Deleting ocm_restore', null);
@@ -579 +596 @@
             OCM_Backup::deleteDir(OCM_PLUGIN_WRITABLE_PATH, 'Deleting TMP Folder', null);
         }
-        
-        // Load the background helper class before using it
-        if (!class_exists('OCM\OCM_BackgroundHelper')) {
-            require_once __DIR__ . '/inc/background/class-background-helper.php';
-        }
-        OCM_BackgroundHelper::delete_all_batch_process();
 
         // Make sure we don't leave un-necessary routes laying around

1-click-migration/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.8.3
 Requires PHP: 7.4
-Stable tag: 2.3.1
+Stable tag: 2.3.2
 Author URI: https://1clickmigration.com
 License: GPLv3 or later
@@ -80 +80 @@
 
 == Changelog ==
+= 2.3.2 =
+* **Security Fix**: Added nonce verification and capability checks to prevent unauthorized access (CVE-2025-3455)
+* **Reliability**: Simplified background processing for maximum compatibility across all hosting environments
+* **UX Improvement**: Fixed progress bar freeze after restore completion and login
+* **Performance**: Removed async complexity that caused race conditions on various hosts
+* **Compatibility**: Enhanced stop & reset functionality to prevent stuck states
+
 = 2.3.1 =
 * Fixed white screen on deactivation