mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-09-27 05:50:03 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
146 lines
4.2 KiB
Rust
146 lines
4.2 KiB
Rust
use crate::{
|
|
newtypes::LocalUserId,
|
|
schema::password_reset_request::dsl::*,
|
|
source::password_reset_request::*,
|
|
traits::Crud,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
use sha2::{Digest, Sha256};
|
|
|
|
#[async_trait]
|
|
impl Crud for PasswordResetRequest {
|
|
type InsertForm = PasswordResetRequestForm;
|
|
type UpdateForm = PasswordResetRequestForm;
|
|
type IdType = i32;
|
|
async fn read(pool: &DbPool, password_reset_request_id: i32) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
password_reset_request
|
|
.find(password_reset_request_id)
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
async fn create(pool: &DbPool, form: &PasswordResetRequestForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(password_reset_request)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
async fn update(
|
|
pool: &DbPool,
|
|
password_reset_request_id: i32,
|
|
form: &PasswordResetRequestForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(password_reset_request.find(password_reset_request_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
impl PasswordResetRequest {
|
|
pub async fn create_token(
|
|
pool: &DbPool,
|
|
from_local_user_id: LocalUserId,
|
|
token: &str,
|
|
) -> Result<PasswordResetRequest, Error> {
|
|
let mut hasher = Sha256::new();
|
|
hasher.update(token);
|
|
let token_hash: String = bytes_to_hex(hasher.finalize().to_vec());
|
|
|
|
let form = PasswordResetRequestForm {
|
|
local_user_id: from_local_user_id,
|
|
token_encrypted: token_hash,
|
|
};
|
|
|
|
Self::create(pool, &form).await
|
|
}
|
|
pub async fn read_from_token(pool: &DbPool, token: &str) -> Result<PasswordResetRequest, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let mut hasher = Sha256::new();
|
|
hasher.update(token);
|
|
let token_hash: String = bytes_to_hex(hasher.finalize().to_vec());
|
|
password_reset_request
|
|
.filter(token_encrypted.eq(token_hash))
|
|
.filter(published.gt(now - 1.days()))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
fn bytes_to_hex(bytes: Vec<u8>) -> String {
|
|
let mut str = String::new();
|
|
for byte in bytes {
|
|
str = format!("{}{:02x}", str, byte);
|
|
}
|
|
str
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
source::{
|
|
instance::Instance,
|
|
local_user::{LocalUser, LocalUserInsertForm},
|
|
password_reset_request::PasswordResetRequest,
|
|
person::*,
|
|
},
|
|
traits::Crud,
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap();
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
.name("thommy prw".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
|
|
|
let new_local_user = LocalUserInsertForm::builder()
|
|
.person_id(inserted_person.id)
|
|
.password_encrypted("pass".to_string())
|
|
.build();
|
|
|
|
let inserted_local_user = LocalUser::create(pool, &new_local_user).await.unwrap();
|
|
|
|
let token = "nope";
|
|
let token_encrypted_ = "ca3704aa0b06f5954c79ee837faa152d84d6b2d42838f0637a15eda8337dbdce";
|
|
|
|
let inserted_password_reset_request =
|
|
PasswordResetRequest::create_token(pool, inserted_local_user.id, token)
|
|
.await
|
|
.unwrap();
|
|
|
|
let expected_password_reset_request = PasswordResetRequest {
|
|
id: inserted_password_reset_request.id,
|
|
local_user_id: inserted_local_user.id,
|
|
token_encrypted: token_encrypted_.to_string(),
|
|
published: inserted_password_reset_request.published,
|
|
};
|
|
|
|
let read_password_reset_request = PasswordResetRequest::read_from_token(pool, token)
|
|
.await
|
|
.unwrap();
|
|
let num_deleted = Person::delete(pool, inserted_person.id).await.unwrap();
|
|
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
|
|
|
assert_eq!(expected_password_reset_request, read_password_reset_request);
|
|
assert_eq!(
|
|
expected_password_reset_request,
|
|
inserted_password_reset_request
|
|
);
|
|
assert_eq!(1, num_deleted);
|
|
}
|
|
}
|