bug fix: alias domains, php fetch and domain with sudo

Author: usmannasir

CLScript/CloudLinuxDomains.py

@@ -51,6 +51,7 @@ def listAll(self):
     parser = argparse.ArgumentParser(description='CyberPanel CloudLinux Manager')
     parser.add_argument('-o', '--owner', help='Owner')
     parser.add_argument('-n', '--name', help='Owner')
+    parser.add_argument('-p', '--with-php', help='False (X-Ray support only)')
 
     args = parser.parse_args()
 

plogical/IncScheduler.py

@@ -533,7 +533,6 @@ def startNormalBackups(type):
                         if result.find(pid) > -1 and result.find('IncScheduler.py') > -1:
                             quit(1)
 
-
                     except:
                         ### Save some important info in backup config
                         oldJobContinue = 0

plogical/childDomain.py

@@ -15,9 +15,9 @@ def __init__(self, masterDomain = None, childDomain = None):
         self.masterDomain = masterDomain
         self.childDomain = childDomain
 
-    def findChildDomainsJson(self):
+    def findChildDomainsJson(self, alias=0):
         master = Websites.objects.get(domain=self.masterDomain)
-        childDomains = master.childdomains_set.all()
+        childDomains = master.childdomains_set.filter(alais=alias)
 
         json_data = "["
         checker = 0

plogical/phpUtilities.py

@@ -266,7 +266,7 @@ def WrapGetPHPVersionFromFileToGetVersionWithPHP(vhFile):
         if os.path.exists(ProcessUtilities.debugPath):
             logging.CyberCPLogFileWriter.writeToFile(result)
 
-        command = result + " -v | awk '/^PHP/ {print $2}'"
+        command = result + " -v 2>/dev/null | awk '/^PHP/ {print $2}'"
         php_version = ProcessUtilities.outputExecutioner(command, None, True).rstrip('\n')
         return f"PHP {php_version}"
 
@@ -291,8 +291,6 @@ def FindIfSaidPHPIsAvaiableOtherwiseMaketheNextOneAvailableToUse(vhFile, phpVers
                 return PHPManager.findPHPVersions()[-2]
 
 
-
-
     @staticmethod
     def InstallSaidPHP(php):
         if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or  ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
@@ -305,10 +303,6 @@ def InstallSaidPHP(php):
 
 
 
-
-
-
-
 def main():
 
     parser = argparse.ArgumentParser(description='CyberPanel Installer')

plogical/processUtilities.py

@@ -245,8 +245,9 @@ def sendCommand(command, user=None, dir=None):
                     command = '%s-u %s %s' % (ProcessUtilities.token, user, command)
                 else:
                     command = '%s-u %s -d %s %s' % (ProcessUtilities.token, user, dir, command)
-                command = command.replace('sudo', '')
 
+                if command.startswith('sudo'):
+                    command = command.replace('sudo', '', 1)  # Replace 'sudo' with an empty string, only once
 
                 if os.path.exists(ProcessUtilities.debugPath):
                     if command.find('cat') == -1:

plogical/sslUtilities.py

@@ -37,6 +37,10 @@ def getDomainsCovered(cert_path):
                 if san_extension:
                     # Extract and print the domains from SAN
                     san_domains = san_extension.value.get_values_for_type(x509.DNSName)
+                    try:
+                        logging.CyberCPLogFileWriter.writeToFile(f'Covered domains: {str(san_domains)}')
+                    except:
+                        pass
                     return 1, san_domains
                 else:
                     # If SAN is not present, return the Common Name as a fallback
@@ -54,20 +58,52 @@ def CheckIfSSLNeedsToBeIssued(virtualHostName):
             x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, open(filePath, 'r').read())
             SSLProvider = x509.get_issuer().get_components()[1][1].decode('utf-8')
 
-            if SSLProvider != 'Denial':
-                return sslUtilities.ISSUE_SSL
-            else:
-                status, domains = sslUtilities.getDomainsCovered(filePath)
 
+
+            #### totally seprate check to see if both non-www and www are covered
+
+            if SSLProvider == "Let's Encrypt":
+                status, domains = sslUtilities.getDomainsCovered(filePath)
                 if status:
                     if len(domains) > 1:
-                        return sslUtilities.DONT_ISSUE
+                        ### need further checks here to see if ssl is valid for less then 15 days etc
+                        logging.CyberCPLogFileWriter.writeToFile(
+                            '[CheckIfSSLNeedsToBeIssued] SSL exists for %s and both versions are covered, just need to ensure if SSL is valid for less then 15 days.' % (virtualHostName), 0)
+                        pass
                     else:
                         return sslUtilities.ISSUE_SSL
+
+            #####
+
+            expireData = x509.get_notAfter().decode('ascii')
+            from datetime import datetime
+            finalDate = datetime.strptime(expireData, '%Y%m%d%H%M%SZ')
+            now = datetime.now()
+            diff = finalDate - now
+
+            if int(diff.days) >= 15 and SSLProvider!='Denial':
+                logging.CyberCPLogFileWriter.writeToFile(
+                    '[CheckIfSSLNeedsToBeIssued] SSL exists for %s and is not ready to fetch new SSL., skipping..' % (
+                        virtualHostName), 0)
+
+                return sslUtilities.DONT_ISSUE
+            elif SSLProvider == 'Denial':
+                logging.CyberCPLogFileWriter.writeToFile(
+                    f'[CheckIfSSLNeedsToBeIssued] Self-signed SSL found, lets issue new SSL for {virtualHostName}', 0)
+                return sslUtilities.ISSUE_SSL
+            elif SSLProvider != "Let's Encrypt":
+                logging.CyberCPLogFileWriter.writeToFile(
+                    f'[CheckIfSSLNeedsToBeIssued] Custom SSL found for {virtualHostName}', 0)
+                return sslUtilities.DONT_ISSUE
+            else:
+                logging.CyberCPLogFileWriter.writeToFile(
+                    f'[CheckIfSSLNeedsToBeIssued] We will issue SSL for {virtualHostName}', 0)
+                return sslUtilities.ISSUE_SSL
         else:
+            logging.CyberCPLogFileWriter.writeToFile(
+                f'[CheckIfSSLNeedsToBeIssued] We will issue SSL for {virtualHostName}', 0)
             return sslUtilities.ISSUE_SSL
 
-
     @staticmethod
     def checkIfSSLMap(virtualHostName):
         try:
@@ -435,6 +471,7 @@ def installSSLForDomain(virtualHostName, adminEmail='example@example.org'):
 
     @staticmethod
     def obtainSSLForADomain(virtualHostName, adminEmail, sslpath, aliasDomain=None):
+
         from plogical.acl import ACLManager
         from plogical.sslv2 import sslUtilities as sslv2
         import json

plogical/upgrade.py

@@ -2047,6 +2047,13 @@ def IncBackupMigrations():
             except:
                 pass
 
+            query = "ALTER TABLE `websiteFunctions_childdomains` ADD `alais` INT NOT NULL DEFAULT '0' AFTER `master_id`; "
+            try:
+                cursor.execute(query)
+            except:
+                pass
+
+
             try:
                 connection.close()
             except:

plogical/virtualHostUtilities.py

@@ -1243,7 +1243,7 @@ def saveSSL(virtualHost, keyPath, certPath):
 
     @staticmethod
     def createDomain(masterDomain, virtualHostName, phpVersion, path, ssl, dkimCheck, openBasedir, owner, apache,
-                     tempStatusPath='/home/cyberpanel/fakePath', LimitsCheck=1):
+                     tempStatusPath='/home/cyberpanel/fakePath', LimitsCheck=1, alias = 0):
         try:
 
             logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Running some checks..,0')
@@ -1336,7 +1336,7 @@ def createDomain(masterDomain, virtualHostName, phpVersion, path, ssl, dkimCheck
 
             if LimitsCheck:
                 website = ChildDomains(master=master, domain=virtualHostName, path=path, phpSelection=phpVersion,
-                                       ssl=ssl)
+                                       ssl=ssl, alais=alias)
                 website.save()
 
             if ssl == 1:
@@ -1852,9 +1852,14 @@ def main():
         except:
             tempStatusPath = '/home/cyberpanel/fakePath'
 
+        try:
+            aliasDomain = int(args.aliasDomain)
+        except:
+            aliasDomain = 0
+
         virtualHostUtilities.createDomain(args.masterDomain, args.virtualHostName, args.phpVersion, args.path,
                                           int(args.ssl), dkimCheck, openBasedir, args.websiteOwner, apache,
-                                          tempStatusPath)
+                                          tempStatusPath, 1, aliasDomain)
     elif args.function == "issueSSL":
         virtualHostUtilities.issueSSL(args.virtualHostName, args.path, args.administratorEmail)
     elif args.function == "issueSSLv2":

websiteFunctions/models.py

@@ -27,6 +27,8 @@ class ChildDomains(models.Model):
     path = models.CharField(max_length=200,default=None)
     ssl = models.IntegerField()
     phpSelection = models.CharField(max_length=10,default=None)
+    alais = models.IntegerField(default=0)
+
 
 class Backups(models.Model):
     website = models.ForeignKey(Websites,on_delete=models.CASCADE)