From f17804373bfee50b195c6ce1a8341af43bdf4289 Mon Sep 17 00:00:00 2001 From: Istiak Ferdous <30789544+istiak101@users.noreply.github.com> Date: Mon, 17 May 2021 14:40:15 +0600 Subject: [PATCH] Redirect to CSF path if installed If CSF is installed Firewalld won't work and that created some confusion with some users. A workaround would be to redirect to CSF path. --- firewall/firewallManager.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/firewall/firewallManager.py b/firewall/firewallManager.py index f53bab050..4b7b22e6a 100755 --- a/firewall/firewallManager.py +++ b/firewall/firewallManager.py @@ -14,7 +14,7 @@ from plogical.acl import ACLManager import plogical.CyberCPLogFileWriter as logging from plogical.virtualHostUtilities import virtualHostUtilities import subprocess -from django.shortcuts import HttpResponse, render +from django.shortcuts import HttpResponse, render, redirect from random import randint import time from plogical.firewallUtilities import FirewallUtilities @@ -39,9 +39,14 @@ class FirewallManager: return proc.render() def firewallHome(self, request = None, userID = None): - proc = httpProc(request, 'firewall/firewall.html', - None, 'admin') - return proc.render() + csfPath = '/etc/csf' + + if os.path.exists(csfPath): + return redirect('/configservercsf/') + else: + proc = httpProc(request, 'firewall/firewall.html', + None, 'admin') + return proc.render() def getCurrentRules(self, userID = None): try: