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

v4.4.2.0 

Changelog: https://haproxy-wi.org/changelog.py#4_4_2
pull/246/head
Pavel Loginov 2020-08-09 10:14:47 +02:00
parent bc38039f61
commit 7a3bee77d1
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/funct.py
View File

@ -89,7 +89,7 @@ def logging(serv, action, **kwargs):
mess = get_data('date_in_log') + " from " + IP + " user: " + login + ", group: " +user_group + ", " + \ mess = get_data('date_in_log') + " from " + IP + " user: " + login + ", group: " +user_group + ", " + \
action + " for: " + serv + "\n" action + " for: " + serv + "\n"
else: else:
mess = get_data('date_in_log') + ", group: " +user_group + ", " + action + " from " + IP + "\n" mess = get_data('date_in_log') + " " + action + " from " + IP + "\n"
log = open(log_path + "/haproxy-wi-"+get_data('logs')+".log", "a") log = open(log_path + "/haproxy-wi-"+get_data('logs')+".log", "a")
else: else:
mess = get_data('date_in_log') + " from " + IP + " user: " + login + ", group: " +user_group + ", " + \ mess = get_data('date_in_log') + " from " + IP + " user: " + login + ", group: " +user_group + ", " + \

18
app/login.py
View File

@ -35,8 +35,12 @@ def send_cookie(login):
id = sql.get_user_id_by_uuid(user_uuid) id = sql.get_user_id_by_uuid(user_uuid)
try: try:
cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
user_groups = cookie.get('group') user_group_id = cookie.get('group')
user_groups = user_groups.value user_group_id = user_group_id.value
if sql.select_user_groups(id=id,check_id=user_group_id):
user_groups = user_group_id
else:
user_groups = sql.select_user_groups(id, limit=1)
except: except:
user_groups = sql.select_user_groups(id, limit=1) user_groups = sql.select_user_groups(id, limit=1)
@ -54,7 +58,15 @@ def send_cookie(login):
print(c.output()) print(c.output())
try: try:
funct.logging('locahost', ' user: '+sql.get_user_name_by_uuid(user_uuid)+' log in', haproxywi=1) groups = sql.select_groups(id=user_groups)
for g in groups:
if g[0] == int(user_groups):
user_group = g[1]
except:
user_group = ''
try:
funct.logging('locahost', ' user: '+sql.get_user_name_by_uuid(user_uuid)+', group: '+user_group+' log in', haproxywi=1)
except: except:
pass pass
print("Content-type: text/html\n") print("Content-type: text/html\n")