Login page
Bug fixed
pull/19/head
Aidaho12 2018-05-31 20:25:20 +06:00
parent f59eaa9b1e
commit c85f7003f0
5 changed files with 41 additions and 17 deletions

View File

@ -75,13 +75,12 @@ if login is not None and password is not None:
sql.write_user_uuid(login, user_uuid) sql.write_user_uuid(login, user_uuid)
print("Content-type: text/html\n") print("Content-type: text/html\n")
print('<html><head><title>Redirecting</title><meta charset="UTF-8">') print('ok')
print('<link href="/style.css" rel="stylesheet">')
print('<meta http-equiv="refresh" content="0; url=%s">' % ref)
sys.exit() sys.exit()
print("Content-type: text/html\n") print("Content-type: text/html\n")
print('<meta http-equiv="refresh" content="0; url=/app/login.py?error=1">') print('<center><div class="alert alert-danger">Somthing wrong :( I\'m sad about this, but try again!</div><br /><br />')
sys.exit()
if login is None: if login is None:
print("Content-type: text/html\n") print("Content-type: text/html\n")

View File

@ -190,7 +190,6 @@ if serv is not None and form.getvalue('rows') is not None:
if serv is not None and form.getvalue('rows1') is not None: if serv is not None and form.getvalue('rows1') is not None:
rows = form.getvalue('rows1') rows = form.getvalue('rows1')
grep = form.getvalue('grep') grep = form.getvalue('grep')
grep = form.getvalue('grep')
hour = form.getvalue('hour') hour = form.getvalue('hour')
minut = form.getvalue('minut') minut = form.getvalue('minut')
hour1 = form.getvalue('hour1') hour1 = form.getvalue('hour1')
@ -280,7 +279,6 @@ if serv is not None and act == "configShow":
else: else:
cfg = hap_configs_dir + form.getvalue('configver') cfg = hap_configs_dir + form.getvalue('configver')
print('<a name="top"></a>')
print("<center><h3>Config from %s</h3>" % serv) print("<center><h3>Config from %s</h3>" % serv)
print('<p class="accordion-expand-holder">' print('<p class="accordion-expand-holder">'
'<a class="accordion-expand-all ui-button ui-widget ui-corner-all" href="#">Expand all</a>' '<a class="accordion-expand-all ui-button ui-widget ui-corner-all" href="#">Expand all</a>'

View File

@ -1,14 +1,14 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<center> <center>
<form name="auth" action="login.py" class="form-horizontal" method="get"> <form name="auth" id="auth" action="login.py" class="form-horizontal" method="get">
{{error_log}} {{error_log}}
{{error}} {{error}}
{{db_create}} {{db_create}}
<br> <br>
<label for="login">Login: </label><input type="text" name="login" required class="form-control"><br /><br /> <label for="login">Login: </label><input type="text" name="login" id="login" required class="form-control"><br /><br />
<label for="pass">Pass: </label><input type="password" name="pass" required class="form-control"><br /><br /> <label for="pass">Pass: </label><input type="password" name="pass" id="pass" required class="form-control"><br /><br />
<input type="hidden" value="{{reff}}" name="ref"> <input type="hidden" value="{{reff}}" name="ref" id="ref">
<button type="submit" name="Login" value="Enter">Sign Up</button> <button type="submit" name="Login" value="Enter">Sign Up</button>
</form> </form>
</center> </center>

View File

@ -7,13 +7,7 @@ from jinja2 import Environment, FileSystemLoader
env = Environment(loader=FileSystemLoader('templates/')) env = Environment(loader=FileSystemLoader('templates/'))
template = env.get_template('viewstats.html') template = env.get_template('viewstats.html')
form = cgi.FieldStorage() form = cgi.FieldStorage()
serv = form.getvalue('serv') serv = form.getvalue('serv')
if serv is None:
first_serv = sql.get_dick_permit()
for i in first_serv:
serv = i[2]
break
print('Content-type: text/html\n') print('Content-type: text/html\n')
funct.check_login() funct.check_login()
@ -22,14 +16,21 @@ try:
cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
user_id = cookie.get('uuid') user_id = cookie.get('uuid')
user = sql.get_user_name_by_uuid(user_id.value) user = sql.get_user_name_by_uuid(user_id.value)
role = sql.get_user_role_by_uuid(user_id.value)
servers = sql.get_dick_permit(virt=1) servers = sql.get_dick_permit(virt=1)
if serv is None:
first_serv = sql.get_dick_permit()
for i in first_serv:
serv = i[2]
break
except: except:
pass pass
output_from_parsed_template = template.render(h2 = 1, output_from_parsed_template = template.render(h2 = 1,
autorefresh = 1, autorefresh = 1,
title = "HAProxy statistics", title = "HAProxy statistics",
role = sql.get_user_role_by_uuid(user_id.value), role = role,
user = user, user = user,
onclick = "showStats()", onclick = "showStats()",
select_id = "serv", select_id = "serv",

View File

@ -881,6 +881,32 @@ $( function() {
} }
} ); } );
}); });
$('#auth').submit(function() {
$('.alert-danger').remove();
let searchParams = new URLSearchParams(window.location.search)
if(searchParams.has('ref')) {
var ref = searchParams.get('ref');
} else {
var ref = "overview.py";
}
$.ajax( {
url: "login.py",
data: {
login: $('#login').val(),
pass: $('#pass').val()
},
type: "GET",
success: function( data ) {
if (data.indexOf('ok') != '-1') {
window.location.replace(ref);
} else {
$('.alert-danger').remove();
$("#ajax").html(data);
}
}
} );
return false;
});
}); });
function replace_text(id_textarea, text_var) { function replace_text(id_textarea, text_var) {
var str = $(id_textarea).val(); var str = $(id_textarea).val();