From 8006322bf4818cbe77d2f6993b93be809cc6a44b Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Tue, 14 Jan 2020 17:40:23 +0500 Subject: [PATCH 1/3] bug fix: ftp delete --- ftp/ftpManager.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ftp/ftpManager.py b/ftp/ftpManager.py index bdb028ae2..274b12117 100755 --- a/ftp/ftpManager.py +++ b/ftp/ftpManager.py @@ -180,7 +180,9 @@ class FTPManager: admin = Administrator.objects.get(pk=userID) ftp = Users.objects.get(user=ftpUserName) - if ftp.domain.admin != admin: + if ACLManager.checkOwnership(ftp.domain.domain, admin, currentACL) == 1: + pass + else: return ACLManager.loadErrorJson() FTPUtilities.submitFTPDeletion(ftpUserName) From 935b189af2ccd05af1d23ff1f54b00a75d62798a Mon Sep 17 00:00:00 2001 From: qtwrk Date: Tue, 14 Jan 2020 14:13:29 +0100 Subject: [PATCH 2/3] fix permission --- cyberpanel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cyberpanel.sh b/cyberpanel.sh index cc0830cf4..9c9f2ac91 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -1168,7 +1168,7 @@ systemctl restart lscpd systemctl restart lsws echo "/usr/local/CyberPanel/bin/python /usr/local/CyberCP/plogical/adminPass.py --password \$@" > /usr/bin/adminPass echo "systemctl restart lscpd" >> /usr/bin/adminPass -chmod +x /usr/bin/adminPass +chmod 700 /usr/bin/adminPass if [[ $VERSION = "OLS" ]] ; then WORD="OpenLiteSpeed" # sed -i 's|maxConnections 10000|maxConnections 100000|g' /usr/local/lsws/conf/httpd_config.conf From 52281e7382b33be557ee02e576305403c963219b Mon Sep 17 00:00:00 2001 From: qtwrk Date: Tue, 14 Jan 2020 14:15:39 +0100 Subject: [PATCH 3/3] fix permission 2 --- preUpgrade.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/preUpgrade.sh b/preUpgrade.sh index a3e35eb39..d6e9a8dd7 100644 --- a/preUpgrade.sh +++ b/preUpgrade.sh @@ -98,6 +98,8 @@ cd wsgi-lsapi-1.4 make cp lswsgi /usr/local/CyberCP/bin/ +chmod 700 /usr/bin/adminPass + ## systemctl restart lscpd