From 9e3fe7d5a5ce8aaccddb73fcb6253e7c8f35948f Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Wed, 11 Sep 2019 09:05:57 +0300
Subject: [PATCH] v3.4.5.1

Login imporoved
---
 README.md                |  2 +-
 app/login.py             | 20 +++++++++++++++++---
 app/templates/base.html  |  6 +++---
 app/templates/login.html | 10 +++++++++-
 inc/script.js            | 34 ++++++++++++++++++++++++++--------
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index fe8adc54..4d0bb304 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Support the project
 [Demo video](https://www.youtube.com/channel/UCo0lCg24j-H4f0S9kMjp-_w)
 
 # Demo site
-[Demo site](https://178.57.218.185) Login/password: admin/admin. Server resets every hour.
+[Demo site](https://demo.haproxy-wi.org) Login/password: admin/admin. Server resets every hour.
 
 # Twitter
 Began to lead a [Twitter](https://twitter.com/haproxy_wi), subscribe! I will write there about all the changes and news
diff --git a/app/login.py b/app/login.py
index adb7207a..62597f8c 100644
--- a/app/login.py
+++ b/app/login.py
@@ -47,7 +47,18 @@ def send_cookie(login):
 	print('ok')
 	sys.exit()	
 	
-
+	
+def ban():
+	c = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+	expires = datetime.datetime.utcnow() + datetime.timedelta(seconds=10)
+	c["ban"] = 1
+	c["ban"]["path"] = "/app/"
+	c["ban"]["expires"] = expires.strftime("%a, %d %b %Y %H:%M:%S GMT")
+	print(c)
+	print("Content-type: text/html\n")			
+	print('ban')
+	
+	
 def check_in_ldap(user, password):
 	import ldap
 	
@@ -126,10 +137,13 @@ if login is not None and password is not None:
 		else:
 			if login in users[1] and password == users[3]:
 				send_cookie(login)
+				break
 			else:
-				print("Content-type: text/html\n")	
-				print('<center><div class="alert alert-danger">Your login or password is incorrect</div><br /><br />')
+				ban()
 				sys.exit()
+	else:
+		ban()
+		sys.exit()
 	print("Content-type: text/html\n")	
 	
 if login is None:
diff --git a/app/templates/base.html b/app/templates/base.html
index 2c374633..799a807a 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -115,9 +115,9 @@
 					</ul>
 				</nav>
 				<div class="copyright-menu">
-					<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.5</a>
+					<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.5.1</a>
 					<br>
-					<a href="https://www.patreon.com/haproxy_wi" title="Donate" target="_blank" style="color: #fff; margin-left: 30px; color: red;" class="patreon">  Patreon</a>
+					<a href="https://www.patreon.com/haproxy_wi" title="Donate" target="_blank" style="color: #fff; margin-left: 30px; color: red;" class="patreon">  Donate</a>
 				</div>
 			</div>
 		</div>
@@ -217,4 +217,4 @@
 			<div id="ajax"></div>
 		</div>			
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/templates/login.html b/app/templates/login.html
index db619d96..e800c101 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -9,8 +9,16 @@
 		<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" id="pass" required class="form-control"><br /><br />
 		<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" id="enter">Sign Up</button>
 	</form>
+	<div class="alert alert-danger" style="display: none;">
+		Your login or password is incorrect
+		<br />
+		<span id="ban_10">
+			<br />
+			You can try again in <span id="ban_timer">10</span> seconds
+		</span>
+	</div><br /><br />
 </center>
 <div id="dialog-confirm" title="View certificate " style="display: none;">
 	<center>
diff --git a/inc/script.js b/inc/script.js
index 24182a9e..eca1e606 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -441,10 +441,6 @@ $( function() {
 		theme:"minimal-dark",
 		scrollInertia:30
 		});
-	/*$(".top-link").mCustomScrollbar({
-		theme:"minimal-dark",
-		scrollInertia:30
-		});	*/
 	$(".diff").mCustomScrollbar({
 		theme:"minimal-dark",
 		scrollInertia:30
@@ -1322,7 +1318,7 @@ $( function() {
 		$('.advance').fadeIn();
 	});
 	$('#auth').submit(function() {
-		$('.alert-danger').remove();
+
 		let searchParams = new URLSearchParams(window.location.search)
 		if(searchParams.has('ref')) {
 			var ref = searchParams.get('ref');
@@ -1339,15 +1335,37 @@ $( function() {
 			success: function( data ) {
 				if (data.indexOf('ok') != '-1') {
 					window.location.replace(ref);
-				} else {
-					$('.alert-danger').remove();
-					$("#ajax").html(data);					
+				} else if (data.indexOf('ban') != '-1') {
+					ban();				
 				} 
 			}
 		} );
 		return false;
 	});
 });
+function sleep(ms) {
+	  return new Promise(resolve => setTimeout(resolve, ms));
+}
+async function ban() {
+	$( '#login').attr('disabled', 'disabled');
+	$( '#pass').attr('disabled', 'disabled');
+	$( "input[type=submit], button" ).button('disable');
+	$('.alert').show();
+	$('#ban_10').show();
+	$( '#ban_timer').text(10);
+	
+	let i = 10;
+	while (i > 0) {
+		i--;
+		await sleep(1000);
+		$( '#ban_timer').text(i);
+		}
+		
+	$( '#login').removeAttr('disabled');
+	$( '#pass').removeAttr('disabled');
+	$( "input[type=submit], button" ).button('enable');
+	$('#ban_10').hide();
+} 
 function change_select_acceleration(id) {
 	$.ajax( {
 		url: "options.py",