From 263a5b76e138dfab3c003d8cdc29643b17947b77 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 6 Aug 2023 12:40:29 +0100 Subject: [PATCH] feat: switch over to having the user submit their wolves email --- Cargo.toml | 3 - src/bin/new_users.rs | 197 ------------------------------- src/methods/account_new.rs | 231 ++++++++++++++++++++++++++++++++++++- 3 files changed, 229 insertions(+), 202 deletions(-) delete mode 100644 src/bin/new_users.rs diff --git a/Cargo.toml b/Cargo.toml index 65b5ec3..e934ae3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,9 +10,6 @@ name = "update_data" [[bin]] name = "update_groups" -[[bin]] -name = "new_users" - [dependencies] # for the ldap ldap3="0.11.1" diff --git a/src/bin/new_users.rs b/src/bin/new_users.rs deleted file mode 100644 index 06105ed..0000000 --- a/src/bin/new_users.rs +++ /dev/null @@ -1,197 +0,0 @@ -use lettre::{ - message::{header, MultiPart, SinglePart}, - transport::smtp::{authentication::Credentials, response::Response}, - Message, SmtpTransport, Transport, -}; -use maud::html; -use skynet_ldap_backend::{db_init, get_config, get_now_iso, get_wolves, random_string, AccountWolves, Accounts, AccountsNew, Config}; -use sqlx::{Pool, Sqlite}; - -#[async_std::main] -async fn main() { - let config = get_config(); - let db = db_init(&config).await.unwrap(); - - for record in get_wolves(&db).await { - // skynet emails not permitted - if record.email.trim().ends_with("@skynet.ie") { - continue; - } - - // check if the email is already in the db - if !check(&db, &record.email).await { - continue; - } - - // generate a auth key - let auth = random_string(50); - - match send_mail(&config, &record, &auth) { - Ok(_) => match save_to_db(&db, &record, &auth).await { - Ok(_) => {} - Err(e) => { - println!("Unable to save to db {} {e:?}", &record.email); - } - }, - Err(e) => { - println!("Unable to send mail to {} {e:?}", &record.email); - } - } - } -} - -async fn check(db: &Pool, mail: &str) -> bool { - check_pending(db, mail).await && check_users(db, mail).await -} -async fn check_users(db: &Pool, mail: &str) -> bool { - sqlx::query_as::<_, Accounts>( - r#" - SELECT * - FROM accounts - WHERE mail == ? - "#, - ) - .bind(mail) - .fetch_all(db) - .await - .unwrap_or(vec![]) - .is_empty() -} -async fn check_pending(db: &Pool, mail: &str) -> bool { - sqlx::query_as::<_, AccountsNew>( - r#" - SELECT * - FROM accounts_new - WHERE mail == ? - "#, - ) - .bind(mail) - .fetch_all(db) - .await - .unwrap_or(vec![]) - .is_empty() -} - -// using https://github.com/lettre/lettre/blob/57886c367d69b4d66300b322c94bd910b1eca364/examples/maud_html.rs -fn send_mail(config: &Config, record: &AccountWolves, auth: &str) -> Result { - let recipient = &record.name_first; - let mail = &record.email; - let url_base = "https://sso.skynet.ie"; - let link_new = format!("{url_base}/register?auth={auth}"); - let link_mod = format!("{url_base}/modify"); - let discord = "https://discord.gg/mkuKJkCuyM"; - let sender = format!("UL Computer Society <{}>", &config.mail_user); - - // Create the html we want to send. - let html = html! { - head { - title { "Hello from Skynet!" } - style type="text/css" { - "h2, h4 { font-family: Arial, Helvetica, sans-serif; }" - } - } - div style="display: flex; flex-direction: column; align-items: center;" { - h2 { "Hello from Skynet!" } - // Substitute in the name of our recipient. - p { "Hi " (recipient) "," } - p { - "As part of the UL Computer Society you get an account on our Skynet cluster." - br; - "This gives you access to some of teh various services we offer:" - ul { - li { "Email" } - li { "Gitlab" } - li { "Linux Webhost" } - } - br; - "The following invite will remain active until the end of year." - } - p { - "If you are a new member please use the following link:" - br; - a href=(link_new) { (link_new) } - } - p { - "If you are a returning user please set an email for your account at:" - br; - a href=(link_mod) { (link_mod) } - } - p { - "If you have issues please refer to our Discord server:" - br; - a href=(discord) { (discord) } - } - - p { - "Skynet Team" - br; - "UL Computer Society" - } - } - }; - - let body_text = format!( - r#" - Hi {recipient} - - As part of the UL Computer Society you get an account on our Skynet cluster. - This gives you access to some of teh various services we offer: - * Email - * Gitlab - * Linux Webhost - The following invite will remain active until the end of year. - - If you are a new member please use the following link: - {link_new} - - If you are a returning user please set an email for your account at: - {link_mod} - - If you have issues please refer to our Discord server: - {discord} - - Skynet Team - UL Computer Society - "# - ); - - // Build the message. - let email = Message::builder() - .from(sender.parse().unwrap()) - .to(mail.parse().unwrap()) - .subject("Skynet: New Account.") - .multipart( - // This is composed of two parts. - // also helps not trip spam settings (uneven number of url's - MultiPart::alternative() - .singlepart(SinglePart::builder().header(header::ContentType::TEXT_PLAIN).body(body_text)) - .singlepart(SinglePart::builder().header(header::ContentType::TEXT_HTML).body(html.into_string())), - ) - .expect("failed to build email"); - - let creds = Credentials::new(config.mail_user.clone(), config.mail_pass.clone()); - - // Open a remote connection to gmail using STARTTLS - let mailer = SmtpTransport::starttls_relay(&config.mail_smtp).unwrap().credentials(creds).build(); - - // Send the email - mailer.send(&email) -} - -async fn save_to_db(db: &Pool, record: &AccountWolves, auth: &str) -> Result, sqlx::Error> { - sqlx::query_as::<_, AccountsNew>( - " - INSERT OR REPLACE INTO accounts_new (mail, auth_code, date_iso, date_expiry, name_first, name_surname, id_student) - VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7) - ", - ) - .bind(record.email.to_owned()) - .bind(auth.to_owned()) - .bind(get_now_iso(false)) - .bind(record.expiry.to_owned()) - .bind(record.name_first.to_owned()) - .bind(record.name_second.to_owned()) - .bind(record.id_student.to_owned()) - .fetch_optional(db) - .await -} diff --git a/src/methods/account_new.rs b/src/methods/account_new.rs index 85e26fd..df01978 100644 --- a/src/methods/account_new.rs +++ b/src/methods/account_new.rs @@ -1,5 +1,11 @@ -use crate::{get_now_iso, random_string, Accounts, AccountsNew, Config, State}; +use crate::{get_now_iso, random_string, AccountWolves, Accounts, AccountsNew, Config, State}; use ldap3::{exop::PasswordModify, LdapConn, Scope}; +use lettre::{ + message::{header, MultiPart, SinglePart}, + transport::smtp::authentication::Credentials, + Message, SmtpTransport, Transport, +}; +use maud::html; use sqlx::{Error, Pool, Sqlite}; use std::collections::HashSet; use tide::{ @@ -7,8 +13,229 @@ use tide::{ Request, }; +pub mod post { + use super::*; + + pub mod email { + use super::*; + + #[derive(Debug, Deserialize)] + struct SignupEmail { + email: String, + } + + pub async fn submit(mut req: Request) -> tide::Result { + let SignupEmail { + email, + } = req.body_json().await?; + + let config = &req.state().config; + let db = &req.state().db; + + for record in get_wolves_mail(db, &email).await { + // skynet emails not permitted + if record.email.trim().ends_with("@skynet.ie") { + continue; + } + + // check if the email is already in the db + if !check(db, &record.email).await { + continue; + } + + // generate a auth key + let auth = random_string(50); + + match send_mail(config, &record, &auth) { + Ok(_) => match save_to_db(db, &record, &auth).await { + Ok(_) => {} + Err(e) => { + println!("Unable to save to db {} {e:?}", &record.email); + } + }, + Err(e) => { + println!("Unable to send mail to {} {e:?}", &record.email); + } + } + } + + Ok(json!({"result": "success"}).into()) + } + + async fn get_wolves_mail(db: &Pool, mail: &str) -> Vec { + sqlx::query_as::<_, AccountWolves>( + r#" + SELECT * + FROM accounts_wolves + WHERE email = ? + "#, + ) + .bind(mail) + .fetch_all(db) + .await + .unwrap_or(vec![]) + } + + async fn check(db: &Pool, mail: &str) -> bool { + check_pending(db, mail).await && check_users(db, mail).await + } + async fn check_users(db: &Pool, mail: &str) -> bool { + sqlx::query_as::<_, Accounts>( + r#" + SELECT * + FROM accounts + WHERE mail == ? + "#, + ) + .bind(mail) + .fetch_all(db) + .await + .unwrap_or(vec![]) + .is_empty() + } + async fn check_pending(db: &Pool, mail: &str) -> bool { + sqlx::query_as::<_, AccountsNew>( + r#" + SELECT * + FROM accounts_new + WHERE mail == ? + "#, + ) + .bind(mail) + .fetch_all(db) + .await + .unwrap_or(vec![]) + .is_empty() + } + + // using https://github.com/lettre/lettre/blob/57886c367d69b4d66300b322c94bd910b1eca364/examples/maud_html.rs + fn send_mail(config: &Config, record: &AccountWolves, auth: &str) -> Result { + let recipient = &record.name_first; + let mail = &record.email; + let url_base = "https://sso.skynet.ie"; + let link_new = format!("{url_base}/register?auth={auth}"); + let link_mod = format!("{url_base}/modify"); + let discord = "https://discord.gg/mkuKJkCuyM"; + let sender = format!("UL Computer Society <{}>", &config.mail_user); + + // Create the html we want to send. + let html = html! { + head { + title { "Hello from Skynet!" } + style type="text/css" { + "h2, h4 { font-family: Arial, Helvetica, sans-serif; }" + } + } + div style="display: flex; flex-direction: column; align-items: center;" { + h2 { "Hello from Skynet!" } + // Substitute in the name of our recipient. + p { "Hi " (recipient) "," } + p { + "As part of the UL Computer Society you get an account on our Skynet cluster." + br; + "This gives you access to some of teh various services we offer:" + ul { + li { "Email" } + li { "Gitlab" } + li { "Linux Webhost" } + } + br; + "The following invite will remain active until the end of year." + } + p { + "If you are a new member please use the following link:" + br; + a href=(link_new) { (link_new) } + } + p { + "If you are a returning user please set an email for your account at:" + br; + a href=(link_mod) { (link_mod) } + } + p { + "If you have issues please refer to our Discord server:" + br; + a href=(discord) { (discord) } + } + + p { + "Skynet Team" + br; + "UL Computer Society" + } + } + }; + + let body_text = format!( + r#" + Hi {recipient} + + As part of the UL Computer Society you get an account on our Skynet cluster. + This gives you access to some of teh various services we offer: + * Email + * Gitlab + * Linux Webhost + The following invite will remain active until the end of year. + + If you are a new member please use the following link: + {link_new} + + If you are a returning user please set an email for your account at: + {link_mod} + + If you have issues please refer to our Discord server: + {discord} + + Skynet Team + UL Computer Society + "# + ); + + // Build the message. + let email = Message::builder() + .from(sender.parse().unwrap()) + .to(mail.parse().unwrap()) + .subject("Skynet: New Account.") + .multipart( + // This is composed of two parts. + // also helps not trip spam settings (uneven number of url's + MultiPart::alternative() + .singlepart(SinglePart::builder().header(header::ContentType::TEXT_PLAIN).body(body_text)) + .singlepart(SinglePart::builder().header(header::ContentType::TEXT_HTML).body(html.into_string())), + ) + .expect("failed to build email"); + + let creds = Credentials::new(config.mail_user.clone(), config.mail_pass.clone()); + + // Open a remote connection to gmail using STARTTLS + let mailer = SmtpTransport::starttls_relay(&config.mail_smtp).unwrap().credentials(creds).build(); + + // Send the email + mailer.send(&email) + } + + async fn save_to_db(db: &Pool, record: &AccountWolves, auth: &str) -> Result, sqlx::Error> { + sqlx::query_as::<_, AccountsNew>( + " + INSERT OR REPLACE INTO accounts_new (mail, auth_code, date_iso, date_expiry, name_first, name_surname, id_student) + VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7) + ", + ) + .bind(record.email.to_owned()) + .bind(auth.to_owned()) + .bind(get_now_iso(false)) + .bind(record.expiry.to_owned()) + .bind(record.name_first.to_owned()) + .bind(record.name_second.to_owned()) + .bind(record.id_student.to_owned()) + .fetch_optional(db) + .await + } + } +} + #[derive(Debug, Deserialize)] -pub struct LdapNewUser { +struct LdapNewUser { auth: String, user: String, pass: String,