fix(emailPremium): Rspamd admin UI Angular binding and panel proxy URL

Pass rspamd_ui_url from Rspamd view; safe machineIP read; bootstrap window.app before controllers; replace invalid {$ errorMessage $} with ng-bind; fix textareas; clarify HTTPS UI via CyberPanel proxy vs SSH tunnel localhost.
2026-05-06 11:05:55 +02:00 · 2026-04-11 00:21:14 +02:00
parent 92acb9a3b8
commit 46c9725715
5 changed files with 1123 additions and 20 deletions
--- a/emailPremium/static/emailPremium/emailPremium.js
+++ b/emailPremium/static/emailPremium/emailPremium.js
@@ -2,6 +2,26 @@
 * Created by usman on 6/22/18.
 */

+/* Ensure CyberCP Angular module exists (system-status.js normally sets window.app in <head>) */
+(function () {
+    if (typeof window === 'undefined' || typeof angular === 'undefined') {
+        return;
+    }
+    if (typeof window.app !== 'undefined' && window.app) {
+        return;
+    }
+    try {
+        window.app = angular.module('CyberCP');
+    } catch (e) {
+        try {
+            window.app = angular.module('CyberCP', []);
+        } catch (e2) {
+            return;
+        }
+    }
+})();
+var app = window.app;
+
 /* Java script code to list accounts */

 app.controller('listDomains', function ($scope, $http) {
--- a/emailPremium/templates/emailPremium/Rspamd.html
+++ b/emailPremium/templates/emailPremium/Rspamd.html
@@ -611,7 +611,7 @@
            <div ng-hide="RspamdNotifyBox">
                <div ng-hide="failedToStartInallation" class="alert alert-danger">
                    <i class="fas fa-exclamation-circle alert-icon"></i>
-                    <span>{% trans "Failed to start installation. Error message:" %} {$ errorMessage $}</span>
+                    <span>{% trans "Failed to start installation. Error message:" %} <span ng-bind="errorMessage"></span></span>
                </div>

                <div ng-hide="couldNotConnect" class="alert alert-danger">
@@ -621,7 +621,7 @@

                <div ng-hide="installationFailed" class="alert alert-danger">
                    <i class="fas fa-times-circle alert-icon"></i>
-                    <span>{% trans "Installation failed." %} {$ errorMessage $}</span>
+                    <span>{% trans "Installation failed." %} <span ng-bind="errorMessage"></span></span>
                </div>

                <div ng-hide="RspamdSuccessfullyInstalled" class="alert alert-success">
@@ -637,7 +637,7 @@
                    <h3 class="install-log-title">{% trans "Installation Progress" %}</h3>
                    <span ng-hide="RspamdLoading" class="loading-spinner"></span>
                </div>
-                <textarea ng-model="requestData" rows="15" class="log-textarea" readonly>{{ requestData }}</textarea>
+                <textarea ng-model="requestData" rows="15" class="log-textarea" readonly></textarea>
            </div>
        </div>
        {% else %}
@@ -663,20 +663,20 @@
                </button>
            </div>
            <p style="color: var(--text-secondary, #64748b); font-size: 14px; margin-top: 16px; line-height: 1.6;">
-                {% trans "Opens the official Rspamd web interface in a new tab (path /emailPremium/Rspamd/ui/ — proxied through CyberPanel, admin session required)." %}
+                {% trans "Opens the Rspamd controller UI over HTTPS using the same hostname and port as CyberPanel (path /emailPremium/Rspamd/ui/). Rspamd itself only speaks HTTP on 127.0.0.1:11334; the panel reverse-proxies it so you do not need https://YOUR_SERVER_IP:11334 (that URL is not served by Rspamd)." %}
            </p>
        </div>

        <div class="content-section">
            <h2 class="section-title">{% trans "Alternative: SSH tunnel" %}</h2>
            <p style="color: var(--text-secondary, #64748b); font-size: 14px; line-height: 1.6;">
-                {% trans "If the proxied UI misbehaves, connect to port 11334 on the server via SSH and use your local browser." %}
+                {% trans "If the proxied UI misbehaves, forward port 11334 to your machine and open the link below (HTTP on localhost only — not HTTPS)." %}
            </p>
            <pre style="background: var(--bg-secondary,#f8f9ff); padding: 12px; border-radius: 8px; font-size: 13px; overflow-x: auto; border: 1px solid var(--border-light, #e8e9ff);">ssh -N -L 11334:127.0.0.1:11334 root@{{ ipAddress }}</pre>
            <p style="margin-top: 12px;">
                <a href="http://127.0.0.1:11334/" target="_blank" rel="noopener noreferrer" class="action-btn secondary">
                    <i class="fas fa-external-link-alt"></i>
-                    {% trans "Open Rspamd UI (when tunnel is active)" %}
+                    {% trans "Open Rspamd UI (when tunnel is active — http://127.0.0.1:11334/)" %}
                </a>
            </p>
        </div>
@@ -772,7 +772,7 @@
                <div style="margin-top: 20px;">
                    <div ng-hide="failedToSave" class="alert alert-danger">
                        <i class="fas fa-exclamation-circle alert-icon"></i>
-                        <span>{% trans "Failed to save RSPAMD configurations. Error message:" %} {$ errorMessage $}</span>
+                        <span>{% trans "Failed to save RSPAMD configurations. Error message:" %} <span ng-bind="errorMessage"></span></span>
                    </div>

                    <div ng-hide="successfullySaved" class="alert alert-success">
@@ -848,7 +848,7 @@
                <div style="margin-top: 20px;">
                    <div ng-hide="ClamAVfailedToSave" class="alert alert-danger">
                        <i class="fas fa-exclamation-circle alert-icon"></i>
-                        <span>{% trans "Failed to save ClamAV configurations. Error message:" %} {$ errorMessage $}</span>
+                        <span>{% trans "Failed to save ClamAV configurations. Error message:" %} <span ng-bind="errorMessage"></span></span>
                    </div>

                    <div ng-hide="ClamAVsuccessfullySaved" class="alert alert-success">
@@ -906,7 +906,7 @@
                <div style="margin-top: 20px;">
                    <div ng-hide="postfixfailedToSave" class="alert alert-danger">
                        <i class="fas fa-exclamation-circle alert-icon"></i>
-                        <span>{% trans "Failed to save Postfix configurations. Error message:" %} {$ errorMessage $}</span>
+                        <span>{% trans "Failed to save Postfix configurations. Error message:" %} <span ng-bind="errorMessage"></span></span>
                    </div>

                    <div ng-hide="postfixsuccessfullySaved" class="alert alert-success">
@@ -964,7 +964,7 @@
                <div style="margin-top: 20px;">
                    <div ng-hide="RedisfailedToSave" class="alert alert-danger">
                        <i class="fas fa-exclamation-circle alert-icon"></i>
-                        <span>{% trans "Failed to save Redis configurations. Error message:" %} {$ errorMessage $}</span>
+                        <span>{% trans "Failed to save Redis configurations. Error message:" %} <span ng-bind="errorMessage"></span></span>
                    </div>

                    <div ng-hide="RedissuccessfullySaved" class="alert alert-success">
@@ -989,7 +989,7 @@
            <div ng-hide="uninstallRspamdNotifyBox">
                <div ng-hide="failedToStartInallation" class="alert alert-danger">
                    <i class="fas fa-exclamation-circle alert-icon"></i>
-                    <span>{% trans "Failed to start uninstallation. Error message:" %} {$ errorMessage $}</span>
+                    <span>{% trans "Failed to start uninstallation. Error message:" %} <span ng-bind="errorMessage"></span></span>
                </div>

                <div ng-hide="couldNotConnect" class="alert alert-danger">
@@ -999,7 +999,7 @@

                <div ng-hide="installationFailed" class="alert alert-danger">
                    <i class="fas fa-times-circle alert-icon"></i>
-                    <span>{% trans "Installation failed." %} {$ errorMessage $}</span>
+                    <span>{% trans "Installation failed." %} <span ng-bind="errorMessage"></span></span>
                </div>

                <div ng-hide="RspamdSuccessfullyInstalled" class="alert alert-success">
@@ -1015,7 +1015,7 @@
                    <h3 class="install-log-title">{% trans "Uninstallation Progress" %}</h3>
                    <span ng-hide="RspamdLoading" class="loading-spinner"></span>
                </div>
-                <textarea ng-model="requestData" rows="15" class="log-textarea" readonly>{{ requestData }}</textarea>
+                <textarea ng-model="requestData" rows="15" class="log-textarea" readonly></textarea>
            </div>
        </div>

@@ -1052,7 +1052,7 @@
                        <button type="button" class="close" data-dismiss="modal">&times;</button>
                    </div>
                    <div class="modal-body">
-                        <textarea ng-model="RspamdlogsData" class="log-textarea" rows="20" readonly>{{ Rspamdlogs }}</textarea>
+                        <textarea ng-model="RspamdlogsData" class="log-textarea" rows="20" readonly></textarea>
                    </div>
                    <div class="modal-footer">
                        <button type="button" class="modal-btn secondary" data-dismiss="modal">
--- a/emailPremium/views.py
+++ b/emailPremium/views.py
@@ -1244,16 +1244,28 @@ def Rspamd(request):

    checkIfRspamdInstalled = 0

-    ipFile = "/etc/cyberpanel/machineIP"
-    f = open(ipFile)
-    ipData = f.read()
-    ipAddress = ipData.split('\n', 1)[0]
+    ipAddress = '127.0.0.1'
+    try:
+        ipFile = "/etc/cyberpanel/machineIP"
+        with open(ipFile, 'r') as f:
+            ipData = f.read()
+        first_line = ipData.split('\n', 1)[0].strip()
+        if first_line:
+            ipAddress = first_line
+    except (OSError, IOError, IndexError):
+        pass

    if mailUtilities.checkIfRspamdInstalled() == 1:
        checkIfRspamdInstalled = 1

+    rspamd_ui_url = request.build_absolute_uri('/emailPremium/Rspamd/ui/')
+
    proc = httpProc(request, 'emailPremium/Rspamd.html',
-                    {'checkIfRspamdInstalled': checkIfRspamdInstalled, 'ipAddress': ipAddress}, 'admin')
+                    {
+                        'checkIfRspamdInstalled': checkIfRspamdInstalled,
+                        'ipAddress': ipAddress,
+                        'rspamd_ui_url': rspamd_ui_url,
+                    }, 'admin')
    return proc.render()

 def installRspamd(request):
--- a/public/static/emailPremium/emailPremium.js
+++ b/public/static/emailPremium/emailPremium.js
--- a/static/emailPremium/emailPremium.js
+++ b/static/emailPremium/emailPremium.js
@@ -2,6 +2,26 @@
 * Created by usman on 6/22/18.
 */

+/* Ensure CyberCP Angular module exists (system-status.js normally sets window.app in <head>) */
+(function () {
+    if (typeof window === 'undefined' || typeof angular === 'undefined') {
+        return;
+    }
+    if (typeof window.app !== 'undefined' && window.app) {
+        return;
+    }
+    try {
+        window.app = angular.module('CyberCP');
+    } catch (e) {
+        try {
+            window.app = angular.module('CyberCP', []);
+        } catch (e2) {
+            return;
+        }
+    }
+})();
+var app = window.app;
+
 /* Java script code to list accounts */

 app.controller('listDomains', function ($scope, $http) {