Can change user password
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
use actix::{Actor, Context, Handler, Message, MessageResult};
|
||||
|
||||
use crate::data::entity_manager::EntityManager;
|
||||
use crate::data::user::{User, UserID, verify_password};
|
||||
use crate::data::user::{User, UserID};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum LoginResult {
|
||||
@ -57,7 +57,7 @@ impl Handler<LoginRequest> for UsersActor {
|
||||
match self.manager.find_by_username_or_email(&msg.login) {
|
||||
None => MessageResult(LoginResult::AccountNotFound),
|
||||
Some(user) => {
|
||||
if !verify_password(msg.password, &user.password) {
|
||||
if !user.verify_password(&msg.password) {
|
||||
return MessageResult(LoginResult::InvalidPassword);
|
||||
}
|
||||
|
||||
|
@ -3,9 +3,11 @@ use actix_identity::Identity;
|
||||
use actix_web::{HttpResponse, Responder, web};
|
||||
use askama::Template;
|
||||
|
||||
use crate::actors::users_actor;
|
||||
use crate::actors::{bruteforce_actor, users_actor};
|
||||
use crate::actors::bruteforce_actor::BruteForceActor;
|
||||
use crate::actors::users_actor::UsersActor;
|
||||
use crate::constants::APP_NAME;
|
||||
use crate::constants::{APP_NAME, MAX_FAILED_LOGIN_ATTEMPTS, MIN_PASS_LEN};
|
||||
use crate::data::remote_ip::RemoteIP;
|
||||
use crate::data::session_identity::SessionIdentity;
|
||||
use crate::data::user::User;
|
||||
|
||||
@ -21,11 +23,12 @@ struct BaseSettingsPage {
|
||||
}
|
||||
|
||||
impl BaseSettingsPage {
|
||||
async fn get(user: &User) -> BaseSettingsPage {
|
||||
async fn get(page_title: &'static str, user: &User,
|
||||
danger_message: Option<String>, success_message: Option<String>) -> BaseSettingsPage {
|
||||
Self {
|
||||
danger_message: None,
|
||||
success_message: None,
|
||||
page_title: "Account details",
|
||||
danger_message,
|
||||
success_message,
|
||||
page_title,
|
||||
app_name: APP_NAME,
|
||||
is_admin: user.admin,
|
||||
user_name: user.username.to_string(),
|
||||
@ -44,19 +47,87 @@ struct AccountDetailsPage {
|
||||
email: String,
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "settings/change_password.html")]
|
||||
struct ChangePasswordPage {
|
||||
_parent: BaseSettingsPage,
|
||||
min_pwd_len: usize,
|
||||
}
|
||||
|
||||
/// Account details page
|
||||
pub async fn account_settings_details_route(id: Identity, user_actor: web::Data<Addr<UsersActor>>) -> impl Responder {
|
||||
let user: User = user_actor.send(
|
||||
pub async fn account_settings_details_route(id: Identity, users: web::Data<Addr<UsersActor>>) -> impl Responder {
|
||||
let user: User = users.send(
|
||||
users_actor::GetUserRequest(SessionIdentity(&id).user_id())
|
||||
).await.unwrap().0.unwrap();
|
||||
|
||||
HttpResponse::Ok()
|
||||
.body(AccountDetailsPage {
|
||||
_parent: BaseSettingsPage::get(&user).await,
|
||||
_parent: BaseSettingsPage::get("Account details", &user, None, None).await,
|
||||
user_id: user.uid,
|
||||
first_name: user.first_name,
|
||||
last_name: user.last_last,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
}.render().unwrap())
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
pub struct PassChangeRequest {
|
||||
pub old_pass: String,
|
||||
pub new_pass: String,
|
||||
}
|
||||
|
||||
/// Change password route
|
||||
pub async fn change_password_route(id: Identity,
|
||||
users: web::Data<Addr<UsersActor>>,
|
||||
req: Option<web::Form<PassChangeRequest>>,
|
||||
bruteforce: web::Data<Addr<BruteForceActor>>,
|
||||
remote_ip: RemoteIP) -> impl Responder {
|
||||
let mut danger = None;
|
||||
let mut success = None;
|
||||
|
||||
let user: User = users.send(
|
||||
users_actor::GetUserRequest(SessionIdentity(&id).user_id())
|
||||
).await.unwrap().0.unwrap();
|
||||
|
||||
let failed_attempts = bruteforce.send(bruteforce_actor::CountFailedAttempt { ip: remote_ip.into() }).await.unwrap();
|
||||
if failed_attempts > MAX_FAILED_LOGIN_ATTEMPTS {
|
||||
danger = Some("Too many invalid password attempts. Please try to change your password later.".to_string());
|
||||
} else if let Some(req) = req {
|
||||
|
||||
// Invalid password
|
||||
if !user.verify_password(&req.old_pass) {
|
||||
danger = Some("Old password is invalid!".to_string());
|
||||
bruteforce.send(bruteforce_actor::RecordFailedAttempt { ip: remote_ip.into() }).await.unwrap();
|
||||
}
|
||||
|
||||
// Password too short
|
||||
else if req.new_pass.len() < MIN_PASS_LEN {
|
||||
danger = Some("New password is too short!".to_string());
|
||||
}
|
||||
|
||||
// Change password
|
||||
else {
|
||||
let res = users.send(
|
||||
users_actor::ChangePasswordRequest {
|
||||
user_id: user.uid.clone(),
|
||||
new_password: req.new_pass.to_string(),
|
||||
temporary: false,
|
||||
}
|
||||
).await.unwrap().0;
|
||||
|
||||
if !res {
|
||||
danger = Some("An error occurred while trying to change your password!".to_string());
|
||||
} else {
|
||||
success = Some("Your password was successfully changed!".to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HttpResponse::Ok()
|
||||
.body(ChangePasswordPage {
|
||||
_parent: BaseSettingsPage::get("Change password", &user, danger, success).await,
|
||||
min_pwd_len: MIN_PASS_LEN,
|
||||
}.render().unwrap())
|
||||
}
|
@ -3,3 +3,4 @@ pub mod entity_manager;
|
||||
pub mod service;
|
||||
pub mod session_identity;
|
||||
pub mod user;
|
||||
pub mod remote_ip;
|
28
src/data/remote_ip.rs
Normal file
28
src/data/remote_ip.rs
Normal file
@ -0,0 +1,28 @@
|
||||
use std::net::IpAddr;
|
||||
|
||||
use actix_web::{Error, FromRequest, HttpRequest, web};
|
||||
use actix_web::dev::Payload;
|
||||
use futures_util::future::{Ready, ready};
|
||||
|
||||
use crate::data::app_config::AppConfig;
|
||||
use crate::utils::network_utils::get_remote_ip;
|
||||
|
||||
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
||||
pub struct RemoteIP(pub IpAddr);
|
||||
|
||||
impl Into<IpAddr> for RemoteIP {
|
||||
fn into(self) -> IpAddr {
|
||||
self.0
|
||||
}
|
||||
}
|
||||
|
||||
impl FromRequest for RemoteIP {
|
||||
type Error = Error;
|
||||
type Future = Ready<Result<RemoteIP, Error>>;
|
||||
|
||||
#[inline]
|
||||
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
|
||||
let config: &web::Data<AppConfig> = req.app_data().expect("AppData undefined!");
|
||||
ready(Ok(RemoteIP(get_remote_ip(req, config.proxy_ip.as_deref()))))
|
||||
}
|
||||
}
|
@ -21,6 +21,12 @@ pub struct User {
|
||||
pub authorized_services: Option<Vec<ServiceID>>,
|
||||
}
|
||||
|
||||
impl User {
|
||||
pub fn verify_password<P: AsRef<[u8]>>(&self, pass: P) -> bool {
|
||||
verify_password(pass, &self.password)
|
||||
}
|
||||
}
|
||||
|
||||
impl PartialEq for User {
|
||||
fn eq(&self, other: &Self) -> bool {
|
||||
self.uid.eq(&other.uid)
|
||||
@ -81,8 +87,8 @@ impl EntityManager<User> {
|
||||
|
||||
/// Update user information
|
||||
fn update_user<F>(&mut self, id: &UserID, update: F) -> bool
|
||||
where
|
||||
F: FnOnce(User) -> User,
|
||||
where
|
||||
F: FnOnce(User) -> User,
|
||||
{
|
||||
let user = match self.find_by_user_id(id) {
|
||||
None => return false,
|
||||
|
@ -106,6 +106,8 @@ async fn main() -> std::io::Result<()> {
|
||||
|
||||
// Settings routes
|
||||
.route("/settings", web::get().to(settings_controller::account_settings_details_route))
|
||||
.route("/settings/change_password", web::get().to(settings_controller::change_password_route))
|
||||
.route("/settings/change_password", web::post().to(settings_controller::change_password_route))
|
||||
})
|
||||
.bind(listen_address)?
|
||||
.run()
|
||||
|
Reference in New Issue
Block a user