Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-01 02:46:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup API executioner return value checks

Browse Source 
- executioner() returns 1 for success, 0 for failure (inverted)
- Fix mkdir check: if mkdir_result != 1 (was != 0)
- Fix cp check: if cp_result[0] != 1 (was != 0)
- Fix double slash in backup path by stripping trailing slash from wp_path
- Add logging to show mkdir_result value for debugging
This commit is contained in:
usmannasir
2025-10-26 14:23:32 +05:00
parent 8ffd11fa08
commit a11a942cba
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
aiScanner/api.py
View File

@@ -900,15 +900,18 @@ def scanner_backup_file(request):
# Create backup directory # Create backup directory
import datetime import datetime
backup_dir_name = f'{file_token.wp_path}/.ai-scanner-backups/{datetime.datetime.now().strftime("%Y-%m-%d")}' # Remove trailing slash from wp_path to avoid double slashes
wp_path_clean = file_token.wp_path.rstrip('/')
backup_dir_name = f'{wp_path_clean}/.ai-scanner-backups/{datetime.datetime.now().strftime("%Y-%m-%d")}'
logging.writeToFile(f'[API] Creating backup directory: {backup_dir_name}') logging.writeToFile(f'[API] Creating backup directory: {backup_dir_name}')
mkdir_cmd = f'mkdir -p "{backup_dir_name}"' mkdir_cmd = f'mkdir -p "{backup_dir_name}"'
mkdir_result = ProcessUtilities.executioner(mkdir_cmd, user=user) mkdir_result = ProcessUtilities.executioner(mkdir_cmd, user=user)
if mkdir_result != 0: # executioner returns 1 for success, 0 for failure
if mkdir_result != 1:
error_msg = f'Failed to create backup directory: {backup_dir_name}' error_msg = f'Failed to create backup directory: {backup_dir_name}'
logging.writeToFile(f'[API] {error_msg}') logging.writeToFile(f'[API] {error_msg}, mkdir_result={mkdir_result}')
log_file_operation(scan_id, 'backup', file_path, False, error_msg, request=request) log_file_operation(scan_id, 'backup', file_path, False, error_msg, request=request)
return JsonResponse({'success': False, 'error': error_msg, 'error_code': 'BACKUP_DIR_FAILED'}, status=500) return JsonResponse({'success': False, 'error': error_msg, 'error_code': 'BACKUP_DIR_FAILED'}, status=500)
@@ -924,8 +927,9 @@ def scanner_backup_file(request):
cp_cmd = f'cp "{full_path}" "{backup_path}"' cp_cmd = f'cp "{full_path}" "{backup_path}"'
cp_result = ProcessUtilities.outputExecutioner(cp_cmd, user=user, retRequired=True) cp_result = ProcessUtilities.outputExecutioner(cp_cmd, user=user, retRequired=True)
# Check both return code and output for errors # outputExecutioner returns (1, output) for success, (0, output) for failure
if cp_result[0] != 0 or (cp_result[1] and 'error' in cp_result[1].lower()): # Also check output for error messages as additional safety
if cp_result[0] != 1 or (cp_result[1] and 'error' in cp_result[1].lower()):
error_output = cp_result[1] if len(cp_result) > 1 else 'Unknown error' error_output = cp_result[1] if len(cp_result) > 1 else 'Unknown error'
error_msg = f'Failed to create backup: {error_output}' error_msg = f'Failed to create backup: {error_output}'
logging.writeToFile(f'[API] Backup failed: cp returned {cp_result[0]}, output: {error_output}') logging.writeToFile(f'[API] Backup failed: cp returned {cp_result[0]}, output: {error_output}')