diff --git a/app/create_db.py b/app/create_db.py index 10285eb4..3eef383e 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -1230,9 +1230,30 @@ def update_db_v_5_1_2(**kwargs): con.close() +def update_db_v_5_1_3(**kwargs): + con, cur = get_cur() + sql = """ + ALTER TABLE `servers` ADD COLUMN protected INTEGER NOT NULL DEFAULT 0; + """ + try: + cur.execute(sql) + con.commit() + except sqltool.Error as e: + if kwargs.get('silent') != 1: + if e.args[0] == 'duplicate column name: protected' or e == " 1060 (42S21): Duplicate column name 'protected' ": + print('Updating... DB has been updated to version 5.1.3') + else: + print("An error occurred:", e) + else: + print("DB has been updated to version 5.1.3") + + cur.close() + con.close() + + def update_ver(): con, cur = get_cur() - sql = """update version set version = '5.1.2.0'; """ + sql = """update version set version = '5.1.3.0'; """ try: cur.execute(sql) con.commit() @@ -1274,6 +1295,7 @@ def update_all(): update_db_v_5_1_0_1() update_db_v_5_1_1() update_db_v_5_1_2() + update_db_v_5_1_3() update_ver() @@ -1309,6 +1331,7 @@ def update_all_silent(): update_db_v_5_1_0_1(silent=1) update_db_v_5_1_1(silent=1) update_db_v_5_1_2(silent=1) + update_db_v_5_1_3(silent=1) update_ver() diff --git a/app/options.py b/app/options.py index ffd049d2..79d7ceec 100644 --- a/app/options.py +++ b/app/options.py @@ -918,6 +918,12 @@ if serv is not None and form.getvalue('right') is not None: print(stderr) if serv is not None and act == "configShow": + import http.cookies + + cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) + user_uuid = cookie.get('uuid') + role_id = sql.get_user_role_by_uuid(user_uuid.value) + if form.getvalue('service') == 'keepalived': configs_dir = funct.get_config_var('configs', 'kp_save_configs_dir') cfg = '.conf' @@ -940,6 +946,8 @@ if serv is not None and act == "configShow": conf = open(cfg, "r") except IOError: print('