mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2025-11-06 13:25:51 +01:00
bug fix: encodings and imports
This commit is contained in:
@@ -3,7 +3,7 @@ import os
|
||||
import subprocess
|
||||
import shlex
|
||||
import plogical.CyberCPLogFileWriter as logging
|
||||
from .ApacheVhosts import ApacheVhost
|
||||
from ApachController.ApacheVhosts import ApacheVhost
|
||||
|
||||
|
||||
class ApacheController:
|
||||
|
||||
@@ -9,7 +9,7 @@ import json
|
||||
from django.shortcuts import HttpResponse
|
||||
from math import ceil
|
||||
from websiteFunctions.models import Websites
|
||||
from .models import CLPackages
|
||||
from CLManager.models import CLPackages
|
||||
|
||||
|
||||
class CLManagerMain(multi.Thread):
|
||||
|
||||
@@ -20,7 +20,7 @@ class cliLogger:
|
||||
def readLastNFiles(numberOfLines,fileName):
|
||||
try:
|
||||
|
||||
lastFewLines = subprocess.check_output(["tail", "-n",str(numberOfLines),fileName])
|
||||
lastFewLines = subprocess.check_output(["tail", "-n",str(numberOfLines),fileName]).decode("utf-8")
|
||||
|
||||
return lastFewLines
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import django
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
|
||||
django.setup()
|
||||
from inspect import stack
|
||||
from .cliLogger import cliLogger as logger
|
||||
from cli.cliLogger import cliLogger as logger
|
||||
import json
|
||||
from plogical.virtualHostUtilities import virtualHostUtilities
|
||||
import re
|
||||
@@ -17,7 +17,7 @@ import requests
|
||||
from loginSystem.models import Administrator
|
||||
from packages.models import Package
|
||||
from plogical.mysqlUtilities import mysqlUtilities
|
||||
from .cliParser import cliParser
|
||||
from cli.cliParser import cliParser
|
||||
from plogical.vhost import vhost
|
||||
from plogical.mailUtilities import mailUtilities
|
||||
from plogical.ftpUtilities import FTPUtilities
|
||||
|
||||
@@ -333,7 +333,7 @@ def getUsageData(request):
|
||||
finalData['writeRate'] = 0
|
||||
except:
|
||||
command = "top -b -n 1 -u " + website.externalApp + " | awk 'NR>7 { sum += $9; } END { print sum; }'"
|
||||
output = str(subprocess.check_output(command, shell=True))
|
||||
output = str(subprocess.check_output(command, shell=True).decode("utf-8"))
|
||||
|
||||
finalData = {}
|
||||
finalData['status'] = 1
|
||||
|
||||
@@ -99,14 +99,14 @@ class HAManager(multi.Thread):
|
||||
workerToken = ''
|
||||
|
||||
command = "sudo docker swarm join-token manager"
|
||||
output = subprocess.check_output(shlex.split(command)).splitlines()
|
||||
output = subprocess.check_output(shlex.split(command)).decode("utf-8").splitlines()
|
||||
|
||||
for items in output:
|
||||
if items.find('--token') > -1:
|
||||
managerToken = items.split(' ')[-2]
|
||||
|
||||
command = "sudo docker swarm join-token worker"
|
||||
output = subprocess.check_output(shlex.split(command)).splitlines()
|
||||
output = subprocess.check_output(shlex.split(command)).decode("utf-8").splitlines()
|
||||
|
||||
for items in output:
|
||||
if items.find('--token') > -1:
|
||||
|
||||
@@ -112,7 +112,7 @@ class preFlightsChecks:
|
||||
try:
|
||||
## On OpenVZ there is an issue using .tempdisk for /tmp as it breaks network on container after reboot.
|
||||
|
||||
if subprocess.check_output('systemd-detect-virt').find("openvz") > -1:
|
||||
if subprocess.check_output('systemd-detect-virt').decode("utf-8").find("openvz") > -1:
|
||||
|
||||
varTmp = "/var/tmp /tmp none bind 0 0\n"
|
||||
|
||||
@@ -220,7 +220,7 @@ class preFlightsChecks:
|
||||
def checkIfSeLinuxDisabled(self):
|
||||
try:
|
||||
command = "sestatus"
|
||||
output = subprocess.check_output(shlex.split(command))
|
||||
output = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
|
||||
if output.find("disabled") > -1 or output.find("permissive") > -1:
|
||||
logging.InstallLog.writeToFile("SELinux Check OK. [checkIfSeLinuxDisabled]")
|
||||
@@ -1303,7 +1303,7 @@ imap_folder_list_limit = 0
|
||||
def removeUfw(self):
|
||||
try:
|
||||
preFlightsChecks.stdOut("Checking to see if ufw firewall is installed (will be removed)", 1)
|
||||
status = subprocess.check_output(shlex.split('ufw status'))
|
||||
status = subprocess.check_output(shlex.split('ufw status')).decode("utf-8")
|
||||
preFlightsChecks.stdOut("ufw current status: " + status + "...will be removed")
|
||||
except BaseException as msg:
|
||||
preFlightsChecks.stdOut("[ERROR] Expected access to ufw not available, do not need to remove it", 1)
|
||||
|
||||
@@ -716,7 +716,7 @@ class MailServerManager:
|
||||
def installStatusOpenDKIM(self):
|
||||
try:
|
||||
command = "sudo cat " + mailUtilities.installLogPath
|
||||
installStatus = subprocess.check_output(shlex.split(command))
|
||||
installStatus = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
|
||||
if installStatus.find("[200]") > -1:
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ class ServiceManager:
|
||||
path = '/etc/pdns/pdns.conf'
|
||||
|
||||
data = ProcessUtilities.outputExecutioner('sudo cat ' + path).splitlines()
|
||||
#data = subprocess.check_output(shlex.split('sudo cat ' + path)).splitlines()
|
||||
#data = subprocess.check_output(shlex.split('sudo cat ' + path)).decode("utf-8").splitlines()
|
||||
|
||||
|
||||
if type == 'MASTER':
|
||||
|
||||
@@ -4,12 +4,7 @@ sys.path.append('/usr/local/CyberCP')
|
||||
import django
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
|
||||
django.setup()
|
||||
from loginSystem.models import Administrator, ACL
|
||||
from django.shortcuts import HttpResponse
|
||||
from packages.models import Package
|
||||
from websiteFunctions.models import Websites
|
||||
from dns.models import Domains
|
||||
import json
|
||||
|
||||
class AliasManager:
|
||||
|
||||
|
||||
@@ -9,12 +9,12 @@ django.setup()
|
||||
import threading as multi
|
||||
from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
from .vhost import vhost
|
||||
from plogical.vhost import vhost
|
||||
from websiteFunctions.models import ChildDomains, Websites
|
||||
from . import randomPassword
|
||||
from .mysqlUtilities import mysqlUtilities
|
||||
from plogical import randomPassword
|
||||
from plogical.mysqlUtilities import mysqlUtilities
|
||||
from databases.models import Databases
|
||||
from .installUtilities import installUtilities
|
||||
from plogical.installUtilities import installUtilities
|
||||
import shutil
|
||||
from plogical.mailUtilities import mailUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
|
||||
@@ -7,15 +7,15 @@ sys.path.append('/usr/local/CyberCP')
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
|
||||
django.setup()
|
||||
import json
|
||||
from .acl import ACLManager
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical.acl import ACLManager
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
from websiteFunctions.models import Websites, Backups, dest, backupSchedules
|
||||
from .virtualHostUtilities import virtualHostUtilities
|
||||
from plogical.virtualHostUtilities import virtualHostUtilities
|
||||
import subprocess
|
||||
import shlex
|
||||
from django.shortcuts import HttpResponse, render
|
||||
from loginSystem.models import Administrator
|
||||
from .mailUtilities import mailUtilities
|
||||
from plogical.mailUtilities import mailUtilities
|
||||
from random import randint
|
||||
import time
|
||||
import plogical.backupUtilities as backupUtil
|
||||
@@ -168,7 +168,7 @@ class BackupManager:
|
||||
try:
|
||||
backupFileNamePath = os.path.join("/home", backupDomain, "backup/backupFileName")
|
||||
command = "sudo cat " + backupFileNamePath
|
||||
fileName = subprocess.check_output(shlex.split(command))
|
||||
fileName = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
except:
|
||||
fileName = "Fetching.."
|
||||
|
||||
@@ -176,7 +176,7 @@ class BackupManager:
|
||||
|
||||
if os.path.exists(status):
|
||||
command = "sudo cat " + status
|
||||
status = subprocess.check_output(shlex.split(command))
|
||||
status = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
|
||||
if status.find("Completed") > -1:
|
||||
|
||||
@@ -322,7 +322,7 @@ class BackupManager:
|
||||
if os.path.exists(path):
|
||||
try:
|
||||
execPath = "sudo cat " + path + "/status"
|
||||
status = subprocess.check_output(shlex.split(execPath))
|
||||
status = subprocess.check_output(shlex.split(execPath)).decode("utf-8")
|
||||
|
||||
if status.find("Done") > -1:
|
||||
|
||||
@@ -410,7 +410,7 @@ class BackupManager:
|
||||
execPath = execPath + " submitDestinationCreation --ipAddress " + ipAddress + " --password " \
|
||||
+ password + " --port " + port
|
||||
|
||||
output = subprocess.check_output(shlex.split(execPath))
|
||||
output = subprocess.check_output(shlex.split(execPath)).decode("utf-8")
|
||||
|
||||
if output.find('1,') > -1:
|
||||
try:
|
||||
@@ -488,7 +488,7 @@ class BackupManager:
|
||||
execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/backupUtilities.py"
|
||||
execPath = execPath + " getConnectionStatus --ipAddress " + ipAddress
|
||||
|
||||
output = subprocess.check_output(shlex.split(execPath))
|
||||
output = subprocess.check_output(shlex.split(execPath)).decode("utf-8")
|
||||
|
||||
if output.find('1,') > -1:
|
||||
final_dic = {'connStatus': 1, 'error_message': "None"}
|
||||
@@ -1036,7 +1036,7 @@ class BackupManager:
|
||||
|
||||
execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/remoteTransferUtilities.py"
|
||||
execPath = execPath + " writeAuthKey --pathToKey " + pathToKey
|
||||
output = subprocess.check_output(shlex.split(execPath))
|
||||
output = subprocess.check_output(shlex.split(execPath)).decode("utf-8")
|
||||
|
||||
if output.find("1,None") > -1:
|
||||
pass
|
||||
@@ -1236,7 +1236,7 @@ class BackupManager:
|
||||
|
||||
if os.path.isfile(backupLogPath):
|
||||
command = "sudo cat " + backupLogPath
|
||||
status = subprocess.check_output(shlex.split(command))
|
||||
status = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
|
||||
if status.find("completed[success]") > -1:
|
||||
command = "sudo rm -rf " + removalPath
|
||||
@@ -1294,7 +1294,7 @@ class BackupManager:
|
||||
pathpid = path + "/pid"
|
||||
|
||||
command = "sudo cat " + pathpid
|
||||
pid = subprocess.check_output(shlex.split(command))
|
||||
pid = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
|
||||
command = "sudo kill -KILL " + pid
|
||||
subprocess.call(shlex.split(command))
|
||||
|
||||
@@ -10,7 +10,7 @@ import subprocess
|
||||
import shlex
|
||||
import os
|
||||
import time
|
||||
from .backupUtilities import backupUtilities
|
||||
from plogical.backupUtilities import backupUtilities
|
||||
from re import match,I,M
|
||||
from websiteFunctions.models import Websites, Backups
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import os
|
||||
import time
|
||||
from .backupSchedule import backupSchedule
|
||||
from plogical.backupSchedule import backupSchedule
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
from re import match,I,M
|
||||
|
||||
|
||||
@@ -7,19 +7,19 @@ try:
|
||||
except:
|
||||
pass
|
||||
import pexpect
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import shlex
|
||||
from shutil import make_archive,rmtree
|
||||
from . import mysqlUtilities
|
||||
from plogical import mysqlUtilities
|
||||
import tarfile
|
||||
from multiprocessing import Process
|
||||
import signal
|
||||
from .installUtilities import installUtilities
|
||||
from plogical.installUtilities import installUtilities
|
||||
import argparse
|
||||
try:
|
||||
from .virtualHostUtilities import virtualHostUtilities
|
||||
from .sslUtilities import sslUtilities
|
||||
from plogical.virtualHostUtilities import virtualHostUtilities
|
||||
from plogical.sslUtilities import sslUtilities
|
||||
from plogical.mailUtilities import mailUtilities
|
||||
except:
|
||||
pass
|
||||
@@ -35,7 +35,7 @@ try:
|
||||
from websiteFunctions.models import Websites, ChildDomains, Backups
|
||||
from databases.models import Databases
|
||||
from loginSystem.models import Administrator
|
||||
from .dnsUtilities import DNS
|
||||
from plogical.dnsUtilities import DNS
|
||||
from mailServer.models import Domains as eDomains
|
||||
from backup.models import DBUsers
|
||||
except:
|
||||
@@ -876,7 +876,7 @@ class backupUtilities:
|
||||
@staticmethod
|
||||
def checkIfHostIsUp(IPAddress):
|
||||
try:
|
||||
if subprocess.check_output(['ping', IPAddress, '-c 1']).find("0% packet loss") > -1:
|
||||
if subprocess.check_output(['ping', IPAddress, '-c 1']).decode("utf-8").find("0% packet loss") > -1:
|
||||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import argparse
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
|
||||
class CronUtil:
|
||||
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
#!/usr/local/CyberCP/bin/python
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import shlex
|
||||
import argparse
|
||||
from .virtualHostUtilities import virtualHostUtilities
|
||||
import os
|
||||
import tarfile
|
||||
import shutil
|
||||
from .mailUtilities import mailUtilities
|
||||
import threading as multi
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
|
||||
|
||||
@@ -7,12 +7,12 @@ try:
|
||||
django.setup()
|
||||
except:
|
||||
pass
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import shlex
|
||||
try:
|
||||
from dns.models import Domains,Records
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
from manageServices.models import PDNSStatus, SlaveServers
|
||||
except:
|
||||
pass
|
||||
@@ -397,7 +397,7 @@ class DNS:
|
||||
|
||||
path = "/etc/opendkim/keys/" + topLevelDomain + "/default.txt"
|
||||
command = "sudo cat " + path
|
||||
output = subprocess.check_output(shlex.split(command))
|
||||
output = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
leftIndex = output.index('(') + 2
|
||||
rightIndex = output.rindex(')') - 1
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import os
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import shlex
|
||||
import subprocess
|
||||
class findBWUsage:
|
||||
|
||||
@@ -4,9 +4,9 @@ sys.path.append('/usr/local/CyberCP')
|
||||
import django
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
|
||||
django.setup()
|
||||
from . import mysqlUtilities as sql
|
||||
from plogical import mysqlUtilities as sql
|
||||
import subprocess
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import os
|
||||
import shlex
|
||||
import argparse
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import subprocess
|
||||
import sys
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import shutil
|
||||
import pexpect
|
||||
import os
|
||||
import shlex
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
|
||||
class installUtilities:
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@ except:
|
||||
pass
|
||||
import os.path
|
||||
import shutil
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import argparse
|
||||
import shlex
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
import os, getpass
|
||||
import hashlib
|
||||
import bcrypt
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import shlex
|
||||
import argparse
|
||||
from .virtualHostUtilities import virtualHostUtilities
|
||||
from plogical.virtualHostUtilities import virtualHostUtilities
|
||||
import os
|
||||
import tarfile
|
||||
import shutil
|
||||
from .mailUtilities import mailUtilities
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.mailUtilities import mailUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
from plogical.installUtilities import installUtilities
|
||||
|
||||
class modSec:
|
||||
|
||||
@@ -6,7 +6,7 @@ try:
|
||||
django.setup()
|
||||
except:
|
||||
pass
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import shlex
|
||||
try:
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import shlex
|
||||
import _thread
|
||||
from . import installUtilities
|
||||
from plogical import installUtilities
|
||||
import argparse
|
||||
import os
|
||||
from .mailUtilities import mailUtilities
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.mailUtilities import mailUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
|
||||
class phpUtilities:
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from django.http import HttpResponse
|
||||
from .CyberCPLogFileWriter import CyberCPLogFileWriter as logging
|
||||
from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
|
||||
|
||||
|
||||
class pluginManagerGlobal:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from .CyberCPLogFileWriter import CyberCPLogFileWriter as logging
|
||||
from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
|
||||
import subprocess
|
||||
import shlex
|
||||
import os
|
||||
@@ -52,9 +52,9 @@ class ProcessUtilities(multi.Thread):
|
||||
def restartLitespeed():
|
||||
try:
|
||||
if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
|
||||
command = "sudo systemctl restart lsws"
|
||||
command = "systemctl restart lsws"
|
||||
else:
|
||||
command = "sudo /usr/local/lsws/bin/lswsctrl restart"
|
||||
command = "/usr/local/lsws/bin/lswsctrl restart"
|
||||
|
||||
cmd = shlex.split(command)
|
||||
res = subprocess.call(cmd)
|
||||
@@ -71,9 +71,9 @@ class ProcessUtilities(multi.Thread):
|
||||
def stopLitespeed():
|
||||
try:
|
||||
if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
|
||||
command = "sudo systemctl stop lsws"
|
||||
command = "systemctl stop lsws"
|
||||
else:
|
||||
command = "sudo /usr/local/lsws/bin/lswsctrl stop"
|
||||
command = "/usr/local/lsws/bin/lswsctrl stop"
|
||||
|
||||
cmd = shlex.split(command)
|
||||
res = subprocess.call(cmd)
|
||||
@@ -104,7 +104,7 @@ class ProcessUtilities(multi.Thread):
|
||||
@staticmethod
|
||||
def killLiteSpeed():
|
||||
try:
|
||||
command = 'sudo systemctl stop lsws'
|
||||
command = 'systemctl stop lsws'
|
||||
ProcessUtilities.normalExecutioner(command)
|
||||
except:
|
||||
pass
|
||||
@@ -120,8 +120,6 @@ class ProcessUtilities(multi.Thread):
|
||||
|
||||
@staticmethod
|
||||
def decideServer():
|
||||
entPath = '/usr/local/lsws/bin/lshttpd'
|
||||
|
||||
if os.path.exists('/usr/local/lsws/bin/openlitespeed'):
|
||||
return ProcessUtilities.OLS
|
||||
else:
|
||||
@@ -139,7 +137,7 @@ class ProcessUtilities(multi.Thread):
|
||||
@staticmethod
|
||||
def containerCheck():
|
||||
try:
|
||||
command = 'sudo cat /etc/cgrules.conf'
|
||||
command = 'cat /etc/cgrules.conf'
|
||||
output = ProcessUtilities.outputExecutioner(command)
|
||||
if output.find('No such') > -1:
|
||||
return 0
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import os
|
||||
import requests
|
||||
import json
|
||||
import time
|
||||
from . import backupUtilities as backupUtil
|
||||
from plogical import backupUtilities as backupUtil
|
||||
import subprocess
|
||||
import shlex
|
||||
from multiprocessing import Process
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import argparse
|
||||
import os
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from . import backupUtilities as backupUtil
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
from plogical import backupUtilities as backupUtil
|
||||
import time
|
||||
from multiprocessing import Process
|
||||
import json
|
||||
@@ -11,7 +11,7 @@ import shlex
|
||||
from shutil import move
|
||||
from plogical.virtualHostUtilities import virtualHostUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
from .backupSchedule import backupSchedule
|
||||
from plogical.backupSchedule import backupSchedule
|
||||
import shutil
|
||||
|
||||
class remoteTransferUtilities:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
import os
|
||||
import shlex
|
||||
import subprocess
|
||||
@@ -284,7 +284,7 @@ class sslUtilities:
|
||||
|
||||
logging.CyberCPLogFileWriter.writeToFile(command)
|
||||
|
||||
output = subprocess.check_output(shlex.split(command))
|
||||
output = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
logging.CyberCPLogFileWriter.writeToFile("Successfully obtained SSL for: " + virtualHostName + " and: www." + virtualHostName)
|
||||
|
||||
|
||||
@@ -297,7 +297,7 @@ class sslUtilities:
|
||||
command = acmePath + " --issue -d " + virtualHostName + ' --cert-file ' + existingCertPath \
|
||||
+ '/cert.pem' + ' --key-file ' + existingCertPath + '/privkey.pem' \
|
||||
+ ' --fullchain-file ' + existingCertPath + '/fullchain.pem' + ' -w ' + sslpath + ' --force'
|
||||
output = subprocess.check_output(shlex.split(command))
|
||||
output = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
logging.CyberCPLogFileWriter.writeToFile("Successfully obtained SSL for: " + virtualHostName)
|
||||
except subprocess.CalledProcessError:
|
||||
logging.CyberCPLogFileWriter.writeToFile('Failed to obtain SSL, issuing self-signed SSL for: ' + virtualHostName)
|
||||
@@ -318,7 +318,7 @@ class sslUtilities:
|
||||
+ ' --cert-file ' + existingCertPath + '/cert.pem' + ' --key-file ' + existingCertPath + '/privkey.pem' \
|
||||
+ ' --fullchain-file ' + existingCertPath + '/fullchain.pem' + ' -w ' + sslpath + ' --force'
|
||||
|
||||
output = subprocess.check_output(shlex.split(command))
|
||||
output = subprocess.check_output(shlex.split(command)).decode("utf-8")
|
||||
logging.CyberCPLogFileWriter.writeToFile(
|
||||
"Successfully obtained SSL for: " + virtualHostName + ", www." + virtualHostName + ", " + aliasDomain + "and www." + aliasDomain + ",")
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import subprocess
|
||||
import shlex
|
||||
|
||||
print (subprocess.check_output(shlex.split('ls -la')).decode("utf-8"))
|
||||
print(subprocess.check_output(shlex.split('ls -la')).decode("utf-8"))
|
||||
@@ -1781,7 +1781,7 @@ enabled=1"""
|
||||
if items.password.find('CRYPT') > -1:
|
||||
continue
|
||||
command = 'doveadm pw -p %s' % (items.password)
|
||||
items.password = subprocess.check_output(shlex.split(command)).strip('\n')
|
||||
items.password = subprocess.check_output(shlex.split(command)).decode("utf-8").strip('\n')
|
||||
items.save()
|
||||
|
||||
command = "systemctl restart dovecot"
|
||||
@@ -1907,7 +1907,7 @@ failovermethod=priority
|
||||
if items.password.find('CRYPT') > -1:
|
||||
continue
|
||||
command = 'doveadm pw -p %s' % (items.password)
|
||||
items.password = subprocess.check_output(shlex.split(command)).strip('\n')
|
||||
items.password = subprocess.check_output(shlex.split(command)).decode("utf-8").strip('\n')
|
||||
items.save()
|
||||
|
||||
|
||||
|
||||
@@ -10,18 +10,18 @@ try:
|
||||
except:
|
||||
pass
|
||||
import shutil
|
||||
from . import installUtilities
|
||||
from plogical import installUtilities
|
||||
|
||||
import subprocess
|
||||
import shlex
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
|
||||
from .mysqlUtilities import mysqlUtilities
|
||||
from .dnsUtilities import DNS
|
||||
from plogical.mysqlUtilities import mysqlUtilities
|
||||
from plogical.dnsUtilities import DNS
|
||||
from random import randint
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
from managePHP.phpManager import PHPManager
|
||||
from .vhostConfs import vhostConfs
|
||||
from plogical.vhostConfs import vhostConfs
|
||||
from ApachController.ApacheVhosts import ApacheVhost
|
||||
try:
|
||||
from websiteFunctions.models import Websites, ChildDomains, aliasDomains
|
||||
|
||||
@@ -8,31 +8,31 @@ sys.path.append('/usr/local/CyberCP')
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
|
||||
django.setup()
|
||||
import json
|
||||
from .acl import ACLManager
|
||||
from . import CyberCPLogFileWriter as logging
|
||||
from plogical.acl import ACLManager
|
||||
from plogical import CyberCPLogFileWriter as logging
|
||||
from websiteFunctions.models import Websites, ChildDomains
|
||||
from .virtualHostUtilities import virtualHostUtilities
|
||||
from plogical.virtualHostUtilities import virtualHostUtilities
|
||||
import subprocess
|
||||
import shlex
|
||||
from .installUtilities import installUtilities
|
||||
from plogical.installUtilities import installUtilities
|
||||
from django.shortcuts import HttpResponse, render
|
||||
from loginSystem.models import Administrator, ACL
|
||||
from packages.models import Package
|
||||
from .mailUtilities import mailUtilities
|
||||
from plogical.mailUtilities import mailUtilities
|
||||
from random import randint
|
||||
import time
|
||||
import re
|
||||
from .childDomain import ChildDomainManager
|
||||
from plogical.childDomain import ChildDomainManager
|
||||
from math import ceil
|
||||
from plogical.alias import AliasManager
|
||||
from plogical.applicationInstaller import ApplicationInstaller
|
||||
from databases.models import Databases
|
||||
from . import randomPassword as randomPassword
|
||||
from plogical import randomPassword as randomPassword
|
||||
import hashlib
|
||||
from .mysqlUtilities import mysqlUtilities
|
||||
from plogical.mysqlUtilities import mysqlUtilities
|
||||
from plogical import hashPassword
|
||||
from emailMarketing.emACL import emACL
|
||||
from .processUtilities import ProcessUtilities
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
from managePHP.phpManager import PHPManager
|
||||
from ApachController.ApacheVhosts import ApacheVhost
|
||||
from plogical.vhostConfs import vhostConfs
|
||||
|
||||
Reference in New Issue
Block a user