diff --git a/app/servers.py b/app/servers.py index c24014a0..47911008 100644 --- a/app/servers.py +++ b/app/servers.py @@ -30,6 +30,7 @@ output_from_parsed_template = template.render(title = "Servers manage", servers = sql.get_dick_permit(virt=1, disable=0), roles = sql.select_roles(), masters = sql.select_servers(get_master_servers=1, uuid=user_id.value), + group = sql.get_user_group_by_uuid(user_id.value), sshs = sql.select_ssh(), telegrams = sql.get_user_telegram_by_uuid(user_id.value), token = token) diff --git a/app/sql.py b/app/sql.py index 413ca87d..b4687c14 100644 --- a/app/sql.py +++ b/app/sql.py @@ -413,6 +413,19 @@ def get_user_role_by_uuid(uuid): return user_id[0] cur.close() con.close() + +def get_user_group_by_uuid(uuid): + con, cur = create_db.get_cur() + sql = """ select user.groups from user left join uuid as uuid on user.id = uuid.user_id where uuid.uuid = '%s' """ % uuid + try: + cur.execute(sql) + except sqltool.Error as e: + print("An error occurred:", e) + else: + for user_id in cur.fetchall(): + return user_id[0] + cur.close() + con.close() def get_user_telegram_by_uuid(uuid): con, cur = create_db.get_cur() @@ -425,6 +438,18 @@ def get_user_telegram_by_uuid(uuid): return cur.fetchall() cur.close() con.close() + +def get_telegram_by_ip(ip): + con, cur = create_db.get_cur() + sql = """ select telegram.* from telegram left join servers as serv on serv.groups = telegram.groups where serv.ip = '%s' """ % ip + try: + cur.execute(sql) + except sqltool.Error as e: + print("An error occurred:", e) + else: + return cur.fetchall() + cur.close() + con.close() def get_dick_permit(**kwargs): import http.cookies diff --git a/app/templates/base.html b/app/templates/base.html index 5627dc7a..e8fea8ad 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -96,7 +96,7 @@
diff --git a/app/templates/servers.html b/app/templates/servers.html index f4be9ecf..fadb1324 100644 --- a/app/templates/servers.html +++ b/app/templates/servers.html @@ -37,8 +37,8 @@