more fixes

backend/scripts/backup.py

@@ -173,41 +173,42 @@ def verify_database():
 
 def encrypt_database(passphrase):
     """
-    Encrypt the database file using GPG with comprehensive error checking.
-    
-    Args:
-        passphrase (str): The encryption passphrase
-    
-    Returns:
-        bool: True if encryption was successful
+    Encrypt the database file using GPG with robust directory handling.
     """
     try:
         print("\nPreparing for database encryption...")
         
-        # Verify source file
-        if not os.path.exists(DB_FILE_PATH):
-            print(f"Source database file not found: {DB_FILE_PATH}")
-            return False
-            
-        source_size = os.path.getsize(DB_FILE_PATH)
-        print(f"Source file exists and is {source_size:,} bytes")
-        
-        # Verify target directory
+        # Get absolute paths
         target_dir = os.path.dirname(DB_GPG_PATH)
-        if not os.path.exists(target_dir):
-            print(f"Target directory doesn't exist: {target_dir}")
+        
+        # Create directory with explicit permissions right before encryption
+        print(f"Ensuring target directory exists: {target_dir}")
+        os.makedirs(target_dir, mode=0o755, exist_ok=True)
+        
+        # Verify directory was created
+        if not os.path.isdir(target_dir):
+            print(f"Failed to create directory: {target_dir}")
             return False
             
-        print(f"Target directory exists and {'is' if os.access(target_dir, os.W_OK) else 'is not'} writable")
+        # Get and display directory permissions
+        dir_stat = os.stat(target_dir)
+        print(f"Directory permissions: {oct(dir_stat.st_mode)[-3:]}")
+        print(f"Directory owner: {dir_stat.st_uid}")
         
-        # Remove existing backup file if it exists
-        if os.path.exists(DB_GPG_PATH):
-            try:
-                os.remove(DB_GPG_PATH)
-                print("Removed existing backup file")
-            except Exception as e:
-                print(f"Warning: Could not remove existing backup: {e}")
-                return False
+        # Try to create a test file to verify write access
+        test_file = os.path.join(target_dir, '.gpg_test')
+        try:
+            with open(test_file, 'w') as f:
+                f.write('test')
+            os.remove(test_file)
+            print("Write test successful")
+        except Exception as e:
+            print(f"Write test failed: {e}")
+            return False
+
+        # Create .gnupg directory with explicit permissions
+        gnupg_dir = '/root/.gnupg'
+        os.makedirs(gnupg_dir, mode=0o700, exist_ok=True)
         
         # Prepare GPG command
         encrypt_cmd = [
@@ -221,7 +222,6 @@ def encrypt_database(passphrase):
             DB_FILE_PATH
         ]
         
-        # Run GPG with output capturing
         print("\nRunning GPG encryption...")
         result = subprocess.run(
             encrypt_cmd,
@@ -232,24 +232,20 @@ def encrypt_database(passphrase):
         
         if result.returncode != 0:
             print(f"GPG encryption failed with code {result.returncode}")
-            if result.stdout:
-                print(f"GPG stdout: {result.stdout}")
-            if result.stderr:
-                print(f"GPG stderr: {result.stderr}")
+            print(f"Error output: {result.stderr}")
             return False
         
         # Verify the encrypted file was created
-        if not os.path.exists(DB_GPG_PATH):
-            print("GPG reported success but encrypted file not found")
+        if os.path.exists(DB_GPG_PATH):
+            encrypted_size = os.path.getsize(DB_GPG_PATH)
+            print(f"Encryption successful. Encrypted file size: {encrypted_size:,} bytes")
+            return True
+        else:
+            print("GPG reported success but file not found")
             return False
             
-        encrypted_size = os.path.getsize(DB_GPG_PATH)
-        print(f"Encryption successful. Encrypted file size: {encrypted_size:,} bytes")
-        return True
-        
     except Exception as e:
         print(f"Encryption failed with exception: {e}")
-        print(f"Exception type: {type(e).__name__}")
         return False
 
 def backup_db():