Merge pull request #1685 from master3395/v2.5.5-dev

V2.5.5 dev

Author: master3395

baseTemplate/views.py

@@ -33,6 +33,27 @@
 BUILD = 'dev'
 
 
+def _version_compare(a, b):
+    """Return 1 if a > b, -1 if a < b, 0 if equal."""
+    def parse(v):
+        parts = []
+        for p in str(v).split('.'):
+            try:
+                parts.append(int(p))
+            except ValueError:
+                parts.append(0)
+        return parts
+    pa, pb = parse(a), parse(b)
+    for i in range(max(len(pa), len(pb))):
+        va = pa[i] if i < len(pa) else 0
+        vb = pb[i] if i < len(pb) else 0
+        if va > vb:
+            return 1
+        if va < vb:
+            return -1
+    return 0
+
+
 @ensure_csrf_cookie
 def renderBase(request):
     template = 'baseTemplate/homePage.html'
@@ -45,27 +66,41 @@ def renderBase(request):
 
 @ensure_csrf_cookie
 def versionManagement(request):
+    currentVersion = VERSION
+    currentBuild = str(BUILD)
+
     getVersion = requests.get('https://cyberpanel.net/version.txt')
     latest = getVersion.json()
     latestVersion = latest['version']
     latestBuild = latest['build']
+    branch_ref = 'v%s.%s' % (latestVersion, latestBuild)
 
-    currentVersion = VERSION
-    currentBuild = str(BUILD)
-
-    u = "https://api.github.com/repos/usmannasir/cyberpanel/commits?sha=v%s.%s" % (latestVersion, latestBuild)
-    logging.writeToFile(u)
-    r = requests.get(u)
-    latestcomit = r.json()[0]['sha']
-
-    command = "git -C /usr/local/CyberCP/ rev-parse HEAD"
-    output = ProcessUtilities.outputExecutioner(command)
-
-    Currentcomt = output.rstrip("\n")
     notechk = True
+    Currentcomt = ''
+    latestcomit = ''
 
-    if Currentcomt == latestcomit:
+    if _version_compare(currentVersion, latestVersion) > 0:
         notechk = False
+    else:
+        remote_cmd = 'git -C /usr/local/CyberCP remote get-url origin 2>/dev/null || true'
+        remote_out = ProcessUtilities.outputExecutioner(remote_cmd)
+        is_usmannasir = 'usmannasir/cyberpanel' in (remote_out or '')
+
+        if is_usmannasir:
+            u = "https://api.github.com/repos/usmannasir/cyberpanel/commits?sha=%s" % branch_ref
+            logging.CyberCPLogFileWriter.writeToFile(u)
+            try:
+                r = requests.get(u, timeout=10)
+                r.raise_for_status()
+                latestcomit = r.json()[0]['sha']
+            except (requests.RequestException, IndexError, KeyError) as e:
+                logging.CyberCPLogFileWriter.writeToFile('[versionManagement] GitHub API failed: %s' % str(e))
+            head_cmd = 'git -C /usr/local/CyberCP rev-parse HEAD 2>/dev/null || true'
+            Currentcomt = ProcessUtilities.outputExecutioner(head_cmd).rstrip('\n')
+            if latestcomit and Currentcomt == latestcomit:
+                notechk = False
+        else:
+            notechk = False
 
     template = 'baseTemplate/versionManagment.html'
     finalData = {'build': currentBuild, 'currentVersion': currentVersion, 'latestVersion': latestVersion,
@@ -253,31 +288,41 @@ def getLoadAverage(request):
 
 @ensure_csrf_cookie
 def versionManagment(request):
-    ## Get latest version
+    currentVersion = VERSION
+    currentBuild = str(BUILD)
 
     getVersion = requests.get('https://cyberpanel.net/version.txt')
     latest = getVersion.json()
     latestVersion = latest['version']
     latestBuild = latest['build']
+    branch_ref = 'v%s.%s' % (latestVersion, latestBuild)
 
-    ## Get local version
-
-    currentVersion = VERSION
-    currentBuild = str(BUILD)
-
-    u = "https://api.github.com/repos/usmannasir/cyberpanel/commits?sha=v%s.%s" % (latestVersion, latestBuild)
-    logging.CyberCPLogFileWriter.writeToFile(u)
-    r = requests.get(u)
-    latestcomit = r.json()[0]['sha']
-
-    command = "git -C /usr/local/CyberCP/ rev-parse HEAD"
-    output = ProcessUtilities.outputExecutioner(command)
-
-    Currentcomt = output.rstrip("\n")
     notechk = True
+    Currentcomt = ''
+    latestcomit = ''
 
-    if (Currentcomt == latestcomit):
+    if _version_compare(currentVersion, latestVersion) > 0:
         notechk = False
+    else:
+        remote_cmd = 'git -C /usr/local/CyberCP remote get-url origin 2>/dev/null || true'
+        remote_out = ProcessUtilities.outputExecutioner(remote_cmd)
+        is_usmannasir = 'usmannasir/cyberpanel' in (remote_out or '')
+
+        if is_usmannasir:
+            u = "https://api.github.com/repos/usmannasir/cyberpanel/commits?sha=%s" % branch_ref
+            logging.CyberCPLogFileWriter.writeToFile(u)
+            try:
+                r = requests.get(u, timeout=10)
+                r.raise_for_status()
+                latestcomit = r.json()[0]['sha']
+            except (requests.RequestException, IndexError, KeyError) as e:
+                logging.CyberCPLogFileWriter.writeToFile('[versionManagment] GitHub API failed: %s' % str(e))
+            head_cmd = 'git -C /usr/local/CyberCP rev-parse HEAD 2>/dev/null || true'
+            Currentcomt = ProcessUtilities.outputExecutioner(head_cmd).rstrip('\n')
+            if latestcomit and Currentcomt == latestcomit:
+                notechk = False
+        else:
+            notechk = False
 
     template = 'baseTemplate/versionManagment.html'
     finalData = {'build': currentBuild, 'currentVersion': currentVersion, 'latestVersion': latestVersion,

cyberpanel_upgrade.sh

@@ -795,24 +795,36 @@ if [ "$Server_OS" = "Ubuntu" ]; then
   fi
 else
   rm -rf /usr/local/CyberPanel
-  if [ -e /usr/bin/pip3 ]; then
-    PIP3="/usr/bin/pip3"
+  # AlmaLinux 9/10, Rocky 9: use python3 -m venv (no virtualenv pkg needed)
+  if [[ "$Server_OS" = "AlmaLinux" ]] || [[ "$Server_OS" = "AlmaLinux9" ]] || [[ "$Server_OS" = "RockyLinux" ]]; then
+    if [[ "$Server_OS_Version" = "9" ]] || [[ "$Server_OS_Version" = "10" ]]; then
+      echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] AlmaLinux/Rocky $Server_OS_Version: will use python3 -m venv, skipping virtualenv package" | tee -a /var/log/cyberpanel_upgrade_debug.log
+    else
+      if [ -e /usr/bin/pip3 ]; then PIP3="/usr/bin/pip3"; else PIP3="pip3.6"; fi
+      $PIP3 install --default-timeout=3600 virtualenv
+      Check_Return
+    fi
   else
-    PIP3="pip3.6"
+    if [ -e /usr/bin/pip3 ]; then PIP3="/usr/bin/pip3"; else PIP3="pip3.6"; fi
+    $PIP3 install --default-timeout=3600 virtualenv
+    Check_Return
   fi
-  $PIP3 install --default-timeout=3600 virtualenv
-  Check_Return
 fi
 
 if [[ -f /usr/local/CyberPanel/bin/python2 ]]; then
   echo -e "\nPython 2 dectected, doing re-setup...\n"
   rm -rf /usr/local/CyberPanel/bin
   if [[ "$Server_OS" = "Ubuntu" ]] && ([[ "$Server_OS_Version" = "22" ]] || [[ "$Server_OS_Version" = "24" ]]); then
     echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Ubuntu $Server_OS_Version detected, using python3 -m venv..." | tee -a /var/log/cyberpanel_upgrade_debug.log
-    python3 -m venv /usr/local/CyberPanel
-  elif [[ "$Server_OS" = "CentOS" ]] && ([[ "$Server_OS_Version" = "9" ]] || [[ "$Server_OS_Version" = "10" ]]); then
-    PYTHON_PATH=$(which python3 2>/dev/null || which python3.9 2>/dev/null || echo "/usr/bin/python3")
-    virtualenv -p "$PYTHON_PATH" --system-site-packages /usr/local/CyberPanel
+    python3 -m venv --system-site-packages /usr/local/CyberPanel
+  elif [[ "$Server_OS" = "CentOS" ]] || [[ "$Server_OS" = "AlmaLinux" ]] || [[ "$Server_OS" = "AlmaLinux9" ]] || [[ "$Server_OS" = "RockyLinux" ]]; then
+    if [[ "$Server_OS_Version" = "9" ]] || [[ "$Server_OS_Version" = "10" ]]; then
+      echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] AlmaLinux/Rocky $Server_OS_Version detected, using python3 -m venv..." | tee -a /var/log/cyberpanel_upgrade_debug.log
+      python3 -m venv --system-site-packages /usr/local/CyberPanel
+    else
+      PYTHON_PATH=$(which python3 2>/dev/null || which python3.9 2>/dev/null || echo "/usr/bin/python3")
+      virtualenv -p "$PYTHON_PATH" --system-site-packages /usr/local/CyberPanel
+    fi
   else
     virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
   fi
@@ -828,14 +840,19 @@ echo -e "\nNothing found, need fresh setup...\n"
 if [[ "$Server_OS" = "Ubuntu" ]] && ([[ "$Server_OS_Version" = "22" ]] || [[ "$Server_OS_Version" = "24" ]]); then
   echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Ubuntu $Server_OS_Version detected, using python3 -m venv..." | tee -a /var/log/cyberpanel_upgrade_debug.log
   python3 -m venv /usr/local/CyberPanel
-elif [[ "$Server_OS" = "CentOS" ]] && ([[ "$Server_OS_Version" = "9" ]] || [[ "$Server_OS_Version" = "10" ]]); then
-  PYTHON_PATH=$(which python3 2>/dev/null || which python3.9 2>/dev/null || echo "/usr/bin/python3")
-  virtualenv -p "$PYTHON_PATH" --system-site-packages /usr/local/CyberPanel
+elif [[ "$Server_OS" = "CentOS" ]] || [[ "$Server_OS" = "AlmaLinux" ]] || [[ "$Server_OS" = "AlmaLinux9" ]] || [[ "$Server_OS" = "RockyLinux" ]]; then
+  if [[ "$Server_OS_Version" = "9" ]] || [[ "$Server_OS_Version" = "10" ]]; then
+    echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] AlmaLinux/Rocky $Server_OS_Version: using python3 -m venv (no virtualenv pkg needed)..." | tee -a /var/log/cyberpanel_upgrade_debug.log
+    python3 -m venv --system-site-packages /usr/local/CyberPanel
+  else
+    PYTHON_PATH=$(which python3 2>/dev/null || which python3.9 2>/dev/null || echo "/usr/bin/python3")
+    virtualenv -p "$PYTHON_PATH" --system-site-packages /usr/local/CyberPanel
+  fi
 else
   virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
 fi
 
-# Check if the virtualenv command failed
+# Check if the virtualenv/venv command failed
 if [ $? -ne 0 ]; then
     echo "virtualenv command failed."
 
@@ -861,11 +878,15 @@ if [ $? -ne 0 ]; then
                 if [ $? -eq 0 ]; then
                     echo "'packaging' module reinstalled and upgraded successfully."
                     if [[ "$Server_OS" = "Ubuntu" ]] && ([[ "$Server_OS_Version" = "22" ]] || [[ "$Server_OS_Version" = "24" ]]); then
-                        echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Ubuntu $Server_OS_Version detected, using python3 -m venv..." | tee -a /var/log/cyberpanel_upgrade_debug.log
-                        python3 -m venv /usr/local/CyberPanel
-                    elif [[ "$Server_OS" = "CentOS" ]] && ([[ "$Server_OS_Version" = "9" ]] || [[ "$Server_OS_Version" = "10" ]]); then
-                        PYTHON_PATH=$(which python3 2>/dev/null || which python3.9 2>/dev/null || echo "/usr/bin/python3")
-                        virtualenv -p "$PYTHON_PATH" --system-site-packages /usr/local/CyberPanel
+                        echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Ubuntu: using python3 -m venv..." | tee -a /var/log/cyberpanel_upgrade_debug.log
+                        python3 -m venv --system-site-packages /usr/local/CyberPanel
+                    elif [[ "$Server_OS" = "CentOS" ]] || [[ "$Server_OS" = "AlmaLinux" ]] || [[ "$Server_OS" = "AlmaLinux9" ]] || [[ "$Server_OS" = "RockyLinux" ]]; then
+                        if [[ "$Server_OS_Version" = "9" ]] || [[ "$Server_OS_Version" = "10" ]]; then
+                          python3 -m venv --system-site-packages /usr/local/CyberPanel
+                        else
+                          PYTHON_PATH=$(which python3 2>/dev/null || which python3.9 2>/dev/null || echo "/usr/bin/python3")
+                          virtualenv -p "$PYTHON_PATH" --system-site-packages /usr/local/CyberPanel
+                        fi
                     else
                         virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
                     fi
@@ -888,7 +909,7 @@ fi
 
 # shellcheck disable=SC1091
 . /usr/local/CyberPanel/bin/activate
-pip install --upgrade setuptools packaging
+pip install --upgrade pip setuptools packaging
 
 Download_Requirement
 

fix-pureftpd-quota-once.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# One-time fix on the server: correct Pure-FTPd Quota line and start the service.
+# Run as root: sudo bash fix-pureftpd-quota-once.sh
+# Use when the panel has written invalid "Quota yes" and Pure-FTPd fails to start.
+
+set -e
+CONF=/etc/pure-ftpd/pure-ftpd.conf
+SERVICE=pure-ftpd
+
+if [ ! -f "$CONF" ]; then
+  echo "Config not found: $CONF"
+  exit 1
+fi
+
+# Fix Quota line (Pure-FTPd requires Quota maxfiles:maxsize, not "yes")
+if grep -q '^Quota' "$CONF"; then
+  sed -i 's/^Quota.*/Quota 100000:100000/' "$CONF"
+  echo "Fixed Quota line in $CONF"
+else
+  echo 'Quota 100000:100000' >> "$CONF"
+  echo "Appended Quota line to $CONF"
+fi
+
+# Optional: disable TLS if cert is missing (common cause of start failure)
+if grep -q '^TLS[[:space:]]*1' "$CONF" && [ ! -f /etc/ssl/private/pure-ftpd.pem ]; then
+  sed -i 's/^TLS[[:space:]]*1/TLS 0/' "$CONF"
+  echo "Set TLS 0 (certificate missing)"
+fi
+
+# Start service
+systemctl start "$SERVICE"
+sleep 1
+if systemctl is-active --quiet "$SERVICE"; then
+  echo "Pure-FTPd is running."
+  exit 0
+else
+  echo "Pure-FTPd failed to start. Run: systemctl status $SERVICE"
+  exit 1
+fi

panelAccess.zip

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+# Panel Access app: custom domain / reverse-proxy CSRF trusted origins

panelAccess/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+# No admin models; settings are stored in a config file

panelAccess/admin.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+"""
+Panel Access app: merges admin-configured custom panel domains into
+CSRF_TRUSTED_ORIGINS so POSTs work when the panel is behind a reverse proxy.
+"""
+import os
+from django.apps import AppConfig
+
+
+def get_panel_csrf_origins_file():
+    """Path to the file where custom panel origins are stored (one per line)."""
+    return os.environ.get(
+        'PANEL_CSRF_ORIGINS_FILE',
+        '/home/cyberpanel/panel_csrf_origins.conf'
+    )
+
+
+def read_panel_csrf_origins():
+    """Read trusted origins from the config file. Returns list of strings."""
+    path = get_panel_csrf_origins_file()
+    if not os.path.isfile(path):
+        return []
+    try:
+        with open(path, 'r') as f:
+            lines = f.readlines()
+    except (OSError, IOError):
+        return []
+    origins = []
+    for line in lines:
+        line = line.strip()
+        if not line or line.startswith('#'):
+            continue
+        origins.append(line)
+    return origins
+
+
+class PanelaccessConfig(AppConfig):
+    name = 'panelAccess'
+    verbose_name = 'Panel Access (Custom Domain / CSRF)'
+
+    def ready(self):
+        """Merge admin-configured origins into CSRF_TRUSTED_ORIGINS at startup."""
+        try:
+            from django.conf import settings
+            custom = read_panel_csrf_origins()
+            if not custom:
+                return
+            base = list(getattr(settings, 'CSRF_TRUSTED_ORIGINS', []))
+            for origin in custom:
+                if origin and origin not in base:
+                    base.append(origin)
+            settings.CSRF_TRUSTED_ORIGINS = base
+        except Exception:
+            pass

panelAccess/apps.py

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cyberpanelPluginConfig>
+    <name>Panel Access (Custom Domain)</name>
+    <type>Utility</type>
+    <description>Configure custom domain(s) for accessing CyberPanel behind a reverse proxy. Fixes 403 CSRF errors on POST (e.g. Ban IP) and optionally sets up OpenLiteSpeed proxy so the panel is reachable at your domain without manual OLS config. Detects panel port from bind.conf (2087/8090).</description>
+        <version>1.0.1</version>
+    <author>master3395</author>
+    <url>/plugins/panelAccess/</url>
+    <settings_url>/plugins/panelAccess/</settings_url>
+    <paid>false</paid>
+</cyberpanelPluginConfig>

panelAccess/meta.xml

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

panelAccess/migrations/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+# No models; origins are stored in a config file (panel_csrf_origins.conf)