Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-05-09 18:25:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugins): Check ProcessUtilities return values and add shell=True fallback

Browse Source 
- Check return values from ProcessUtilities.normalExecutioner() (returns 0/1)
- Add subprocess with shell=True as additional fallback
- Better error handling and logging

Fixes: pm2Manager and paypalPremiumPlugin uninstall failures
This commit is contained in:
master3395
2026-01-26 03:25:09 +01:00
parent c26f66eb69
commit c23dffb14a
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pluginHolder/views.py
View File

@@ -629,28 +629,32 @@ def uninstall_plugin(request, plugin_name):
logging.writeToFile(f'Plugin directory still exists after removeFiles, trying ProcessUtilities')
try:
from plogical.processUtilities import ProcessUtilities
import time
import subprocess
# First, try to fix permissions with ProcessUtilities
chown_cmd = f'chown -R cyberpanel:cyberpanel {pluginInstalled}'
ProcessUtilities.normalExecutioner(chown_cmd)
chown_result = ProcessUtilities.normalExecutioner(chown_cmd)
if chown_result == 0:
logging.writeToFile(f'Warning: chown failed for {pluginInstalled}')
chmod_cmd = f'chmod -R u+rwX,go+rX {pluginInstalled}'
ProcessUtilities.normalExecutioner(chmod_cmd)
chmod_result = ProcessUtilities.normalExecutioner(chmod_cmd)
if chmod_result == 0:
logging.writeToFile(f'Warning: chmod failed for {pluginInstalled}')
# Then try to remove
# Then try to remove with ProcessUtilities
rm_cmd = f'rm -rf {pluginInstalled}'
ProcessUtilities.normalExecutioner(rm_cmd)
rm_result = ProcessUtilities.normalExecutioner(rm_cmd)
# Wait a moment for filesystem to sync
import time
time.sleep(0.5)
# Verify again
if os.path.exists(pluginInstalled):
# Last resort: try subprocess with shell=True as root
logging.writeToFile(f'ProcessUtilities removal failed, trying subprocess as root')
# ProcessUtilities failed - try subprocess directly
logging.writeToFile(f'ProcessUtilities removal failed (exit code: {rm_result}), trying subprocess')
try:
import subprocess
# Check if we're root
is_root = os.geteuid() == 0 if hasattr(os, 'geteuid') else False
if is_root:
@@ -661,9 +665,19 @@ def uninstall_plugin(request, plugin_name):
)
time.sleep(0.5)
if os.path.exists(pluginInstalled):
raise Exception(f'Plugin directory still exists after all removal attempts: {pluginInstalled}')
# Last resort: try with shell=True
logging.writeToFile(f'Subprocess rm -rf failed, trying with shell=True')
subprocess.run(f'rm -rf {pluginInstalled}', shell=True, timeout=30)
time.sleep(0.5)
if os.path.exists(pluginInstalled):
raise Exception(f'Plugin directory still exists after all removal attempts: {pluginInstalled}')
else:
raise Exception(f'Plugin directory still exists after ProcessUtilities removal: {pluginInstalled}')
# Not root - try with shell=True which might work better
logging.writeToFile(f'Not root, trying rm -rf with shell=True')
subprocess.run(f'rm -rf {pluginInstalled}', shell=True, timeout=30)
time.sleep(0.5)
if os.path.exists(pluginInstalled):
raise Exception(f'Plugin directory still exists after ProcessUtilities and subprocess removal: {pluginInstalled}')
except Exception as e3:
logging.writeToFile(f'Subprocess removal also failed: {str(e3)}')
raise Exception(f'Failed to remove plugin directory. Tried removeFiles(), ProcessUtilities, and subprocess. Directory still exists: {pluginInstalled}')