Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-06-14 22:00:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugins): Improve auto-cleanup of incomplete plugin directories

Browse Source 
- Use pluginInstaller.removeFiles() which handles permissions properly
- Add fallback to rm -rf if pluginInstaller method fails
- Better error handling and logging
- Applied to both install_plugin and install_from_store functions

Fixes: Incomplete plugin directory cleanup failures due to permission issues
This commit is contained in:
master3395
2026-01-26 03:09:01 +01:00
parent 31eb292784
commit 618ceb61e5
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
pluginHolder/views.py
View File

@@ -474,17 +474,27 @@ def install_plugin(request, plugin_name):
}, status=400)
else:
# Directory exists but no meta.xml - likely incomplete/uninstalled
# Try to clean it up first
# Try to clean it up first using pluginInstaller.removeFiles which handles permissions
try:
import shutil
shutil.rmtree(pluginInstalled)
from pluginInstaller.pluginInstaller import pluginInstaller
pluginInstaller.removeFiles(plugin_name)
logging.writeToFile(f'Cleaned up incomplete plugin directory: {plugin_name}')
except Exception as e:
logging.writeToFile(f'Warning: Could not clean up incomplete directory: {str(e)}')
return JsonResponse({
'success': False,
'error': f'Incomplete plugin directory found. Please uninstall first or manually remove: {pluginInstalled}'
}, status=400)
# Try fallback: use system rm -rf
try:
import subprocess
result = subprocess.run(['rm', '-rf', pluginInstalled], capture_output=True, text=True, timeout=30)
if result.returncode == 0:
logging.writeToFile(f'Cleaned up incomplete plugin directory using rm -rf: {plugin_name}')
else:
raise Exception(f"rm -rf failed: {result.stderr}")
except Exception as e2:
logging.writeToFile(f'Error: Both cleanup methods failed: {str(e)}, {str(e2)}')
return JsonResponse({
'success': False,
'error': f'Incomplete plugin directory found. Please uninstall first or manually remove: {pluginInstalled}'
}, status=400)
# Create zip file for installation (pluginInstaller expects a zip)
import tempfile
@@ -1217,17 +1227,27 @@ def install_from_store(request, plugin_name):
}, status=400)
else:
# Directory exists but no meta.xml - likely incomplete/uninstalled
# Try to clean it up first
# Try to clean it up first using pluginInstaller.removeFiles which handles permissions
try:
import shutil
shutil.rmtree(pluginInstalled)
from pluginInstaller.pluginInstaller import pluginInstaller
pluginInstaller.removeFiles(plugin_name)
logging.writeToFile(f'Cleaned up incomplete plugin directory: {plugin_name}')
except Exception as e:
logging.writeToFile(f'Warning: Could not clean up incomplete directory: {str(e)}')
return JsonResponse({
'success': False,
'error': f'Incomplete plugin directory found. Please uninstall first or manually remove: {pluginInstalled}'
}, status=400)
# Try fallback: use system rm -rf
try:
import subprocess
result = subprocess.run(['rm', '-rf', pluginInstalled], capture_output=True, text=True, timeout=30)
if result.returncode == 0:
logging.writeToFile(f'Cleaned up incomplete plugin directory using rm -rf: {plugin_name}')
else:
raise Exception(f"rm -rf failed: {result.stderr}")
except Exception as e2:
logging.writeToFile(f'Error: Both cleanup methods failed: {str(e)}, {str(e2)}')
return JsonResponse({
'success': False,
'error': f'Incomplete plugin directory found. Please uninstall first or manually remove: {pluginInstalled}'
}, status=400)
# Download plugin from GitHub
import tempfile