Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Brute force protection for admin and user login pages, vulnerability reported by @0xHamy
givanz739c6a694276
diff --git a/admin/controller/user/login.php b/admin/controller/user/login.phpindex 148c594..5325499 100755--- a/admin/controller/user/login.php+++ b/admin/controller/user/login.php@@ -25,12 +25,18 @@ namespace Vvveb\Controller\User;use \Vvveb\System\Functions\Str;use function Vvveb\__;use function Vvveb\setLanguage;+use Vvveb\Sql\Admin_Failed_LoginSQL;use Vvveb\System\Event;use Vvveb\System\User\Admin;use Vvveb\System\Validator;#[\AllowDynamicProperties]class Login {+ //failed attemps per minute Y-m-d H:i:00+ protected $failedTimeInterval = 'Y-m-d H:00:00'; //failed attemps per hour++ protected $failedCount = 10; //the number of failures before account is locked+protected function redirect($url = '/', $parameters = []) {$redirect = \Vvveb\url($url, $parameters);@@ -109,7 +115,19 @@ class Login {if (strpos($user, '@')) {$loginData['email'] = $user;} else {- $loginData['user'] = $user;+ $loginData['username'] = $user;+ }++ $failedLogin = new Admin_Failed_LoginSQL();+ $date = date($this->failedTimeInterval);+ $lastIp = $_SERVER['REMOTE_ADDR'] ?? '';+ $failedAttemps = $failedLogin->get(['updated_at' => $date, 'status' => 1] + $loginData);++ if ($failedAttemps && ($failedAttemps['count'] > $this->failedCount)) {+ $this->view->errors = [__('Too many login attempts, try again in one hour!')];+ $failedLogin->logFailed(['last_ip' => $lastIp, 'updated_at' => $date] + $loginData);++ return;}$loginData['password'] = $this->request->post['password'];@@ -135,6 +153,8 @@ class Login {//user not found or wrong password$this->view->errors = [__('Authentication failed, wrong email or password!')];$this->session->set('csrf', Str::random());+ //increment failed attempts+ $failedLogin->logFailed(['last_ip' => $lastIp, 'updated_at' => $date] + $loginData);}}} else {diff --git a/admin/sql/mysqli/admin_failed_login.sql b/admin/sql/mysqli/admin_failed_login.sqlnew file mode 100644index 0000000..8357643--- /dev/null+++ b/admin/sql/mysqli/admin_failed_login.sql@@ -0,0 +1,263 @@+-- admin_failed_login++ -- get all entries++ CREATE PROCEDURE getAll(+ IN start INT,+ IN limit INT,+ IN user_id INT,+ IN count INT,+ IN updated_at CHAR,++ -- return array of admin_failed_login+ OUT fetch_all,+ -- return admin_failed_login count for count query+ OUT fetch_one+ )+ BEGIN++ SELECT * FROM admin_failed_login WHERE 1 = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND admin_failed_login.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND admin_failed_login.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND admin_failed_login.updated_at = :updated_at+ END @IF++ ORDER BY admin_failed_login.admin_id, admin_failed_login.updated_at++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ -- SELECT FOUND_ROWS() as count;+ SELECT count(*) FROM (++ @SQL_COUNT(admin_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id++ ) as count;++ END++ -- get user information++ CREATE PROCEDURE get(+ IN admin_id INT,+ IN updated_at CHAR,+ IN count INT,+ IN username CHAR,+ IN email CHAR,+ IN status INT,+ IN role_id INT,++ OUT fetch_row+ )+ BEGIN++ SELECT _.* FROM admin_failed_login AS _+ LEFT JOIN admin ON (admin.admin_id = _.admin_id)++ WHERE 1 = 1+++ @IF isset(:admin_id) AND !empty(:admin_id)+ THEN+ AND _.admin_id = :admin_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND _.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND _.updated_at = :updated_at+ END @IF++ @IF isset(:username)+ THEN+ AND admin.username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND admin.email = :email+ END @IF++ @IF isset(:status)+ THEN+ AND admin.status = :status+ END @IF++ @IF isset(:role_id)+ THEN+ AND admin.role_id = :role_id+ END @IF++ LIMIT 1;++ END++++ -- Add new failed attempt++ CREATE PROCEDURE logFailed(+ IN admin_id INT,+ IN username CHAR,+ IN updated_at CHAR,+ IN last_ip INT,+ OUT fetch_one,+ OUT insert_id+ )+ BEGIN++ SELECT admin_id FROM admin WHERE admin.status = 1++ @IF isset(:admin_id) AND !empty(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF++ @IF isset(:username)+ THEN+ AND username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND email = :email+ END @IF++ @IF isset(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF++ LIMIT 1;++ @IF isset(@result.admin)+ THEN++ INSERT INTO admin_failed_login++ ( `admin_id`, `updated_at`, `last_ip`)++ VALUES ( @result.admin, :updated_at, :last_ip )++ DUPLICATE KEY UPDATE count = count + 1, last_ip = :last_ip++ END @IF;+ END++ -- Add new admin_failed_login++ CREATE PROCEDURE add(+ IN admin_failed_login ARRAY,+ OUT insert_id+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ @FILTER(:admin_failed_login, admin_failed_login)++ INSERT INTO admin_failed_login++ ( @KEYS(:admin_failed_login) )++ VALUES ( :admin_failed_login )+ END+++ -- Update admin_failed_login++ CREATE PROCEDURE edit(+ IN user CHAR,+ IN email CHAR,+ IN admin_id INT,+ IN admin_failed_login ARRAY,+ IN role_id INT,+ OUT affected_rows+ )+ BEGIN+ -- allow only table fields and set defaults for missing values+ @FILTER(:admin_failed_login, admin_failed_login)++ UPDATE admin_failed_login++ SET @LIST(:admin_failed_login)++ WHERE++ @IF isset(:email)+ THEN+ email = :email+ END @IF++ @IF isset(:admin_failed_login_id)+ THEN+ admin_failed_login_id = :admin_failed_login_id+ END @IF++ @IF isset(:username)+ THEN+ username = :username+ END @IF+ END++ -- delete admin_failed_login++ PROCEDURE delete(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,++ OUT affected_rows+ )+ BEGIN++ DELETE FROM admin_failed_login WHERE admin_failed_login_id IN (:admin_failed_login_id);++ END++ -- set role++ CREATE PROCEDURE setRole(+ IN admin_failed_login_id INT,+ IN role CHAR,+ IN role_id INT+ OUT insert_id+ )+ BEGIN+++ UPDATE admin_failed_login++ SET++ @IF isset(:role_id)+ THEN+ role_id = :role_id+ END @IF+++ @IF isset(:role)+ THEN+ role_id = (SELECT role_id FROM roles WHERE name = :role)+ END @IF+++ WHERE admin_failed_login_id = :admin_failed_login_id+ ENDdiff --git a/admin/sql/mysqli/user_failed_login.sql b/admin/sql/mysqli/user_failed_login.sqlnew file mode 100644index 0000000..f98d245--- /dev/null+++ b/admin/sql/mysqli/user_failed_login.sql@@ -0,0 +1,264 @@+-- user_failed_login++ -- get all entries++ CREATE PROCEDURE getAll(+ IN start INT,+ IN limit INT,+ IN user_id INT,+ IN count INT,+ IN updated_at CHAR,++ -- return array of user_failed_login+ OUT fetch_all,+ -- return user_failed_login count for count query+ OUT fetch_one+ )+ BEGIN++ SELECT * FROM user_failed_login WHERE 1 = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND user_failed_login.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND user_failed_login.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND user_failed_login.updated_at = :updated_at+ END @IF++ ORDER BY user_failed_login.user_id, user_failed_login.updated_at++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ -- SELECT FOUND_ROWS() as count;+ SELECT count(*) FROM (++ @SQL_COUNT(user_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id++ ) as count;++ END++ -- get user information++ CREATE PROCEDURE get(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,+ IN username CHAR,+ IN email CHAR,+ IN status INT,+ IN role_id INT,++ OUT fetch_row+ )+ BEGIN++ SELECT _.* FROM user_failed_login AS _+ LEFT JOIN user ON (user.user_id = _.user_id)++ WHERE 1 = 1+++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND _.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND _.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND _.updated_at = :updated_at+ END @IF++ @IF isset(:username)+ THEN+ AND user.username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND user.email = :email+ END @IF++ @IF isset(:status)+ THEN+ AND user.status = :status+ END @IF++ @IF isset(:role_id)+ THEN+ AND user.role_id = :role_id+ END @IF++ LIMIT 1;++ END++++ -- Add new failed attempt++ CREATE PROCEDURE logFailed(+ IN user_id INT,+ IN username CHAR,+ IN updated_at CHAR,+ IN last_ip INT,+ OUT fetch_one,+ OUT insert_id+ )+ BEGIN++ SELECT user_id FROM user WHERE user.status = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND user_id = :user_id+ END @IF++ @IF isset(:username)+ THEN+ AND username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND email = :email+ END @IF++ @IF isset(:user_id)+ THEN+ AND user_id = :user_id+ END @IF++ LIMIT 1;++ @IF isset(@result.user)+ THEN++ INSERT INTO user_failed_login++ ( `user_id`, `updated_at`, `last_ip`)++ VALUES ( @result.user, :updated_at, :last_ip )++ ON DUPLICATE KEY UPDATE count = count + 1, last_ip = :last_ip++ END @IF;++ END++ -- Add new user_failed_login++ CREATE PROCEDURE add(+ IN user_failed_login ARRAY,+ OUT insert_id+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ @FILTER(:user_failed_login, user_failed_login)++ INSERT INTO user_failed_login++ ( @KEYS(:user_failed_login) )++ VALUES ( :user_failed_login )+ END+++ -- Update user_failed_login++ CREATE PROCEDURE edit(+ IN user CHAR,+ IN email CHAR,+ IN user_id INT,+ IN user_failed_login ARRAY,+ IN role_id INT,+ OUT affected_rows+ )+ BEGIN+ -- allow only table fields and set defaults for missing values+ @FILTER(:user_failed_login, user_failed_login)++ UPDATE user_failed_login++ SET @LIST(:user_failed_login)++ WHERE++ @IF isset(:email)+ THEN+ email = :email+ END @IF++ @IF isset(:user_failed_login_id)+ THEN+ user_failed_login_id = :user_failed_login_id+ END @IF++ @IF isset(:username)+ THEN+ username = :username+ END @IF+ END++ -- delete user_failed_login++ PROCEDURE delete(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,++ OUT affected_rows+ )+ BEGIN++ DELETE FROM user_failed_login WHERE user_failed_login_id IN (:user_failed_login_id);++ END++ -- set role++ CREATE PROCEDURE setRole(+ IN user_failed_login_id INT,+ IN role CHAR,+ IN role_id INT+ OUT insert_id+ )+ BEGIN+++ UPDATE user_failed_login++ SET++ @IF isset(:role_id)+ THEN+ role_id = :role_id+ END @IF+++ @IF isset(:role)+ THEN+ role_id = (SELECT role_id FROM roles WHERE name = :role)+ END @IF+++ WHERE user_failed_login_id = :user_failed_login_id+ ENDdiff --git a/admin/sql/pgsql/admin_failed_login.sql b/admin/sql/pgsql/admin_failed_login.sqlnew file mode 100644index 0000000..aea383e--- /dev/null+++ b/admin/sql/pgsql/admin_failed_login.sql@@ -0,0 +1,263 @@+-- admin_failed_login++ -- get all entries++ CREATE PROCEDURE getAll(+ IN start INT,+ IN limit INT,+ IN user_id INT,+ IN count INT,+ IN updated_at CHAR,++ -- return array of admin_failed_login+ OUT fetch_all,+ -- return admin_failed_login count for count query+ OUT fetch_one+ )+ BEGIN++ SELECT * FROM admin_failed_login WHERE 1 = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND admin_failed_login.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND admin_failed_login.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND admin_failed_login.updated_at = :updated_at+ END @IF++ ORDER BY admin_failed_login.admin_id, admin_failed_login.updated_at++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ -- SELECT FOUND_ROWS() as count;+ SELECT count(*) FROM (++ @SQL_COUNT(admin_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id++ ) as count;++ END++ -- get user information++ CREATE PROCEDURE get(+ IN admin_id INT,+ IN updated_at CHAR,+ IN count INT,+ IN username CHAR,+ IN email CHAR,+ IN status INT,+ IN role_id INT,++ OUT fetch_row+ )+ BEGIN++ SELECT _.* FROM admin_failed_login AS _+ LEFT JOIN admin ON (admin.admin_id = _.admin_id)++ WHERE 1 = 1+++ @IF isset(:admin_id) AND !empty(:admin_id)+ THEN+ AND _.admin_id = :admin_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND _.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND _.updated_at = :updated_at+ END @IF++ @IF isset(:username)+ THEN+ AND admin.username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND admin.email = :email+ END @IF++ @IF isset(:status)+ THEN+ AND admin.status = :status+ END @IF++ @IF isset(:role_id)+ THEN+ AND admin.role_id = :role_id+ END @IF++ LIMIT 1;++ END++++ -- Add new failed attempt++ CREATE PROCEDURE logFailed(+ IN admin_id INT,+ IN username CHAR,+ IN updated_at CHAR,+ IN last_ip INT,+ OUT fetch_one,+ OUT insert_id+ )+ BEGIN++ SELECT admin_id FROM admin WHERE admin.status = 1++ @IF isset(:admin_id) AND !empty(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF++ @IF isset(:username)+ THEN+ AND username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND email = :email+ END @IF++ @IF isset(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF++ LIMIT 1;++ @IF isset(@result.admin)+ THEN++ INSERT INTO admin_failed_login++ ( "admin_id", "updated_at", "last_ip")++ VALUES ( @result.admin, :updated_at, :last_ip )++ ON CONFLICT ("admin_id", "updated_at") DO UPDATE SET count = admin_failed_login.count + 1, last_ip = :last_ip++ END @IF;+ END++ -- Add new admin_failed_login++ CREATE PROCEDURE add(+ IN admin_failed_login ARRAY,+ OUT insert_id+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ @FILTER(:admin_failed_login, admin_failed_login)++ INSERT INTO admin_failed_login++ ( @KEYS(:admin_failed_login) )++ VALUES ( :admin_failed_login )+ END+++ -- Update admin_failed_login++ CREATE PROCEDURE edit(+ IN user CHAR,+ IN email CHAR,+ IN admin_id INT,+ IN admin_failed_login ARRAY,+ IN role_id INT,+ OUT affected_rows+ )+ BEGIN+ -- allow only table fields and set defaults for missing values+ @FILTER(:admin_failed_login, admin_failed_login)++ UPDATE admin_failed_login++ SET @LIST(:admin_failed_login)++ WHERE++ @IF isset(:email)+ THEN+ email = :email+ END @IF++ @IF isset(:admin_failed_login_id)+ THEN+ admin_failed_login_id = :admin_failed_login_id+ END @IF++ @IF isset(:username)+ THEN+ username = :username+ END @IF+ END++ -- delete admin_failed_login++ PROCEDURE delete(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,++ OUT affected_rows+ )+ BEGIN++ DELETE FROM admin_failed_login WHERE admin_failed_login_id IN (:admin_failed_login_id);++ END++ -- set role++ CREATE PROCEDURE setRole(+ IN admin_failed_login_id INT,+ IN role CHAR,+ IN role_id INT+ OUT insert_id+ )+ BEGIN+++ UPDATE admin_failed_login++ SET++ @IF isset(:role_id)+ THEN+ role_id = :role_id+ END @IF+++ @IF isset(:role)+ THEN+ role_id = (SELECT role_id FROM roles WHERE name = :role)+ END @IF+++ WHERE admin_failed_login_id = :admin_failed_login_id+ ENDdiff --git a/admin/sql/pgsql/user_failed_login.sql b/admin/sql/pgsql/user_failed_login.sqlnew file mode 100644index 0000000..7d7fed2--- /dev/null+++ b/admin/sql/pgsql/user_failed_login.sql@@ -0,0 +1,264 @@+-- user_failed_login++ -- get all entries++ CREATE PROCEDURE getAll(+ IN start INT,+ IN limit INT,+ IN user_id INT,+ IN count INT,+ IN updated_at CHAR,++ -- return array of user_failed_login+ OUT fetch_all,+ -- return user_failed_login count for count query+ OUT fetch_one+ )+ BEGIN++ SELECT * FROM user_failed_login WHERE 1 = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND user_failed_login.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND user_failed_login.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND user_failed_login.updated_at = :updated_at+ END @IF++ ORDER BY user_failed_login.user_id, user_failed_login.updated_at++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ -- SELECT FOUND_ROWS() as count;+ SELECT count(*) FROM (++ @SQL_COUNT(user_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id++ ) as count;++ END++ -- get user information++ CREATE PROCEDURE get(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,+ IN username CHAR,+ IN email CHAR,+ IN status INT,+ IN role_id INT,++ OUT fetch_row+ )+ BEGIN++ SELECT _.* FROM user_failed_login AS _+ LEFT JOIN "user" ON ("user".user_id = _.user_id)++ WHERE 1 = 1+++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND _.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND _.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND _.updated_at = :updated_at+ END @IF++ @IF isset(:username)+ THEN+ AND "user".username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND "user".email = :email+ END @IF++ @IF isset(:status)+ THEN+ AND "user".status = :status+ END @IF++ @IF isset(:role_id)+ THEN+ AND "user".role_id = :role_id+ END @IF++ LIMIT 1;++ END++++ -- Add new failed attempt++ CREATE PROCEDURE logFailed(+ IN user_id INT,+ IN username CHAR,+ IN updated_at CHAR,+ IN last_ip INT,+ OUT fetch_one,+ OUT insert_id+ )+ BEGIN++ SELECT user_id FROM "user" WHERE "user".status = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND user_id = :user_id+ END @IF++ @IF isset(:username)+ THEN+ AND username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND email = :email+ END @IF++ @IF isset(:user_id)+ THEN+ AND user_id = :user_id+ END @IF++ LIMIT 1;++ @IF isset(@result.user)+ THEN++ INSERT INTO user_failed_login++ ( "user_id", "updated_at", "last_ip")++ VALUES ( @result.user, :updated_at, :last_ip )++ ON CONFLICT ("user_id", "updated_at") DO UPDATE SET count = user_failed_login.count + 1, "last_ip" = :last_ip++ END @IF;++ END++ -- Add new user_failed_login++ CREATE PROCEDURE add(+ IN user_failed_login ARRAY,+ OUT insert_id+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ @FILTER(:user_failed_login, user_failed_login)++ INSERT INTO user_failed_login++ ( @KEYS(:user_failed_login) )++ VALUES ( :user_failed_login )+ END+++ -- Update user_failed_login++ CREATE PROCEDURE edit(+ IN user CHAR,+ IN email CHAR,+ IN user_id INT,+ IN user_failed_login ARRAY,+ IN role_id INT,+ OUT affected_rows+ )+ BEGIN+ -- allow only table fields and set defaults for missing values+ @FILTER(:user_failed_login, user_failed_login)++ UPDATE user_failed_login++ SET @LIST(:user_failed_login)++ WHERE++ @IF isset(:email)+ THEN+ email = :email+ END @IF++ @IF isset(:user_failed_login_id)+ THEN+ user_failed_login_id = :user_failed_login_id+ END @IF++ @IF isset(:username)+ THEN+ username = :username+ END @IF+ END++ -- delete user_failed_login++ PROCEDURE delete(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,++ OUT affected_rows+ )+ BEGIN++ DELETE FROM user_failed_login WHERE user_failed_login_id IN (:user_failed_login_id);++ END++ -- set role++ CREATE PROCEDURE setRole(+ IN user_failed_login_id INT,+ IN role CHAR,+ IN role_id INT+ OUT insert_id+ )+ BEGIN+++ UPDATE user_failed_login++ SET++ @IF isset(:role_id)+ THEN+ role_id = :role_id+ END @IF+++ @IF isset(:role)+ THEN+ role_id = (SELECT role_id FROM roles WHERE name = :role)+ END @IF+++ WHERE user_failed_login_id = :user_failed_login_id+ ENDdiff --git a/admin/sql/sqlite/admin_failed_login.sql b/admin/sql/sqlite/admin_failed_login.sqlnew file mode 100644index 0000000..1f8b2a0--- /dev/null+++ b/admin/sql/sqlite/admin_failed_login.sql@@ -0,0 +1,263 @@+-- admin_failed_login++ -- get all entries++ CREATE PROCEDURE getAll(+ IN start INT,+ IN limit INT,+ IN user_id INT,+ IN count INT,+ IN updated_at CHAR,++ -- return array of admin_failed_login+ OUT fetch_all,+ -- return admin_failed_login count for count query+ OUT fetch_one+ )+ BEGIN++ SELECT * FROM admin_failed_login WHERE 1 = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND admin_failed_login.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND admin_failed_login.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND admin_failed_login.updated_at = :updated_at+ END @IF++ ORDER BY admin_failed_login.admin_id, admin_failed_login.updated_at++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ -- SELECT FOUND_ROWS() as count;+ SELECT count(*) FROM (++ @SQL_COUNT(admin_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id++ ) as count;++ END++ -- get user information++ CREATE PROCEDURE get(+ IN admin_id INT,+ IN updated_at CHAR,+ IN count INT,+ IN username CHAR,+ IN email CHAR,+ IN status INT,+ IN role_id INT,++ OUT fetch_row+ )+ BEGIN++ SELECT _.* FROM admin_failed_login AS _+ LEFT JOIN admin ON (admin.admin_id = _.admin_id)++ WHERE 1 = 1+++ @IF isset(:admin_id) AND !empty(:admin_id)+ THEN+ AND _.admin_id = :admin_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND _.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND _.updated_at = :updated_at+ END @IF++ @IF isset(:username)+ THEN+ AND admin.username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND admin.email = :email+ END @IF++ @IF isset(:status)+ THEN+ AND admin.status = :status+ END @IF++ @IF isset(:role_id)+ THEN+ AND admin.role_id = :role_id+ END @IF++ LIMIT 1;++ END++++ -- Add new failed attempt++ CREATE PROCEDURE logFailed(+ IN admin_id INT,+ IN username CHAR,+ IN updated_at CHAR,+ IN last_ip INT,+ OUT fetch_one,+ OUT insert_id+ )+ BEGIN++ SELECT admin_id FROM admin WHERE admin.status = 1++ @IF isset(:admin_id) AND !empty(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF++ @IF isset(:username)+ THEN+ AND username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND email = :email+ END @IF++ @IF isset(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF++ LIMIT 1;++ @IF isset(@result.admin)+ THEN++ INSERT INTO admin_failed_login++ ( `admin_id`, `updated_at`, `last_ip`)++ VALUES ( @result.admin, :updated_at, :last_ip )++ ON CONFLICT(admin_id, updated_at) DO UPDATE SET count = count + 1, last_ip = :last_ip++ END @IF;+ END++ -- Add new admin_failed_login++ CREATE PROCEDURE add(+ IN admin_failed_login ARRAY,+ OUT insert_id+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ @FILTER(:admin_failed_login, admin_failed_login)++ INSERT INTO admin_failed_login++ ( @KEYS(:admin_failed_login) )++ VALUES ( :admin_failed_login )+ END+++ -- Update admin_failed_login++ CREATE PROCEDURE edit(+ IN user CHAR,+ IN email CHAR,+ IN admin_id INT,+ IN admin_failed_login ARRAY,+ IN role_id INT,+ OUT affected_rows+ )+ BEGIN+ -- allow only table fields and set defaults for missing values+ @FILTER(:admin_failed_login, admin_failed_login)++ UPDATE admin_failed_login++ SET @LIST(:admin_failed_login)++ WHERE++ @IF isset(:email)+ THEN+ email = :email+ END @IF++ @IF isset(:admin_failed_login_id)+ THEN+ admin_failed_login_id = :admin_failed_login_id+ END @IF++ @IF isset(:username)+ THEN+ username = :username+ END @IF+ END++ -- delete admin_failed_login++ PROCEDURE delete(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,++ OUT affected_rows+ )+ BEGIN++ DELETE FROM admin_failed_login WHERE admin_failed_login_id IN (:admin_failed_login_id);++ END++ -- set role++ CREATE PROCEDURE setRole(+ IN admin_failed_login_id INT,+ IN role CHAR,+ IN role_id INT+ OUT insert_id+ )+ BEGIN+++ UPDATE admin_failed_login++ SET++ @IF isset(:role_id)+ THEN+ role_id = :role_id+ END @IF+++ @IF isset(:role)+ THEN+ role_id = (SELECT role_id FROM roles WHERE name = :role)+ END @IF+++ WHERE admin_failed_login_id = :admin_failed_login_id+ ENDdiff --git a/admin/sql/sqlite/user_failed_login.sql b/admin/sql/sqlite/user_failed_login.sqlnew file mode 100644index 0000000..f85dbea--- /dev/null+++ b/admin/sql/sqlite/user_failed_login.sql@@ -0,0 +1,264 @@+-- user_failed_login++ -- get all entries++ CREATE PROCEDURE getAll(+ IN start INT,+ IN limit INT,+ IN user_id INT,+ IN count INT,+ IN updated_at CHAR,++ -- return array of user_failed_login+ OUT fetch_all,+ -- return user_failed_login count for count query+ OUT fetch_one+ )+ BEGIN++ SELECT * FROM user_failed_login WHERE 1 = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND user_failed_login.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND user_failed_login.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND user_failed_login.updated_at = :updated_at+ END @IF++ ORDER BY user_failed_login.user_id, user_failed_login.updated_at++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ -- SELECT FOUND_ROWS() as count;+ SELECT count(*) FROM (++ @SQL_COUNT(user_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id++ ) as count;++ END++ -- get user information++ CREATE PROCEDURE get(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,+ IN username CHAR,+ IN email CHAR,+ IN status INT,+ IN role_id INT,++ OUT fetch_row+ )+ BEGIN++ SELECT _.* FROM user_failed_login AS _+ LEFT JOIN user ON (user.user_id = _.user_id)++ WHERE 1 = 1+++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND _.user_id = :user_id+ END @IF++ @IF isset(:count) AND !empty(:count)+ THEN+ AND _.count > :count+ END @IF++ @IF isset(:updated_at) AND !empty(:updated_at)+ THEN+ AND _.updated_at = :updated_at+ END @IF++ @IF isset(:username)+ THEN+ AND user.username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND user.email = :email+ END @IF++ @IF isset(:status)+ THEN+ AND user.status = :status+ END @IF++ @IF isset(:role_id)+ THEN+ AND user.role_id = :role_id+ END @IF++ LIMIT 1;++ END++++ -- Add new failed attempt++ CREATE PROCEDURE logFailed(+ IN user_id INT,+ IN username CHAR,+ IN updated_at CHAR,+ IN last_ip INT,+ OUT fetch_one,+ OUT insert_id+ )+ BEGIN++ SELECT user_id FROM user WHERE user.status = 1++ @IF isset(:user_id) AND !empty(:user_id)+ THEN+ AND user_id = :user_id+ END @IF++ @IF isset(:username)+ THEN+ AND username = :username+ END @IF++ @IF isset(:email)+ THEN+ AND email = :email+ END @IF++ @IF isset(:user_id)+ THEN+ AND user_id = :user_id+ END @IF++ LIMIT 1;++ @IF isset(@result.user)+ THEN++ INSERT INTO user_failed_login++ ( `user_id`, `updated_at`, `last_ip`)++ VALUES ( @result.user, :updated_at, :last_ip )++ ON CONFLICT(user_id, updated_at) DO UPDATE SET count = count + 1, last_ip = :last_ip++ END @IF;++ END++ -- Add new user_failed_login++ CREATE PROCEDURE add(+ IN user_failed_login ARRAY,+ OUT insert_id+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ @FILTER(:user_failed_login, user_failed_login)++ INSERT INTO user_failed_login++ ( @KEYS(:user_failed_login) )++ VALUES ( :user_failed_login )+ END+++ -- Update user_failed_login++ CREATE PROCEDURE edit(+ IN user CHAR,+ IN email CHAR,+ IN user_id INT,+ IN user_failed_login ARRAY,+ IN role_id INT,+ OUT affected_rows+ )+ BEGIN+ -- allow only table fields and set defaults for missing values+ @FILTER(:user_failed_login, user_failed_login)++ UPDATE user_failed_login++ SET @LIST(:user_failed_login)++ WHERE++ @IF isset(:email)+ THEN+ email = :email+ END @IF++ @IF isset(:user_failed_login_id)+ THEN+ user_failed_login_id = :user_failed_login_id+ END @IF++ @IF isset(:username)+ THEN+ username = :username+ END @IF+ END++ -- delete user_failed_login++ PROCEDURE delete(+ IN user_id INT,+ IN updated_at CHAR,+ IN count INT,++ OUT affected_rows+ )+ BEGIN++ DELETE FROM user_failed_login WHERE user_failed_login_id IN (:user_failed_login_id);++ END++ -- set role++ CREATE PROCEDURE setRole(+ IN user_failed_login_id INT,+ IN role CHAR,+ IN role_id INT+ OUT insert_id+ )+ BEGIN+++ UPDATE user_failed_login++ SET++ @IF isset(:role_id)+ THEN+ role_id = :role_id+ END @IF+++ @IF isset(:role)+ THEN+ role_id = (SELECT role_id FROM roles WHERE name = :role)+ END @IF+++ WHERE user_failed_login_id = :user_failed_login_id+ ENDdiff --git a/app/controller/user/login-trait.php b/app/controller/user/login-trait.phpindex 5a8c4ab..bd94c14 100755--- a/app/controller/user/login-trait.php+++ b/app/controller/user/login-trait.php@@ -22,7 +22,9 @@namespace Vvveb\Controller\User;+use \Vvveb\System\Functions\Str;use function Vvveb\__;+use Vvveb\Sql\User_Failed_LoginSQL;use Vvveb\System\Event;use Vvveb\System\User\User;use Vvveb\System\Validator;@@ -30,6 +32,11 @@ use Vvveb\System\Validator;trait LoginTrait {protected $redirectUrl;+ //failed attemps per minute Y-m-d H:i:00+ protected $failedTimeInterval = 'Y-m-d H:00:00'; //failed attemps per hour++ protected $failedCount = 10; //the number of failures before account is locked+function login() {if (isset($this->request->post['logout'])) {$success = __('Logout successful!');@@ -44,6 +51,18 @@ trait LoginTrait {if (($errors = $validator->validate($this->request->post)) === true) {$userInfo = $this->request->post;+ $failedLogin = new User_Failed_LoginSQL();+ $date = date($this->failedTimeInterval);+ $lastIp = $_SERVER['REMOTE_ADDR'] ?? '';+ $failedAttemps = $failedLogin->get(['updated_at' => $date, 'status' => 1] + $userInfo);++ if ($failedAttemps && ($failedAttemps['count'] > $this->failedCount)) {+ $this->view->errors['login'] = __('Too many login attempts, try again in one hour!');+ $failedLogin->logFailed(['last_ip' => $lastIp, 'updated_at' => $date] + $userInfo);++ return;+ }+list($userInfo) = Event :: trigger(__CLASS__, __FUNCTION__ , $userInfo);if ($userInfo) {@@ -57,6 +76,9 @@ trait LoginTrait {} else {//user not found or wrong password$this->view->errors['login'] = __('Authentication failed, wrong email or password!');+ $this->session->set('csrf', Str::random());+ //increment failed attempts+ $failedLogin->logFailed(['last_ip' => $lastIp, 'updated_at' => $date] + $userInfo);}} else {if ($errors !== true) {diff --git a/app/sql/mysqli/user_failed_login.sql b/app/sql/mysqli/user_failed_login.sqlnew file mode 100644index 0000000..bbbb3d3--- /dev/null+++ b/app/sql/mysqli/user_failed_login.sql@@ -0,0 +1,4 @@+-- User failed login++ -- get common code from admin+ import(/admin/user_failed_login.sql);diff --git a/app/sql/pgsql/user_failed_login.sql b/app/sql/pgsql/user_failed_login.sqlnew file mode 100644index 0000000..bbbb3d3--- /dev/null+++ b/app/sql/pgsql/user_failed_login.sql@@ -0,0 +1,4 @@+-- User failed login++ -- get common code from admin+ import(/admin/user_failed_login.sql);diff --git a/app/sql/sqlite/user_failed_login.sql b/app/sql/sqlite/user_failed_login.sqlnew file mode 100644index 0000000..bbbb3d3--- /dev/null+++ b/app/sql/sqlite/user_failed_login.sql@@ -0,0 +1,4 @@+-- User failed login++ -- get common code from admin+ import(/admin/user_failed_login.sql);diff --git a/install/sql/mysqli/schema/admin/admin_failed_login.sql b/install/sql/mysqli/schema/admin/admin_failed_login.sqlnew file mode 100644index 0000000..17b1ca6--- /dev/null+++ b/install/sql/mysqli/schema/admin/admin_failed_login.sql@@ -0,0 +1,9 @@+DROP TABLE IF EXISTS `admin_failed_login`;++CREATE TABLE `admin_failed_login` (+ `admin_id` INT UNSIGNED NOT NULL,+ `count` INT UNSIGNED DEFAULT 0,+ `last_ip` VARCHAR(16) NOT NULL DEFAULT '',+ `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,+ PRIMARY KEY (`admin_id`, `updated_at`)+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/mysqli/schema/user/user_failed_login.sql b/install/sql/mysqli/schema/user/user_failed_login.sqlnew file mode 100644index 0000000..2bea541--- /dev/null+++ b/install/sql/mysqli/schema/user/user_failed_login.sql@@ -0,0 +1,9 @@+DROP TABLE IF EXISTS `user_failed_login`;++CREATE TABLE `user_failed_login` (+ `user_id` INT UNSIGNED NOT NULL,+ `count` INT UNSIGNED DEFAULT 0,+ `last_ip` VARCHAR(16) NOT NULL DEFAULT '',+ `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,+ PRIMARY KEY (`user_id`, `updated_at`)+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/pgsql/schema/admin/admin_failed_login.sql b/install/sql/pgsql/schema/admin/admin_failed_login.sqlnew file mode 100644index 0000000..55fe9af--- /dev/null+++ b/install/sql/pgsql/schema/admin/admin_failed_login.sql@@ -0,0 +1,9 @@+DROP TABLE IF EXISTS "admin_failed_login";++CREATE TABLE "admin_failed_login" (+ "admin_id" int check ("admin_id" > 0) NOT NULL,+ "count" int check ("count" > 0) NOT NULL DEFAULT 1,+ "last_ip" varchar(16) NOT NULL DEFAULT '',+ "updated_at" timestamp(0) NOT NULL DEFAULT now(),+ PRIMARY KEY ("admin_id", "updated_at")+);\ No newline at end of filediff --git a/install/sql/pgsql/schema/user/user_failed_login.sql b/install/sql/pgsql/schema/user/user_failed_login.sqlnew file mode 100644index 0000000..11274f6--- /dev/null+++ b/install/sql/pgsql/schema/user/user_failed_login.sql@@ -0,0 +1,9 @@+DROP TABLE IF EXISTS "user_failed_login";++CREATE TABLE "user_failed_login" (+ "user_id" int check ("user_id" > 0) NOT NULL,+ "count" int check ("count" > 0) NOT NULL DEFAULT 1,+ "last_ip" varchar(16) NOT NULL DEFAULT '',+ "updated_at" timestamp(0) NOT NULL DEFAULT now(),+ PRIMARY KEY ("user_id", "updated_at")+);\ No newline at end of filediff --git a/install/sql/sqlite/schema/admin/admin_failed_login.sql b/install/sql/sqlite/schema/admin/admin_failed_login.sqlnew file mode 100644index 0000000..1dec332--- /dev/null+++ b/install/sql/sqlite/schema/admin/admin_failed_login.sql@@ -0,0 +1,9 @@+DROP TABLE IF EXISTS `admin_failed_login`;++CREATE TABLE `admin_failed_login` (+ `admin_id` INT UNSIGNED NOT NULL,+ `count` INT UNSIGNED DEFAULT 0,+ `last_ip` TEXT NOT NULL DEFAULT '',+ `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,+ PRIMARY KEY (`admin_id`, `updated_at`)+);\ No newline at end of filediff --git a/install/sql/sqlite/schema/user/user_failed_login.sql b/install/sql/sqlite/schema/user/user_failed_login.sqlnew file mode 100644index 0000000..bf2ff07--- /dev/null+++ b/install/sql/sqlite/schema/user/user_failed_login.sql@@ -0,0 +1,9 @@+DROP TABLE IF EXISTS `user_failed_login`;++CREATE TABLE `user_failed_login` (+ `user_id` INT UNSIGNED NOT NULL,+ `count` INT UNSIGNED DEFAULT 0,+ `last_ip` TEXT NOT NULL DEFAULT '',+ `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,+ PRIMARY KEY (`user_id`, `updated_at`)+);\ No newline at end of file