bug fix: encoding and python path

usmannasir · Dec 15, 2019 · 92d7636 · 92d7636
1 parent fa2664e
commit 92d7636
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/WebTerminal/cpssh.service b/WebTerminal/cpssh.service
@@ -3,9 +3,9 @@ Description = CyberPanel SSH Websocket Daemon
 
 [Service]
 Type=forking
-ExecStart = /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/WebTerminal/servCTRL.py start
-ExecStop = /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/WebTerminal/servCTRL.py stop
-Restart = /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/WebTerminal/servCTRL.py restart
+ExecStart = /usr/local/CyberCP/bin/python /usr/local/CyberCP/WebTerminal/servCTRL.py start
+ExecStop = /usr/local/CyberCP/bin/python /usr/local/CyberCP/WebTerminal/servCTRL.py stop
+Restart = /usr/local/CyberCP/bin/python /usr/local/CyberCP/WebTerminal/servCTRL.py restart
 Restart=on-abnormal
 
 [Install]

diff --git a/firewall/firewallManager.py b/firewall/firewallManager.py
@@ -242,7 +242,7 @@ def firewallStatus(self, userID = None, data = None):
             else:
                 return ACLManager.loadErrorJson()
 
-            command = 'sudo systemctl status firewalld'
+            command = 'systemctl status firewalld'
             status = ProcessUtilities.outputExecutioner(command)
 
             if status.find("dead") > -1:

diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py
@@ -6,6 +6,7 @@
 import threading as multi
 import time
 import getpass
+import codecs
 
 class ProcessUtilities(multi.Thread):
     litespeedProcess = "litespeed"
@@ -167,12 +168,6 @@ def setupUDSConnection():
     @staticmethod
     def sendCommand(command, user=None):
         try:
-            # if user == None:
-            #     pass
-            # else:
-            #     cmd = 'usermod -a -G %s %s' % ('cyberpanel', user)
-            #     ProcessUtilities.executioner(cmd)
-
             ret = ProcessUtilities.setupUDSConnection()
 
             if ret[0] == -1:
@@ -193,18 +188,23 @@ def sendCommand(command, user=None):
                 sock.sendall(command.encode('utf-8'))
 
             data = ""
+            dataSTR = ""
 
             while (1):
                 currentData = sock.recv(32)
                 if len(currentData) == 0 or currentData == None:
                     break
-                data = data + currentData.decode("utf-8")
+                try:
+                    data = data + currentData.decode(encoding = 'UTF-8',errors = 'ignore')
+                except BaseException as msg:
+                    logging.writeToFile('Some data could not be decoded to str, error message: %s' % str(msg))
 
-            sock.close()
+                dataSTR = dataSTR + str(currentData)
 
-            logging.writeToFile(data)
 
-            return data
+            sock.close()
+            logging.writeToFile('Final data: %s.' % (dataSTR))
+            return data, dataSTR
         except BaseException as msg:
             logging.writeToFile(str(msg) + " [sendCommand]")
             return "0" + str(msg)
@@ -216,10 +216,10 @@ def executioner(command, user=None):
                 ProcessUtilities.normalExecutioner(command)
                 return 1
 
-            ret = ProcessUtilities.sendCommand(command, user)
+            ret, dataSTR = ProcessUtilities.sendCommand(command, user)
 
             exitCode = ret[len(ret) -1]
-            exitCode = int(exitCode.encode('hex'), 16)
+            exitCode = int(codecs.encode(exitCode.encode(), 'hex'))
 
             if exitCode == 0:
                 return 1
@@ -238,8 +238,8 @@ def outputExecutioner(command, user=None):
 
             if type(command) == list:
                 command = " ".join(command)
-
-            return ProcessUtilities.sendCommand(command, user)[:-1]
+            data, dataSTR = ProcessUtilities.sendCommand(command, user)
+            return dataSTR[:-1]
         except BaseException as msg:
             logging.writeToFile(str(msg) + "[outputExecutioner:188]")
 

diff --git a/upgrade.sh b/upgrade.sh
@@ -6,7 +6,7 @@
 ## Then run it like below.
 ## /usr/local/CyberCP/upgrade.sh
 
-cd /usr/local/CyberCP && /usr/local/CyberCP/bin/python2 manage.py collectstatic --no-input
+cd /usr/local/CyberCP && /usr/local/CyberCP/bin/python manage.py collectstatic --no-input
 rm -rf /usr/local/CyberCP/public/static/*
 cp -R  /usr/local/CyberCP/static/* /usr/local/CyberCP/public/static/
 find /usr/local/CyberCP -type d -exec chmod 0755 {} \;