mirror of
https://git.ngram.ca/OpenJam/rc-servers
synced 2026-08-23 23:08:52 +00:00
Add user registration
This commit is contained in:
@@ -15,6 +15,7 @@ default = ["robocraft", "cardlife"]
|
||||
|
||||
[dependencies]
|
||||
rocket.workspace = true
|
||||
rocket_dyn_templates = { version = "0.2", features = [ "handlebars" ] }
|
||||
libfj.workspace = true
|
||||
log.workspace = true
|
||||
env_logger.workspace = true
|
||||
@@ -24,3 +25,4 @@ hex = "0.4"
|
||||
jsonwebtoken = "9"
|
||||
clap.workspace = true
|
||||
rc_core = { version = "*", optional = true, path = "../rc_core" }
|
||||
serde.workspace = true
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
[default]
|
||||
address = "127.0.0.1"
|
||||
port = 8001
|
||||
template_dir = "../assets/templates/"
|
||||
|
||||
## set only when compiled in debug mode, i.e, `cargo build`
|
||||
[debug]
|
||||
|
||||
@@ -2,6 +2,7 @@ mod debug;
|
||||
mod username;
|
||||
mod steam;
|
||||
mod email;
|
||||
mod registration;
|
||||
|
||||
pub fn stage() -> rocket::fairing::AdHoc {
|
||||
rocket::fairing::AdHoc::on_ignite("robocraft", |rocket| async {
|
||||
@@ -9,6 +10,7 @@ pub fn stage() -> rocket::fairing::AdHoc {
|
||||
.attach(email::stage())
|
||||
.attach(steam::stage())
|
||||
.attach(debug::stage())
|
||||
.attach(registration::stage())
|
||||
.register("/", rocket::catchers![unauthorized])
|
||||
})
|
||||
}
|
||||
|
||||
189
auth/src/robocraft/registration.rs
Normal file
189
auth/src/robocraft/registration.rs
Normal file
@@ -0,0 +1,189 @@
|
||||
use rc_core::UserAuthenticator;
|
||||
use rocket::{post, get, form::{Form, FromForm}, routes, http::Status, State};
|
||||
use rocket_dyn_templates::{Template, context};
|
||||
use serde::Serialize;
|
||||
|
||||
const FORM_NAME: &str = "rc_register";
|
||||
const FORM_NAME_SUCCESS: &str = "rc_register_success";
|
||||
|
||||
const VALID_CHARS: &[char] = &[
|
||||
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
||||
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
||||
'_',
|
||||
];
|
||||
|
||||
#[derive(FromForm, Serialize)]
|
||||
struct RegisterForm {
|
||||
display_name: String,
|
||||
password: String,
|
||||
password_c: String,
|
||||
email: Option<String>,
|
||||
steam_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct Context {
|
||||
form: RegisterForm,
|
||||
error: Option<String>,
|
||||
version: String,
|
||||
source_url: String,
|
||||
}
|
||||
|
||||
fn version_string() -> String {
|
||||
let name = env!("CARGO_PKG_NAME");
|
||||
let version = env!("CARGO_PKG_VERSION");
|
||||
//let license = env!("CARGO_PKG_LICENSE");
|
||||
//let repo = env!("CARGO_PKG_REPOSITORY");
|
||||
format!("OpenJam {} {}", name, version)
|
||||
}
|
||||
|
||||
fn all_valid_chars(s: &str) -> bool {
|
||||
for c in s.chars() {
|
||||
if !VALID_CHARS.contains(&c) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
fn registration_ok(form: RegisterForm) -> Template {
|
||||
Template::render(FORM_NAME, Context {
|
||||
form,
|
||||
error: None,
|
||||
version: version_string(),
|
||||
source_url: env!("CARGO_PKG_REPOSITORY").to_owned(),
|
||||
})
|
||||
}
|
||||
|
||||
fn registration_err(form: RegisterForm, error: String) -> Template {
|
||||
Template::render(FORM_NAME, Context {
|
||||
form,
|
||||
error: Some(error),
|
||||
version: version_string(),
|
||||
source_url: env!("CARGO_PKG_REPOSITORY").to_owned(),
|
||||
})
|
||||
}
|
||||
|
||||
#[post("/register", data = "<form>")]
|
||||
async fn form_submit(form: Form<RegisterForm>, config: &State<crate::common::cli::Config>) -> Result<Template, Status> {
|
||||
// password confirmation validation
|
||||
if form.password != form.password_c {
|
||||
return Ok(registration_err(form.into_inner(), "Passwords do not match".to_owned()));
|
||||
}
|
||||
if form.password.len() < 8 {
|
||||
return Ok(registration_err(form.into_inner(), "Password too short (minimum 8 characters)".to_owned()));
|
||||
}
|
||||
if form.password.len() > 128 {
|
||||
return Ok(registration_err(form.into_inner(), "Password too long (maximum 128 characters)".to_owned()));
|
||||
}
|
||||
|
||||
// email validation
|
||||
let actual_email: Option<String>;
|
||||
if let Some(email) = &form.email {
|
||||
if email.is_empty() {
|
||||
actual_email = None;
|
||||
} else {
|
||||
if !email.contains('@') {
|
||||
return Ok(registration_err(form.into_inner(), "Email must contain @".to_owned()));
|
||||
}
|
||||
let email_exists = config.robocraft.account_provider.user_exists(rc_core::persist::user::UserId::Email(email.to_owned()))
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to check if user email {} exists: {}", email, e);
|
||||
Status { code: 500 }
|
||||
})?;
|
||||
if email_exists {
|
||||
return Ok(registration_err(form.into_inner(), "Email already registered".to_owned()));
|
||||
}
|
||||
actual_email = Some(email.to_owned());
|
||||
}
|
||||
} else {
|
||||
actual_email = None;
|
||||
}
|
||||
|
||||
// steam id validation
|
||||
let actual_steam_id: Option<u64>;
|
||||
if let Some(steam_id) = &form.steam_id {
|
||||
if steam_id.is_empty() {
|
||||
actual_steam_id = None;
|
||||
} else {
|
||||
let steam_id = match steam_id.parse() {
|
||||
Ok(id) => id,
|
||||
Err(_e) => return Ok(registration_err(form.into_inner(), "Invalid SteamID (not an integer)".to_owned())),
|
||||
};
|
||||
if steam_id >= 7656120_0000000000 || steam_id < 7656119_0000000000 {
|
||||
return Ok(registration_err(form.into_inner(), "Invalid SteamID (should be like 7656119XXXXXXXXXX)".to_owned()));
|
||||
}
|
||||
let steam_exists = config.robocraft.account_provider.user_exists(rc_core::persist::user::UserId::SteamId(steam_id))
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to check if user steam id {} exists: {}", steam_id, e);
|
||||
Status { code: 500 }
|
||||
})?;
|
||||
if steam_exists {
|
||||
return Ok(registration_err(form.into_inner(), "SteamID already registered".to_owned()));
|
||||
}
|
||||
actual_steam_id = Some(steam_id);
|
||||
}
|
||||
} else {
|
||||
actual_steam_id = None;
|
||||
}
|
||||
|
||||
// username validation
|
||||
if form.display_name.len() < 4 {
|
||||
return Ok(registration_err(form.into_inner(), "Username too short (minimum 4 characters)".to_owned()));
|
||||
}
|
||||
if form.display_name.len() > 32 {
|
||||
return Ok(registration_err(form.into_inner(), "Username too long (maximum 32 characters)".to_owned()));
|
||||
}
|
||||
if !all_valid_chars(&form.display_name.to_lowercase()) {
|
||||
return Ok(registration_err(form.into_inner(), "Invalid username (only alphanumerics and _ allowed)".to_owned()));
|
||||
}
|
||||
let username_exists = config.robocraft.account_provider.user_exists(rc_core::persist::user::UserId::Username(form.display_name.to_owned()))
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to check if user name {} exists: {}", form.display_name, e);
|
||||
Status { code: 500 }
|
||||
})?;
|
||||
if username_exists {
|
||||
return Ok(registration_err(form.into_inner(), "Username already registered".to_owned()));
|
||||
}
|
||||
|
||||
let user_id = match config.robocraft.account_provider.register(rc_core::persist::user::RegistrationInfo {
|
||||
display_name: form.display_name.clone(),
|
||||
password: form.password.clone(),
|
||||
email: actual_email,
|
||||
steam_id: actual_steam_id,
|
||||
}).await {
|
||||
Ok(id) => id,
|
||||
Err(e) => {
|
||||
return Ok(registration_err(form.into_inner(), format!("Registration failed: {}", e)));
|
||||
}
|
||||
};
|
||||
|
||||
Ok(Template::render(FORM_NAME_SUCCESS, context! {
|
||||
display_name: form.display_name.clone(),
|
||||
id: user_id,
|
||||
version: version_string(),
|
||||
source_url: env!("CARGO_PKG_REPOSITORY").to_owned(),
|
||||
}))
|
||||
}
|
||||
|
||||
#[get("/register")]
|
||||
async fn form_load() -> Template {
|
||||
registration_ok(RegisterForm {
|
||||
display_name: "".to_owned(),
|
||||
password: "".to_owned(),
|
||||
password_c: "".to_owned(),
|
||||
email: None,
|
||||
steam_id: None,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
pub fn stage() -> rocket::fairing::AdHoc {
|
||||
rocket::fairing::AdHoc::on_ignite("Robocraft Steam", |rocket| async {
|
||||
rocket.mount("/", routes![form_load, form_submit])
|
||||
.attach(Template::fairing())
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user