github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v6.3.1.0 

Changelog: https://roxy-wi.org/changelog#6_3_1
pull/355/head
Pavel Loginov 2022-12-07 10:55:21 +03:00
parent 4887e956e3
commit 508e1e262c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/modules/server/ssh.py
View File

@ -10,11 +10,11 @@ import modules.roxy_wi_tools as roxy_wi_tools
form = common.form form = common.form
error_mess = common.error_mess error_mess = common.error_mess
get_config_var = roxy_wi_tools.GetConfigVar() get_config = roxy_wi_tools.GetConfigVar()
def return_ssh_keys_path(server_ip: str, **kwargs) -> dict: def return_ssh_keys_path(server_ip: str, **kwargs) -> dict:
lib_path = get_config_var.get_config_var('main', 'lib_path') lib_path = get_config.get_config_var('main', 'lib_path')
ssh_settings = {} ssh_settings = {}
if kwargs.get('id'): if kwargs.get('id'):
@ -62,8 +62,7 @@ def create_ssh_cred() -> None:
if sql.insert_new_ssh(name, enable, group, username, password): if sql.insert_new_ssh(name, enable, group, username, password):
env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True)
template = env.get_template('/new_ssh.html') template = env.get_template('/new_ssh.html')
output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), page=page)
page=page)
print(output_from_parsed_template) print(output_from_parsed_template)
roxywi_common.logging('Roxy-WI server', f'A new SSH credentials {name} has created', roxywi=1, login=1) roxywi_common.logging('Roxy-WI server', f'A new SSH credentials {name} has created', roxywi=1, login=1)
@ -83,7 +82,7 @@ def upload_ssh_key() -> None:
ssh_keys = f'{name}.pem' ssh_keys = f'{name}.pem'
try: try:
check_split = name.split('_')[1] _check_split = name.split('_')[1]
split_name = True split_name = True
except Exception: except Exception:
split_name = False split_name = False
@ -155,4 +154,4 @@ def delete_ssh_key() -> None:
os.remove(ssh_key_name) os.remove(ssh_key_name)
if sql.delete_ssh(sshdel): if sql.delete_ssh(sshdel):
print("Ok") print("Ok")
roxywi_common.logging('Roxy-WI server', f'The SSH credentials {name} has deleted', roxywi=1, login=1) roxywi_common.logging('Roxy-WI server', f'The SSH credentials {name} has deleted', roxywi=1, login=1)