Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2024-11-10 00:52:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved out the http handler from users to the UserController.

Browse Source
This commit is contained in:
Relintai 2021-08-22 22:03:35 +02:00
parent 8318e0257a
commit e5e1dfee8a
4 changed files with 504 additions and 493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

476
modules/users/user.cpp
View File

@ -23,6 +23,9 @@
#include "user_model.h"
void User::register_sessions() {
//todo rework this
if (sessions.size() == 0) {
return;
}
@ -37,7 +40,7 @@ void User::register_sessions() {
for (int i = 0; i < sessions.size(); ++i) {
HTTPSession *session = new HTTPSession();
session->session_id = sessions[i];
session->add_object("user", this);
session->add_reference("user", Ref<Reference>(this));
sm->add_session(session);
}
@ -60,473 +63,6 @@ void User::unregister_sessions() {
}
}
void User::handle_request_default(Request *request) {
if (request->session) {
User *u = dynamic_cast<User *>(request->session->get_object("user"));
if (u) {
u->handle_request(request);
return;
}
}
const std::string &segment = request->get_current_path_segment();
if (segment == "") {
handle_login_request_default(request);
return;
} else if (segment == "login") {
handle_login_request_default(request);
return;
} else if (segment == "register") {
handle_register_request_default(request);
return;
}
handle_login_request_default(request);
}
void User::handle_login_request_default(Request *request) {
std::string error_str = "";
std::string uname_val = "";
std::string pass_val = "";
if (request->get_method() == HTTP_METHOD_POST) {
//this is probbaly not needed
//it's ok for now as I need to test the validators more
std::vector<std::string> errors;
_login_validator->validate(request, &errors);
for (int i = 0; i < errors.size(); ++i) {
error_str += errors[i] + "<br>";
}
//not needed end
uname_val = request->get_parameter("username");
pass_val = request->get_parameter("password");
Ref<User> user = UserModel::get_singleton()->get_user(uname_val);
if (user.is_valid()) {
if (!UserModel::get_singleton()->check_password(user, pass_val)) {
error_str += "Invalid username or password!";
} else {
HTTPSession *session = request->get_or_create_session();
session->add_int("user", user->id);
//session->save();
request->add_cookie(::Cookie("session_id", session->session_id));
//todo implement redirect!
request->body += "Login Success!<br>";
request->compile_and_send_body();
return;
}
} else {
error_str += "Invalid username or password!";
}
}
HTMLBuilder b;
b.w("Login");
b.br();
if (error_str.size() != 0) {
b.div()->cls("error");
b.w(error_str);
b.cdiv();
}
b.div()->cls("login");
//todo href path helper
b.form()->method("POST")->href("/user/login");
b.w("Username");
b.br();
b.input()->type("text")->name("username")->value(uname_val);
b.cinput();
b.br();
b.w("Password");
b.br();
b.input()->type("password")->name("password");
b.cinput();
b.br();
b.input()->type("submit")->value("Send");
b.cinput();
b.cform();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
}
void User::handle_register_request_default(Request *request) {
std::string error_str = "";
std::string uname_val = "";
std::string email_val = "";
std::string pass_val = "";
std::string pass_check_val = "";
if (request->get_method() == HTTP_METHOD_POST) {
std::vector<std::string> errors;
_registration_validator->validate(request, &errors);
for (int i = 0; i < errors.size(); ++i) {
error_str += errors[i] + "<br>";
}
uname_val = request->get_parameter("username");
email_val = request->get_parameter("email");
pass_val = request->get_parameter("password");
pass_check_val = request->get_parameter("password_check");
//todo username length etc check
//todo pw length etc check
if (UserModel::get_singleton()->is_username_taken(uname_val)) {
error_str += "Username already taken!<br>";
}
if (UserModel::get_singleton()->is_email_taken(email_val)) {
error_str += "Email already in use!<br>";
}
if (pass_val != pass_check_val) {
error_str += "The passwords did not match!<br>";
}
if (error_str.size() == 0) {
Ref<User> user;
user.instance();
user->name_user_input = uname_val;
user->email_user_input = email_val;
//todo
user->rank = 1;
UserModel::get_singleton()->create_password(user, pass_val);
UserModel::get_singleton()->save_user(user);
HTMLBuilder b;
b.div()->cls("success");
b.w("Registration successful! You can now log in!");
b.br();
b.a()->href("/user/login");
b.w(">> Login <<");
b.ca();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
return;
}
}
HTMLBuilder b;
b.w("Registration");
b.br();
if (error_str.size() != 0) {
b.div()->cls("error");
b.w(error_str);
b.cdiv();
}
b.div()->cls("register");
//todo href path helper
b.form()->method("POST")->href("/user/register");
b.w("Username");
b.br();
b.input()->type("text")->name("username")->value(uname_val);
b.cinput();
b.br();
b.w("Email");
b.br();
b.input()->type("email")->name("email")->value(email_val);
b.cinput();
b.br();
b.w("Password");
b.br();
b.input()->type("password")->name("password");
b.cinput();
b.br();
b.w("Password again");
b.br();
b.input()->type("password")->name("password_check");
b.cinput();
b.br();
b.input()->type("submit")->value("Register");
b.cinput();
b.cform();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
}
void User::handle_request(Request *request) {
const std::string &segment = request->get_current_path_segment();
if (segment == "") {
handle_main_page_request(request);
} else if (segment == "settings") {
handle_settings_request(request);
} else if (segment == "password_reset") {
handle_password_reset_request(request);
} else if (segment == "logout") {
handle_logout_request(request);
} else if (segment == "delete") {
handle_delete_request(request);
} else if (segment == "login") {
request->body += "You are already logged in.";
request->compile_and_send_body();
} else if (segment == "register") {
request->body += "You are already logged in.";
request->compile_and_send_body();
} else {
request->send_error(404);
}
}
void User::handle_main_page_request(Request *request) {
request->body += "handle_main_page_request";
request->compile_and_send_body();
}
void User::handle_settings_request(Request *request) {
std::string error_str = "";
std::string uname_val;
std::string email_val;
std::string pass_val;
std::string pass_check_val;
if (request->get_method() == HTTP_METHOD_POST) {
uname_val = request->get_parameter("username");
email_val = request->get_parameter("email");
pass_val = request->get_parameter("password");
pass_check_val = request->get_parameter("password_check");
bool changed = false;
std::vector<std::string> errors;
bool valid = _profile_validator->validate(request, &errors);
for (int i = 0; i < errors.size(); ++i) {
error_str += errors[i] + "<br>";
}
if (valid) {
if (uname_val == name_user_input) {
uname_val = "";
}
if (email_val == email_user_input) {
email_val = "";
}
if (uname_val != "") {
if (UserModel::get_singleton()->is_username_taken(uname_val)) {
error_str += "Username already taken!<br>";
} else {
//todo sanitize for html special chars!
name_user_input = uname_val;
changed = true;
uname_val = "";
}
}
if (email_val != "") {
if (UserModel::get_singleton()->is_email_taken(email_val)) {
error_str += "Email already in use!<br>";
} else {
//todo sanitize for html special chars!
//also send email
email_user_input = email_val;
changed = true;
email_val = "";
}
}
if (pass_val != "") {
if (pass_val != pass_check_val) {
error_str += "The passwords did not match!<br>";
} else {
//todo
//create_password(pass_val);
changed = true;
}
}
if (changed) {
save();
}
}
}
HTMLBuilder b;
b.w("Settings");
b.br();
if (error_str.size() != 0) {
b.div()->cls("error");
b.w(error_str);
b.cdiv();
}
b.div()->cls("settings");
//todo href path helper
b.form()->method("POST")->href("/user/settings");
b.w("Username");
b.br();
b.input()->type("text")->name("username")->placeholder(name_user_input)->value(uname_val);
b.cinput();
b.br();
b.w("Email");
b.br();
b.input()->type("email")->name("email")->placeholder(email_user_input)->value(email_val);
b.cinput();
b.br();
b.w("Password");
b.br();
b.input()->type("password")->placeholder("*******")->name("password");
b.cinput();
b.br();
b.w("Password again");
b.br();
b.input()->type("password")->placeholder("*******")->name("password_check");
b.cinput();
b.br();
b.input()->type("submit")->value("Save");
b.cinput();
b.cform();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
}
void User::handle_password_reset_request(Request *request) {
request->body += "handle_password_reset_request";
request->compile_and_send_body();
}
void User::handle_logout_request(Request *request) {
request->remove_cookie("session_id");
for (int i = 0; i < sessions.size(); ++i) {
if (sessions[i] == request->session->session_id) {
sessions[i] = sessions[sessions.size() - 1];
sessions.pop_back();
}
}
save();
SessionManager::get_singleton()->delete_session(request->session->session_id);
request->session = nullptr;
HTMLBuilder b;
b.w("Logout successful!");
request->body += b.result;
request->compile_and_send_body();
}
void User::handle_delete_request(Request *request) {
request->body += "handle_delete_request";
request->compile_and_send_body();
}
void User::create_validators() {
if (!_login_validator) {
//Login
_login_validator = new FormValidator();
_login_validator->new_field("username", "Username")->need_to_exist()->need_to_be_alpha_numeric()->need_minimum_length(5)->need_maximum_length(20);
FormField *pw = _login_validator->new_field("password", "Password");
pw->need_to_exist();
pw->need_to_have_lowercase_character()->need_to_have_uppercase_character();
pw->need_minimum_length(5);
}
if (!_registration_validator) {
//Registration
_registration_validator = new FormValidator();
_registration_validator->new_field("username", "Username")->need_to_exist()->need_to_be_alpha_numeric()->need_minimum_length(5)->need_maximum_length(20);
_registration_validator->new_field("email", "Email")->need_to_exist()->need_to_be_email();
FormField *pw = _registration_validator->new_field("password", "Password");
pw->need_to_exist();
pw->need_to_have_lowercase_character()->need_to_have_uppercase_character();
pw->need_minimum_length(5);
_registration_validator->new_field("password_check", "Password check")->need_to_match("password");
_registration_validator->new_field("email", "Email")->need_to_exist()->need_to_be_email();
}
if (!_profile_validator) {
_profile_validator = new FormValidator();
_profile_validator->new_field("username", "Username")->ignore_if_not_exists()->need_to_be_alpha_numeric()->need_minimum_length(5)->need_maximum_length(20);
_profile_validator->new_field("email", "Email")->ignore_if_not_exists()->need_to_be_email();
FormField *pw = _profile_validator->new_field("password", "Password");
pw->ignore_if_not_exists();
pw->need_to_have_lowercase_character()->need_to_have_uppercase_character();
pw->need_minimum_length(5);
_profile_validator->new_field("password_check", "Password check")->ignore_if_other_field_not_exists("password")->need_to_match("password");
}
}
void User::file_save() {
}
void User::file_load() {
@ -684,9 +220,5 @@ User::~User() {
unregister_sessions();
}
FormValidator *User::_login_validator = nullptr;
FormValidator *User::_registration_validator = nullptr;
FormValidator *User::_profile_validator = nullptr;
std::string User::_path = "./";
std::string User::_table_name = "users";

18
modules/users/user.h
View File

@ -25,20 +25,6 @@ public:
std::string password_reset_token;
bool locked;
static void handle_request_default(Request *request);
static void handle_login_request_default(Request *request);
static void handle_register_request_default(Request *request);
virtual void handle_request(Request *request);
virtual void handle_main_page_request(Request *request);
virtual void handle_settings_request(Request *request);
virtual void handle_password_reset_request(Request *request);
virtual void handle_logout_request(Request *request);
virtual void handle_delete_request(Request *request);
static void create_validators();
void register_sessions();
void unregister_sessions();
@ -57,10 +43,6 @@ public:
~User();
protected:
static FormValidator *_login_validator;
static FormValidator *_registration_validator;
static FormValidator *_profile_validator;
std::string _file_path;
static std::string _path;

481
modules/users/user_controller.cpp
View File

@ -1,6 +1,479 @@
#include "user_controller.h"
#include "user.h"
#include "user_model.h"
#include "core/http/request.h"
#include "core/html/form_validator.h"
#include "core/html/html_builder.h"
#include "core/http/http_session.h"
#include "core/http/session_manager.h"
#include "core/http/cookie.h"
void UserController::handle_request_default(Request *request) {
if (request->session) {
Ref<User> u = request->session->get_reference("user");
if (u.is_valid()) {
handle_request(u, request);
return;
}
}
const std::string &segment = request->get_current_path_segment();
if (segment == "") {
handle_login_request_default(request);
return;
} else if (segment == "login") {
handle_login_request_default(request);
return;
} else if (segment == "register") {
handle_register_request_default(request);
return;
}
handle_login_request_default(request);
}
void UserController::handle_login_request_default(Request *request) {
std::string error_str = "";
std::string uname_val = "";
std::string pass_val = "";
if (request->get_method() == HTTP_METHOD_POST) {
//this is probbaly not needed
//it's ok for now as I need to test the validators more
std::vector<std::string> errors;
_login_validator->validate(request, &errors);
for (int i = 0; i < errors.size(); ++i) {
error_str += errors[i] + "<br>";
}
//not needed end
uname_val = request->get_parameter("username");
pass_val = request->get_parameter("password");
Ref<User> user = UserModel::get_singleton()->get_user(uname_val);
if (user.is_valid()) {
if (!UserModel::get_singleton()->check_password(user, pass_val)) {
error_str += "Invalid username or password!";
} else {
HTTPSession *session = request->get_or_create_session();
session->add_int("user", user->id);
//session->save();
request->add_cookie(::Cookie("session_id", session->session_id));
//todo implement redirect!
request->body += "Login Success!<br>";
request->compile_and_send_body();
return;
}
} else {
error_str += "Invalid username or password!";
}
}
HTMLBuilder b;
b.w("Login");
b.br();
if (error_str.size() != 0) {
b.div()->cls("error");
b.w(error_str);
b.cdiv();
}
b.div()->cls("login");
//todo href path helper
b.form()->method("POST")->href("/user/login");
b.w("Username");
b.br();
b.input()->type("text")->name("username")->value(uname_val);
b.cinput();
b.br();
b.w("Password");
b.br();
b.input()->type("password")->name("password");
b.cinput();
b.br();
b.input()->type("submit")->value("Send");
b.cinput();
b.cform();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
}
void UserController::handle_register_request_default(Request *request) {
std::string error_str = "";
std::string uname_val = "";
std::string email_val = "";
std::string pass_val = "";
std::string pass_check_val = "";
if (request->get_method() == HTTP_METHOD_POST) {
std::vector<std::string> errors;
_registration_validator->validate(request, &errors);
for (int i = 0; i < errors.size(); ++i) {
error_str += errors[i] + "<br>";
}
uname_val = request->get_parameter("username");
email_val = request->get_parameter("email");
pass_val = request->get_parameter("password");
pass_check_val = request->get_parameter("password_check");
//todo username length etc check
//todo pw length etc check
if (UserModel::get_singleton()->is_username_taken(uname_val)) {
error_str += "Username already taken!<br>";
}
if (UserModel::get_singleton()->is_email_taken(email_val)) {
error_str += "Email already in use!<br>";
}
if (pass_val != pass_check_val) {
error_str += "The passwords did not match!<br>";
}
if (error_str.size() == 0) {
Ref<User> user;
user.instance();
user->name_user_input = uname_val;
user->email_user_input = email_val;
//todo
user->rank = 1;
UserModel::get_singleton()->create_password(user, pass_val);
UserModel::get_singleton()->save_user(user);
HTMLBuilder b;
b.div()->cls("success");
b.w("Registration successful! You can now log in!");
b.br();
b.a()->href("/user/login");
b.w(">> Login <<");
b.ca();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
return;
}
}
HTMLBuilder b;
b.w("Registration");
b.br();
if (error_str.size() != 0) {
b.div()->cls("error");
b.w(error_str);
b.cdiv();
}
b.div()->cls("register");
//todo href path helper
b.form()->method("POST")->href("/user/register");
b.w("Username");
b.br();
b.input()->type("text")->name("username")->value(uname_val);
b.cinput();
b.br();
b.w("Email");
b.br();
b.input()->type("email")->name("email")->value(email_val);
b.cinput();
b.br();
b.w("Password");
b.br();
b.input()->type("password")->name("password");
b.cinput();
b.br();
b.w("Password again");
b.br();
b.input()->type("password")->name("password_check");
b.cinput();
b.br();
b.input()->type("submit")->value("Register");
b.cinput();
b.cform();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
}
void UserController::handle_request(Ref<User> &user, Request *request) {
const std::string &segment = request->get_current_path_segment();
if (segment == "") {
handle_main_page_request(user, request);
} else if (segment == "settings") {
handle_settings_request(user, request);
} else if (segment == "password_reset") {
handle_password_reset_request(user, request);
} else if (segment == "logout") {
handle_logout_request(user, request);
} else if (segment == "delete") {
handle_delete_request(user, request);
} else if (segment == "login") {
request->body += "You are already logged in.";
request->compile_and_send_body();
} else if (segment == "register") {
request->body += "You are already logged in.";
request->compile_and_send_body();
} else {
request->send_error(404);
}
}
void UserController::handle_main_page_request(Ref<User> &user, Request *request) {
request->body += "handle_main_page_request";
request->compile_and_send_body();
}
void UserController::handle_settings_request(Ref<User> &user, Request *request) {
std::string error_str = "";
std::string uname_val;
std::string email_val;
std::string pass_val;
std::string pass_check_val;
if (request->get_method() == HTTP_METHOD_POST) {
uname_val = request->get_parameter("username");
email_val = request->get_parameter("email");
pass_val = request->get_parameter("password");
pass_check_val = request->get_parameter("password_check");
bool changed = false;
std::vector<std::string> errors;
bool valid = _profile_validator->validate(request, &errors);
for (int i = 0; i < errors.size(); ++i) {
error_str += errors[i] + "<br>";
}
if (valid) {
if (uname_val == user->name_user_input) {
uname_val = "";
}
if (email_val == user->email_user_input) {
email_val = "";
}
if (uname_val != "") {
if (UserModel::get_singleton()->is_username_taken(uname_val)) {
error_str += "Username already taken!<br>";
} else {
//todo sanitize for html special chars!
user->name_user_input = uname_val;
changed = true;
uname_val = "";
}
}
if (email_val != "") {
if (UserModel::get_singleton()->is_email_taken(email_val)) {
error_str += "Email already in use!<br>";
} else {
//todo sanitize for html special chars!
//also send email
user->email_user_input = email_val;
changed = true;
email_val = "";
}
}
if (pass_val != "") {
if (pass_val != pass_check_val) {
error_str += "The passwords did not match!<br>";
} else {
//todo
//create_password(pass_val);
changed = true;
}
}
if (changed) {
UserModel::get_singleton()->save_user(user);
}
}
}
HTMLBuilder b;
b.w("Settings");
b.br();
if (error_str.size() != 0) {
b.div()->cls("error");
b.w(error_str);
b.cdiv();
}
b.div()->cls("settings");
//todo href path helper
b.form()->method("POST")->href("/user/settings");
b.w("Username");
b.br();
b.input()->type("text")->name("username")->placeholder(user->name_user_input)->value(uname_val);
b.cinput();
b.br();
b.w("Email");
b.br();
b.input()->type("email")->name("email")->placeholder(user->email_user_input)->value(email_val);
b.cinput();
b.br();
b.w("Password");
b.br();
b.input()->type("password")->placeholder("*******")->name("password");
b.cinput();
b.br();
b.w("Password again");
b.br();
b.input()->type("password")->placeholder("*******")->name("password_check");
b.cinput();
b.br();
b.input()->type("submit")->value("Save");
b.cinput();
b.cform();
b.cdiv();
request->body += b.result;
request->compile_and_send_body();
}
void UserController::handle_password_reset_request(Ref<User> &user, Request *request) {
request->body += "handle_password_reset_request";
request->compile_and_send_body();
}
void UserController::handle_logout_request(Ref<User> &user, Request *request) {
request->remove_cookie("session_id");
for (int i = 0; i < user->sessions.size(); ++i) {
if (user->sessions[i] == request->session->session_id) {
user->sessions[i] = user->sessions[user->sessions.size() - 1];
user->sessions.pop_back();
}
}
UserModel::get_singleton()->save_user(user);
SessionManager::get_singleton()->delete_session(request->session->session_id);
request->session = nullptr;
HTMLBuilder b;
b.w("Logout successful!");
request->body += b.result;
request->compile_and_send_body();
}
void UserController::handle_delete_request(Ref<User> &user, Request *request) {
request->body += "handle_delete_request";
request->compile_and_send_body();
}
void UserController::create_validators() {
if (!_login_validator) {
//Login
_login_validator = new FormValidator();
_login_validator->new_field("username", "Username")->need_to_exist()->need_to_be_alpha_numeric()->need_minimum_length(5)->need_maximum_length(20);
FormField *pw = _login_validator->new_field("password", "Password");
pw->need_to_exist();
pw->need_to_have_lowercase_character()->need_to_have_uppercase_character();
pw->need_minimum_length(5);
}
if (!_registration_validator) {
//Registration
_registration_validator = new FormValidator();
_registration_validator->new_field("username", "Username")->need_to_exist()->need_to_be_alpha_numeric()->need_minimum_length(5)->need_maximum_length(20);
_registration_validator->new_field("email", "Email")->need_to_exist()->need_to_be_email();
FormField *pw = _registration_validator->new_field("password", "Password");
pw->need_to_exist();
pw->need_to_have_lowercase_character()->need_to_have_uppercase_character();
pw->need_minimum_length(5);
_registration_validator->new_field("password_check", "Password check")->need_to_match("password");
_registration_validator->new_field("email", "Email")->need_to_exist()->need_to_be_email();
}
if (!_profile_validator) {
_profile_validator = new FormValidator();
_profile_validator->new_field("username", "Username")->ignore_if_not_exists()->need_to_be_alpha_numeric()->need_minimum_length(5)->need_maximum_length(20);
_profile_validator->new_field("email", "Email")->ignore_if_not_exists()->need_to_be_email();
FormField *pw = _profile_validator->new_field("password", "Password");
pw->ignore_if_not_exists();
pw->need_to_have_lowercase_character()->need_to_have_uppercase_character();
pw->need_minimum_length(5);
_profile_validator->new_field("password_check", "Password check")->ignore_if_other_field_not_exists("password")->need_to_match("password");
}
}
UserController *UserController::get_singleton() {
return _self;
@ -22,4 +495,8 @@ UserController::~UserController() {
}
}
UserController *UserController::_self = nullptr;
UserController *UserController::_self = nullptr;
FormValidator *UserController::_login_validator = nullptr;
FormValidator *UserController::_registration_validator = nullptr;
FormValidator *UserController::_profile_validator = nullptr;

22
modules/users/user_controller.h
View File

@ -4,11 +4,27 @@
#include "core/object.h"
#include <string>
#include "user.h"
class User;
class Request;
class FormValidator;
class UserController : public Object {
public:
virtual void handle_request_default(Request *request);
virtual void handle_login_request_default(Request *request);
virtual void handle_register_request_default(Request *request);
virtual void handle_request(Ref<User> &user, Request *request);
virtual void handle_main_page_request(Ref<User> &user, Request *request);
virtual void handle_settings_request(Ref<User> &user, Request *request);
virtual void handle_password_reset_request(Ref<User> &user, Request *request);
virtual void handle_logout_request(Ref<User> &user, Request *request);
virtual void handle_delete_request(Ref<User> &user, Request *request);
static void create_validators();
static UserController *get_singleton();
UserController();
@ -16,6 +32,10 @@ public:
protected:
static UserController *_self;
static FormValidator *_login_validator;
static FormValidator *_registration_validator;
static FormValidator *_profile_validator;
};
#endif