From ec4602bf7592df048ed8ccee6886466184baac78 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Thu, 24 Jun 2021 20:08:51 +0500
Subject: [PATCH] add bubblewrap default command

---
 cloudAPI/cloudManager.py           | 2 +-
 install/litespeed/httpd_config.xml | 2 ++
 plogical/firewallUtilities.py      | 1 -
 serverStatus/views.py              | 2 --
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cloudAPI/cloudManager.py b/cloudAPI/cloudManager.py
index 84e36e4e5..e9d1ff001 100755
--- a/cloudAPI/cloudManager.py
+++ b/cloudAPI/cloudManager.py
@@ -1061,7 +1061,7 @@ class CloudManager:
             if currentACL['admin'] == 0:
                 return self.ajaxPre(0, 'Only administrators can see MySQL status.')
 
-            finalData = mysqlUtilities.showStatus()
+            finalData = mysqlUtilities.shfetchRamowStatus()
 
             finalData = json.dumps(finalData)
             return HttpResponse(finalData)
diff --git a/install/litespeed/httpd_config.xml b/install/litespeed/httpd_config.xml
index 391c8fa1d..c5cba010b 100755
--- a/install/litespeed/httpd_config.xml
+++ b/install/litespeed/httpd_config.xml
@@ -139,6 +139,8 @@ SecFilterSelective ARGS &quot;or.+1[[:space:]]*=[[:space:]]1|or 1=1--'|'.+--&quo
 
 SecFilterSelective ARGS &quot;into[[:space:]]+outfile|load[[:space:]]+data|/\*.+\*/&quot;</ruleSet>
     </censorshipRuleSet>
+    <bubbleWrap>1</bubbleWrap>
+    <bubbleWrapCmd>/bin/bwrap --ro-bind /usr /usr --ro-bind /lib /lib --ro-bind-try /lib64 /lib64 --ro-bind /bin /bin --ro-bind /sbin /sbin --dir /var --ro-bind-try /var/www /var/www --dir /tmp --proc /proc --symlink../tmp var/tmp --dev /dev --ro-bind-try /etc/localtime /etc/localtime --ro-bind-try /etc/ld.so.cache /etc/ld.so.cache --ro-bind-try /etc/resolv.conf /etc/resolv.conf --ro-bind-try /etc/ssl /etc/ssl --ro-bind-try /etc/pki /etc/pki --ro-bind-try /etc/man_db.conf /etc/man_db.conf --ro-bind-try /usr/local/bin/msmtp /etc/alternatives/mta --ro-bind-try /usr/local/bin/msmtp /usr/sbin/exim --bind-try $HOMEDIR $HOMEDIR --bind-try /var/lib/mysql/mysql.sock /var/lib/mysql/mysql.sock --bind-try /home/mysql/mysql.sock /home/mysql/mysql.sock --bind-try /tmp/mysql.sock /tmp/mysql.sock --bind-try /run/mysqld/mysqld.sock /run/mysqld/mysqld.sock --bind-try /var/run/mysqld/mysqld.sock /var/run/mysqld/mysqld.sock '$COPY-TRY /etc/exim.jail/$USER.conf $HOMEDIR/.msmtprc' --unshare-all --share-net --die-with-parent --dir /run/user/$UID ‘$PASSWD 65534’ ‘$GROUP 65534’</bubbleWrapCmd>
     <accessDenyDir>
       <dir>/</dir>
       <dir>/etc/*</dir>
diff --git a/plogical/firewallUtilities.py b/plogical/firewallUtilities.py
index e58588eaa..7c3c0997a 100755
--- a/plogical/firewallUtilities.py
+++ b/plogical/firewallUtilities.py
@@ -238,6 +238,5 @@ def main():
 
 
 
-
 if __name__ == "__main__":
     main()
\ No newline at end of file
diff --git a/serverStatus/views.py b/serverStatus/views.py
index 47fafb400..7e26e9759 100755
--- a/serverStatus/views.py
+++ b/serverStatus/views.py
@@ -33,7 +33,6 @@ def serverStatusHome(request):
                     None, 'admin')
     return proc.render()
 
-
 def litespeedStatus(request):
     try:
         userID = request.session['userID']
@@ -152,7 +151,6 @@ def getFurtherDataFromLogFile(request):
         logging.CyberCPLogFileWriter.writeToFile(str(msg) + "[getFurtherDataFromLogFile]")
         return HttpResponse("Not Logged in as admin")
 
-
 def services(request):
     data = {}