Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-11 15:56:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved installer. bug fix to ssh and backups

Browse Source
This commit is contained in:
usmannasir
2018-12-06 15:03:43 +05:00
parent 51b3c1a2eb
commit 7a42f9444a
27 changed files with 832 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
firewall/firewallManager.py
View File

@@ -350,12 +350,17 @@ class FirewallManager:
if items.find("ssh-rsa") > -1:
keydata = items.split(" ")
key = "ssh-rsa " + keydata[1][:50] + " .. " + keydata[2]
try:
userName = keydata[2][:keydata[2].index("@")]
key = "ssh-rsa " + keydata[1][:50] + " .. " + keydata[2]
try:
userName = keydata[2][:keydata[2].index("@")]
except:
userName = keydata[2]
except:
userName = keydata[2]
key = "ssh-rsa " + keydata[1][:50]
userName = ''
dic = {'userName': userName,
'key': key,
@@ -545,7 +550,7 @@ class FirewallManager:
# temp change of permissions
command = 'sudo chown -R cyberpanel:cyberpanel /root'
command = 'sudo chown -R cyberpanel:cyberpanel /root'
cmd = shlex.split(command)
@@ -569,11 +574,22 @@ class FirewallManager:
sshFile.writelines("#Created by CyberPanel\n")
sshFile.close()
writeToFile = open(pathToSSH, 'a')
writeToFile.writelines("\n")
writeToFile.writelines(key)
writeToFile.writelines("\n")
writeToFile.close()
presenseCheck = 0
try:
data = open(pathToSSH, "r").readlines()
for items in data:
if items.find(key) > -1:
presenseCheck = 1
except:
pass
if presenseCheck == 0:
writeToFile = open(pathToSSH, 'a')
writeToFile.writelines("#Added by CyberPanel\n")
writeToFile.writelines("\n")
writeToFile.writelines(key)
writeToFile.writelines("\n")
writeToFile.close()
# change back permissions