awiteb/salvo-captcha
0
Fork 0
Code Issues Pull requests Releases 1 Activity Actions

chore: Upgrade simple_login example to the new update

Browse source 
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
Awiteb 2024-08-12 20:14:44 +00:00
parent 472e712c9a
commit bc6c08b3ec
Signed by: awiteb
GPG key ID: 3F6B55640AA6682F
1 changed files with 19 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
examples/simple_login.rs
View file

@ -4,7 +4,7 @@
// //
// Run the example with `cargo run --example simple_login --features cacache-storage` // Run the example with `cargo run --example simple_login --features cacache-storage`
use std::{sync::Arc, time::Duration}; use std::sync::Arc;
use base64::{engine::GeneralPurpose, Engine}; use base64::{engine::GeneralPurpose, Engine};
use salvo::prelude::*; use salvo::prelude::*;
@ -16,18 +16,22 @@ const BASE_64_ENGINE: GeneralPurpose = GeneralPurpose::new(
base64::engine::general_purpose::PAD, base64::engine::general_purpose::PAD,
); );
const SIMPLE_GENERATOR: SimpleGenerator =
SimpleGenerator::new(CaptchaName::Normal, CaptchaDifficulty::Medium);
#[handler] #[handler]
async fn index(res: &mut Response, depot: &mut Depot) { async fn index(res: &mut Response, depot: &mut Depot) {
// Get the captcha from the depot // Get the captcha from the depot
let captcha_storage = depot.obtain::<Arc<CacacheStorage>>().unwrap(); let captcha_storage = depot.obtain::<Arc<MemoryStorage>>().unwrap();
// Create a new captcha // Create a new captcha
let (token, image) = captcha_storage let Ok((token, image)) = captcha_storage.new_captcha(SIMPLE_GENERATOR).await else {
.as_ref() res.status_code(StatusCode::INTERNAL_SERVER_ERROR);
.new_captcha(CaptchaName::Mila, CaptchaDifficulty::Medium) res.render(Text::Html(
.await "<html><body><h1>Server Error 500</h1></body></html>",
.expect("Failed to save captcha") ));
.expect("Failed to create captcha"); return;
};
// Convert the image to base64 // Convert the image to base64
let image = BASE_64_ENGINE.encode(image); let image = BASE_64_ENGINE.encode(image);
@ -64,36 +68,15 @@ async fn auth(req: &mut Request, res: &mut Response, depot: &mut Depot) {
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
let captcha_middleware = Captcha::new( let captcha_storage = Arc::new(MemoryStorage::new());
CacacheStorage::new("./captcha-cache"), let captcha_middleware =
CaptchaFormFinder::new(), CaptchaBuilder::new(Arc::clone(&captcha_storage), CaptchaFormFinder::new())
)
.skipper(|req: &mut Request, _: &Depot| {
// Skip the captcha if the request path is /skipped // Skip the captcha if the request path is /skipped
req.uri().path() == "/skipped" .skipper(|req: &mut Request, _: &Depot| req.uri().path() == "/skipped")
}); .build();
let captcha_storage = Arc::new(captcha_middleware.storage().clone());
// Set up a task to clean the expired captcha, just call the `clear_expired` function from the storage
let captcha_cleaner = tokio::spawn({
let cleanner_storage = captcha_storage.clone();
async move {
let captcha_expired_after = Duration::from_secs(60 * 5);
let clean_interval = Duration::from_secs(60);
// Just this loop, to clean the expired captcha every 60 seconds, each captcha will be expired after 5 minutes
loop {
cleanner_storage
.clear_expired(captcha_expired_after)
.await
.ok(); // You should log this error
tokio::time::sleep(clean_interval).await;
}
}
});
let router = Router::new() let router = Router::new()
.hoop(affix::inject(captcha_storage.clone())) .hoop(affix::inject(captcha_storage))
.push(Router::with_path("/").get(index)) .push(Router::with_path("/").get(index))
.push( .push(
Router::new() Router::new()
@ -103,9 +86,7 @@ async fn main() {
); );
let acceptor = TcpListener::new(("127.0.0.1", 5800)).bind().await; let acceptor = TcpListener::new(("127.0.0.1", 5800)).bind().await;
println!("Starting server on http://127.0.0.1:5800");
Server::new(acceptor).serve(router).await; Server::new(acceptor).serve(router).await;
captcha_cleaner.await.ok();
} }
fn index_page(captcha_image: String, captcha_token: String) -> String { fn index_page(captcha_image: String, captcha_token: String) -> String {