2023-06-27 10:38:53 +00:00
|
|
|
use crate::{
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
schema::captcha_answer::dsl::{answer, captcha_answer},
|
2023-06-27 10:38:53 +00:00
|
|
|
source::captcha_answer::{CaptchaAnswer, CaptchaAnswerForm, CheckCaptchaAnswer},
|
|
|
|
utils::{functions::lower, get_conn, DbPool},
|
|
|
|
};
|
|
|
|
use diesel::{
|
|
|
|
delete,
|
|
|
|
dsl::exists,
|
|
|
|
insert_into,
|
|
|
|
result::Error,
|
|
|
|
select,
|
|
|
|
ExpressionMethods,
|
|
|
|
QueryDsl,
|
|
|
|
};
|
|
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
|
|
|
|
impl CaptchaAnswer {
|
2023-07-11 13:09:59 +00:00
|
|
|
pub async fn insert(pool: &mut DbPool<'_>, captcha: &CaptchaAnswerForm) -> Result<Self, Error> {
|
2023-06-27 10:38:53 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
|
|
|
|
insert_into(captcha_answer)
|
|
|
|
.values(captcha)
|
|
|
|
.get_result::<Self>(conn)
|
|
|
|
.await
|
|
|
|
}
|
|
|
|
|
2023-07-11 13:09:59 +00:00
|
|
|
pub async fn check_captcha(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
to_check: CheckCaptchaAnswer,
|
|
|
|
) -> Result<bool, Error> {
|
2023-06-27 10:38:53 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
|
|
|
|
// fetch requested captcha
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
let captcha_exists =
|
|
|
|
select(exists(captcha_answer.find(to_check.uuid).filter(
|
|
|
|
lower(answer).eq(to_check.answer.to_lowercase().clone()),
|
|
|
|
)))
|
|
|
|
.get_result::<bool>(conn)
|
|
|
|
.await?;
|
2023-06-27 10:38:53 +00:00
|
|
|
|
|
|
|
// delete checked captcha
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
delete(captcha_answer.find(to_check.uuid))
|
2023-06-27 10:38:53 +00:00
|
|
|
.execute(conn)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
Ok(captcha_exists)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2023-07-17 15:04:14 +00:00
|
|
|
#![allow(clippy::unwrap_used)]
|
|
|
|
#![allow(clippy::indexing_slicing)]
|
|
|
|
|
2023-06-27 10:38:53 +00:00
|
|
|
use crate::{
|
|
|
|
source::captcha_answer::{CaptchaAnswer, CaptchaAnswerForm, CheckCaptchaAnswer},
|
|
|
|
utils::build_db_pool_for_tests,
|
|
|
|
};
|
|
|
|
use serial_test::serial;
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
|
|
|
async fn test_captcha_happy_path() {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2023-06-27 10:38:53 +00:00
|
|
|
|
|
|
|
let inserted = CaptchaAnswer::insert(
|
|
|
|
pool,
|
|
|
|
&CaptchaAnswerForm {
|
|
|
|
answer: "XYZ".to_string(),
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await
|
|
|
|
.expect("should not fail to insert captcha");
|
|
|
|
|
|
|
|
let result = CaptchaAnswer::check_captcha(
|
|
|
|
pool,
|
|
|
|
CheckCaptchaAnswer {
|
|
|
|
uuid: inserted.uuid,
|
|
|
|
answer: "xyz".to_string(),
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await;
|
|
|
|
|
|
|
|
assert!(result.is_ok());
|
|
|
|
assert!(result.unwrap());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
|
|
|
async fn test_captcha_repeat_answer_fails() {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2023-06-27 10:38:53 +00:00
|
|
|
|
|
|
|
let inserted = CaptchaAnswer::insert(
|
|
|
|
pool,
|
|
|
|
&CaptchaAnswerForm {
|
|
|
|
answer: "XYZ".to_string(),
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await
|
|
|
|
.expect("should not fail to insert captcha");
|
|
|
|
|
|
|
|
let _result = CaptchaAnswer::check_captcha(
|
|
|
|
pool,
|
|
|
|
CheckCaptchaAnswer {
|
|
|
|
uuid: inserted.uuid,
|
|
|
|
answer: "xyz".to_string(),
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await;
|
|
|
|
|
|
|
|
let result_repeat = CaptchaAnswer::check_captcha(
|
|
|
|
pool,
|
|
|
|
CheckCaptchaAnswer {
|
|
|
|
uuid: inserted.uuid,
|
|
|
|
answer: "xyz".to_string(),
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await;
|
|
|
|
|
|
|
|
assert!(result_repeat.is_ok());
|
|
|
|
assert!(!result_repeat.unwrap());
|
|
|
|
}
|
|
|
|
}
|