From 48b476289940862a9754f67752f0a092b0a1f0d2 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Wed, 22 Apr 2015 14:46:55 +0200
Subject: working login with captcha

---
 src/user.cpp         | 12 +++++++++++-
 src/user.hpp         |  4 ++++
 src/user_content.hpp |  1 -
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/user.cpp b/src/user.cpp
index d94cd6f..65ca2d4 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -98,7 +98,8 @@ void user::ini( content::user &c )
 	unsigned char *gif = new unsigned char[gifsize];
 
 	captcha( im, l );
-	c.captcha_text = std::string( (char *)l );
+	last_captcha = new_captcha;
+	new_captcha = std::string( (char *)l );
 
 	std::ostringstream raws( std::stringstream::out | std::stringstream::binary );
 	makegif( im, gif );
@@ -148,12 +149,21 @@ login_form::login_form( apps::strusCms &cms  )
 bool login_form::validate( )
 {
 	if( !form::validate( ) ) {
+		booster::ptime::sleep( booster::ptime( 5, 0 ) );
 		return false;
 	}
 
 	if( !cms.user.check_login( username.value( ), password.value( ) ) ) {
 		username.valid( false );
 		password.valid( false );
+		password.clear( );
+		booster::ptime::sleep( booster::ptime( 5, 0 ) );
+		return false;
+	}
+	
+	if( captcha.value( ).compare( cms.user.last_captcha ) != 0 ) {
+		captcha.valid( false );
+		captcha.clear( );
 		booster::ptime::sleep( booster::ptime( 5, 0 ) );
 		return false;
 	}
diff --git a/src/user.hpp b/src/user.hpp
index f255fbf..d76392c 100644
--- a/src/user.hpp
+++ b/src/user.hpp
@@ -12,6 +12,10 @@ class user : public master {
 		user( strusCms &cms );
 		bool check_login( std::string user, std::string password );
 
+	public:
+		std::string last_captcha;
+		std::string new_captcha;
+	
 	private:
 		void login( );
 		void logout( );	
diff --git a/src/user_content.hpp b/src/user_content.hpp
index 857a15c..c0ff7eb 100644
--- a/src/user_content.hpp
+++ b/src/user_content.hpp
@@ -22,7 +22,6 @@ struct login_form : public cppcms::form {
 
 struct user : public master {
 	login_form login;
-	std::string captcha_text;
 	std::string captcha_base64;
 	
 	public:
-- 
cgit v1.2.3-54-g00ecf