From 02d5f9ab6bc950bfff2b666e01669875a08db587 Mon Sep 17 00:00:00 2001 From: Aidaho12 Date: Mon, 7 May 2018 19:24:22 +0600 Subject: [PATCH] v2.5.3 Now ssh credentials keep in DB, it's more user-frendly and and safer --- app/create_db.py | 42 +++++++++++++++++++- app/funct.py | 59 +++++++++++++++++---------- app/haproxy-webintarface.config | 5 --- app/keepalivedconfig.py | 9 ++--- app/login.py | 11 +++--- app/overview.py | 2 + app/sql.py | 70 ++++++++++++++++++++++++++++++++- app/templates/admin.html | 32 +++++++++++++-- app/templates/base.html | 3 +- app/users.py | 5 ++- inc/users.js | 45 +++++++++++++++++++++ 11 files changed, 239 insertions(+), 44 deletions(-) diff --git a/app/create_db.py b/app/create_db.py index cc525e3c..acde69f7 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -126,6 +126,12 @@ def create_table(): `user_id` INTEGER NOT NULL, `uuid` varchar ( 64 ) ); + CREATE TABLE IF NOT EXISTS `cred` ( + `enable` INTEGER NOT NULL DEFAULT 1, + `username` VARCHAR ( 64 ) NOT NULL, + `password` VARCHAR ( 64 ) NOT NULL + ); + insert into cred('enable','username','password') values ('1', 'root','password'); """ try: cur.executescript(sql) @@ -155,6 +161,7 @@ def update_db_v_2_0_1(**kwargs): """ try: cur.execute(sql) + con.commit() except sqltool.Error as e: if kwargs.get('silent') != 1: if e.args[0] == 'duplicate column name: type_ip': @@ -175,6 +182,7 @@ def update_db_v_2_0_1_1(**kwargs): """ try: cur.execute(sql) + con.commit() except sqltool.Error as e: if kwargs.get('silent') != 1: if e.args[0] == 'duplicate column name: enable' or e == "1060 (42S21): Duplicate column name 'enable' ": @@ -195,6 +203,7 @@ def update_db_v_2_0_5(**kwargs): """ try: cur.execute(sql) + con.commit() except sqltool.Error as e: if kwargs.get('silent') != 1: if e.args[0] == 'duplicate column name: master' or e == "1060 (42S21): Duplicate column name 'master' ": @@ -215,11 +224,12 @@ def update_db_v_2_4(**kwargs): """ try: cur.execute(sql) + con.commit() except sqltool.Error as e: print(kwargs.get('silent')) if kwargs.get('silent') != 1: if e.args[0] == 'duplicate column name: user_id': - print('Already updated. No run more. Thx =^.^=') + print('Updating... go to version 2.5.3') else: print("An error occurred:", e) return False @@ -230,17 +240,47 @@ def update_db_v_2_4(**kwargs): cur.close() con.close() +def update_db_v_2_5_3(**kwargs): + con, cur = get_cur() + sql = """ + CREATE TABLE IF NOT EXISTS `cred` (`enable` INTEGER NOT NULL DEFAULT 1, `username` VARCHAR ( 64 ) NOT NULL, `password` VARCHAR ( 64 ) NOT NULL ); + """ + try: + cur.execute(sql) + con.commit() + except sqltool.Error as e: + print(kwargs.get('silent')) + if kwargs.get('silent') != 1: + if e.args[0] == 'duplicate column name: enable': + print('Already updated. No run more. Thx =^.^=') + else: + print("An error occurred:", e) + return False + else: + if kwargs.get('silent') != 1: + print("DB was update to 2.5.3
") + sql2 = """ + insert into `cred` (`enable`,`username`,`password`) values ('1', 'root','password'); + """ + cur.execute(sql2) + con.commit() + return True + cur.close() + con.close() + def update_all(): update_db_v_2_0_1() update_db_v_2_0_1_1() update_db_v_2_0_5() update_db_v_2_4() + update_db_v_2_5_3() def update_all_silent(): update_db_v_2_0_1(silent=1) update_db_v_2_0_1_1(silent=1) update_db_v_2_0_5(silent=1) update_db_v_2_4(silent=1) + update_db_v_2_5_3(silent=1) #if check_db(): # create_table() diff --git a/app/funct.py b/app/funct.py index 81b2281b..a72c2a7e 100644 --- a/app/funct.py +++ b/app/funct.py @@ -18,7 +18,6 @@ fullpath = config.get('main', 'fullpath') time_zone = config.get('main', 'time_zone') proxy = config.get('main', 'proxy') ssh_keys = config.get('ssh', 'ssh_keys') -ssh_user_name = config.get('ssh', 'ssh_user_name') haproxy_configs_server = config.get('configs', 'haproxy_configs_server') hap_configs_dir = config.get('configs', 'haproxy_save_configs_dir') haproxy_config_path = config.get('haproxy', 'haproxy_config_path') @@ -123,44 +122,63 @@ def get_button(button, **kwargs): print('' % (value, value, button)) def ssh_connect(serv, **kwargs): + import sql + ssh_enable = sql.ssh_enable() + ssh_user_name = sql.select_ssh_username() ssh = SSHClient() ssh.load_system_host_keys() ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) try: - if config.get('ssh', 'ssh_keys_enable') == "1": + if ssh_enable == 1: k = paramiko.RSAKey.from_private_key_file(ssh_keys) ssh.connect(hostname = serv, username = ssh_user_name, pkey = k ) else: - ssh.connect(hostname = serv, username = ssh_user_name, password = config.get('ssh', 'ssh_pass')) + ssh.connect(hostname = serv, username = ssh_user_name, password = sql.select_ssh_password()) if kwargs.get('check'): return True else: return ssh except paramiko.AuthenticationException: - print('
Authentication failed, please verify your credentials
') - error = 'Authentication failed, please verify your credentials' - return False + if kwargs.get('check'): + print('
Authentication failed, please verify your credentials
') + return False + else: + return 'Authentication failed, please verify your credentials' except paramiko.SSHException as sshException: - print('
Unable to establish SSH connection: %s
' % sshException) - error = 'Unable to establish SSH connection: %s ' % sshException - return False + if kwargs.get('check'): + print('
Unable to establish SSH connection: %s
' % sshException) + return False + else: + return 'Unable to establish SSH connection: %s ' % sshException except paramiko.BadHostKeyException as badHostKeyException: - print('
Unable to verify server\'s host key: %s
' % badHostKeyException) - error = 'Unable to verify server\'s host key: %s ' % badHostKeyException - return False + if kwargs.get('check'): + print('
Unable to verify server\'s host key: %s
' % badHostKeyException) + return False + else: + return 'Unable to verify server\'s host key: %s ' % badHostKeyException except Exception as e: if e.args[1] == "No such file or directory": - print('
{}. Check ssh key
'.format(e.args[1])) - error = '{}. Check ssh key'.format(e.args[1]) + if kwargs.get('check'): + print('
{}. Check ssh key
'.format(e.args[1])) + else: + return '{}. Check ssh key'.format(e.args[1]) elif e.args[1] == "Invalid argument": - print('
Check the IP of the new server
') - error = 'Check the IP of the new server' + if kwargs.get('check'): + print('
Check the IP of the new server
') + else: + error = 'Check the IP of the new server' else: - print('
{}
'.format(e.args[1])) - error = e.args[1] - return False + if kwargs.get('check'): + print('
{}
'.format(e.args[1])) + else: + error = e.args[1] + if kwargs.get('check'): + return False + else: + return error def get_config(serv, cfg, **kwargs): + error = "" if kwargs.get("keepalived"): config_path = "/etc/keepalived/keepalived.conf" else: @@ -173,7 +191,8 @@ def get_config(serv, cfg, **kwargs): sftp.close() ssh.close() except Exception as e: - return str(e) + ssh += str(e) + return ssh def show_config(cfg): print('
') diff --git a/app/haproxy-webintarface.config b/app/haproxy-webintarface.config index b2d5ffee..f1726a42 100644 --- a/app/haproxy-webintarface.config +++ b/app/haproxy-webintarface.config @@ -25,13 +25,8 @@ mysql_db = haproxywi mysql_host = 127.0.0.1 [ssh] -#If ssh connect disable entare password for ssh connect. Default enable -ssh_keys_enable = 1 #SSH keys to connect without password to HAproxy servers ssh_keys = ${main:fullpath}/app/id_rsa.pem -#Username for connect ssh -ssh_user_name = root -ssh_pass = [logs] #Logs save locally, disable by default diff --git a/app/keepalivedconfig.py b/app/keepalivedconfig.py index 476b3c5b..d154b6d7 100644 --- a/app/keepalivedconfig.py +++ b/app/keepalivedconfig.py @@ -44,15 +44,14 @@ if form.getvalue('serv') is not None and form.getvalue('open') is not None : funct.logging(serv, "keepalivedconfig.py open config") except: pass - funct.get_config(serv, cfg, keepalived=1) + error = funct.get_config(serv, cfg, keepalived=1) try: conf = open(cfg, "r",encoding='utf-8', errors='ignore') config_read = conf.read() + conf.close except IOError: - print('
Can\'t read import config file
') - - conf.close + error += "
Can't read import config file" os.system("/bin/mv %s %s.old" % (cfg, cfg)) @@ -70,7 +69,7 @@ if form.getvalue('serv') is not None and form.getvalue('config') is not None: with open(cfg, "a") as conf: conf.write(config) except IOError: - print("Can't read import config file") + error += "Can't read import config file" stderr = funct.upload_and_restart(serv, cfg, just_save=save, keepalived=1) diff --git a/app/login.py b/app/login.py index 8dc6cd08..d4eb6a42 100644 --- a/app/login.py +++ b/app/login.py @@ -49,12 +49,6 @@ except: user = "" pass -if create_db.check_db(): - if create_db.create_table(): - create_db.update_all() - db_create = '
DB was created

Now you can login, default: admin/admin
' -create_db.update_all_silent() - if form.getvalue('logout'): try: sql.delete_uuid(user_id.value) @@ -91,6 +85,11 @@ if login is not None and password is not None: if login is None: print("Content-type: text/html\n") + if create_db.check_db(): + if create_db.create_table(): + create_db.update_all() + db_create = '
DB was created

Now you can login, default: admin/admin
' + output_from_parsed_template = template.render(h2 = 1, title = "Login page. Enter please", role = role, user = user, diff --git a/app/overview.py b/app/overview.py index 75586e2e..341d498c 100644 --- a/app/overview.py +++ b/app/overview.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import funct, sql +import create_db import os, http from jinja2 import Environment, FileSystemLoader env = Environment(loader=FileSystemLoader('templates/')) @@ -7,6 +8,7 @@ template = env.get_template('ovw.html') print('Content-type: text/html\n') funct.check_login() +create_db.update_all_silent() try: cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) diff --git a/app/sql.py b/app/sql.py index a2c33efe..cdd0e434 100644 --- a/app/sql.py +++ b/app/sql.py @@ -214,7 +214,7 @@ def select_user_name_group(id): try: cur.execute(sql) except sqltool.Error as e: - print('An error occurred: ' + e.args[0] + ' X') + print('An error occurred: ' + e + ' X') else: for group in cur.fetchone(): return group @@ -389,7 +389,62 @@ def is_master(ip, **kwargs): return cur.fetchall() cur.close() con.close() + +def ssh_enable(): + con, cur = create_db.get_cur() + sql = """select enable from cred """ + try: + cur.execute(sql) + except sqltool.Error as e: + print('An error occurred: ' + e + ' X') + else: + for enable in cur.fetchone(): + return enable + cur.close() + con.close() + +def select_ssh_username(): + con, cur = create_db.get_cur() + sql = """select username from cred """ + try: + cur.execute(sql) + except sqltool.Error as e: + print('An error occurred: ' + e + ' X') + else: + for username in cur.fetchone(): + return username + cur.close() + con.close() +def select_ssh_password(): + con, cur = create_db.get_cur() + sql = """select password from cred """ + try: + cur.execute(sql) + except sqltool.Error as e: + print('An error occurred: ' + e + ' X') + else: + for password in cur.fetchone(): + return password + cur.close() + con.close() + +def update_ssh(enable, username, password): + con, cur = create_db.get_cur() + sql = """ + update cred set + enable = '%s', + username = '%s', + password = '%s' """ % (enable, username, password) + try: + cur.execute(sql) + con.commit() + except sqltool.Error as e: + print('An error occurred: ' + e + ' X') + con.rollback() + cur.close() + con.close() + def show_update_servers(): SERVERS = select_servers() print('' @@ -612,4 +667,15 @@ if form.getvalue('updateserver') is not None: if funct.ssh_connect(ip, check=1): update_server(name, ip, group, typeip, enable, master, id) else: - print('X') \ No newline at end of file + print('X') + +if form.getvalue('updatessh'): + enable = form.getvalue('ssh_enable') + username = form.getvalue('ssh_user') + password = form.getvalue('ssh_pass') + if username is None: + print('Content-type: text/html\n') + print(error_mess) + else: + print('Content-type: text/html\n') + update_ssh(enable, username, password) \ No newline at end of file diff --git a/app/templates/admin.html b/app/templates/admin.html index 446ebaed..653c5456 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -7,7 +7,7 @@
  • Groups
  • Servers
  • Roles
    • -
  • SSH key
    • +
  • SSH credentials
    • @@ -277,8 +277,34 @@ {% endfor %}
    -
    - +
    +
    + + + + + + + + + + +
    SSH key + Credentials(?) +
    + {% if ssh_enable == 1 %} + +

    + +

    + +
    +
    +
    Upload SSH Key diff --git a/app/templates/base.html b/app/templates/base.html index e2997506..3c4279e0 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -87,6 +87,7 @@
  • Groups
  • Servers
  • Roles
    • +
  • SSH credentials
  • View settings
  • View logs
    • @@ -94,7 +95,7 @@ {% endif %} -
    HAproxy-WI v2.5.2
    +
    HAproxy-WI v2.5.3
    diff --git a/app/users.py b/app/users.py index 0891d984..8095c0bb 100644 --- a/app/users.py +++ b/app/users.py @@ -28,5 +28,8 @@ output_from_parsed_template = template.render(title = "Admin area: users manage" groups = sql.select_groups(), servers = sql.select_servers(full=1), roles = sql.select_roles(), - masters = sql.select_servers(get_master_servers=1)) + masters = sql.select_servers(get_master_servers=1), + ssh_enable = sql.ssh_enable(), + ssh_user = sql.select_ssh_username(), + ssh_pass = sql.select_ssh_password()) print(output_from_parsed_template) diff --git a/inc/users.js b/inc/users.js index be4c7c97..e4f625c1 100644 --- a/inc/users.js +++ b/inc/users.js @@ -252,6 +252,21 @@ $( function() { var id = $(this).attr('id').split('-'); updateServer(id[1]) }); + $( "#ssh_enable_table input" ).change(function() { + updateSSH() + }); + $('#ssh_enable').click(function() { + if ($('#ssh_enable').is(':checked')) { + $('#ssh_pass').css('display', 'none'); + } else { + $('#ssh_pass').css('display', 'block'); + } + }); + if ($('#ssh_enable').is(':checked')) { + $('#ssh_pass').css('display', 'none'); + } else { + $('#ssh_pass').css('display', 'block'); + } } ); function removeUser(id) { $("#user-"+id).css("background-color", "#f2dede"); @@ -419,4 +434,34 @@ function uploadSsh() { } } } ); +} +function updateSSH() { + $('#error').remove(); + var ssh_enable = 0; + if ($('#ssh_enable').is(':checked')) { + ssh_enable = '1'; + } + $.ajax( { + url: "sql.py", + data: { + updatessh: 1, + ssh_enable: ssh_enable, + ssh_user: $('#ssh_user').val(), + ssh_pass: $('#ssh_pass').val(), + }, + type: "GET", + success: function( data ) { + data = data.replace(/\s+/g,' '); + if (data.indexOf('error') != '-1') { + $("#ajax-ssh").append(data); + $.getScript(users); + } else { + $('.alert-danger').remove(); + $("#ssh_enable_table").addClass( "update", 1000 ); + setTimeout(function() { + $( "#ssh_enable_table" ).removeClass( "update" ); + }, 2500 ); + } + } + } ); } \ No newline at end of file