Compare commits
2 commits
bebad3be9b
...
19bad249d4
Author | SHA1 | Date | |
---|---|---|---|
19bad249d4 | |||
26b6601f5b |
5 changed files with 172 additions and 4 deletions
|
@ -5,10 +5,14 @@ edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
actix-web = "4.10"
|
actix-web = "4.10"
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
futures = "0.3"
|
||||||
|
regex = "1.11"
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
serde_json = "1.0"
|
||||||
sqlx = { version = "0.8", features = ["runtime-tokio", "tls-native-tls", "postgres"] }
|
sqlx = { version = "0.8", features = ["runtime-tokio", "tls-native-tls", "postgres"] }
|
||||||
toml = "0.8"
|
toml = "0.8"
|
||||||
url = { version = "2.5.4", features = ["serde"] }
|
url = { version = "2.5", features = ["serde"] }
|
||||||
|
uuid = { version = "1.16", features = ["v7"] }
|
||||||
|
|
||||||
[dependencies.tokio]
|
[dependencies.tokio]
|
||||||
version = "1.44"
|
version = "1.44"
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
use actix_web::{Scope, web};
|
use actix_web::{Scope, web};
|
||||||
|
|
||||||
mod stats;
|
mod stats;
|
||||||
|
mod register;
|
||||||
|
|
||||||
pub fn web() -> Scope {
|
pub fn web() -> Scope {
|
||||||
web::scope("/v1").service(stats::res)
|
web::scope("/v1")
|
||||||
|
.service(stats::res)
|
||||||
|
.service(register::res)
|
||||||
}
|
}
|
||||||
|
|
134
src/api/v1/register.rs
Normal file
134
src/api/v1/register.rs
Normal file
|
@ -0,0 +1,134 @@
|
||||||
|
use actix_web::{error, post, web, Error, HttpResponse};
|
||||||
|
use regex::Regex;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use futures::StreamExt;
|
||||||
|
use sqlx::Executor;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use crate::Data;
|
||||||
|
|
||||||
|
const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct AccountInformation {
|
||||||
|
identifier: String,
|
||||||
|
email: String,
|
||||||
|
password: String,
|
||||||
|
device_name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct ResponseError {
|
||||||
|
signups_enabled: bool,
|
||||||
|
gorb_id_valid: bool,
|
||||||
|
gorb_id_available: bool,
|
||||||
|
email_valid: bool,
|
||||||
|
email_available: bool,
|
||||||
|
password_minimum_length: bool,
|
||||||
|
password_special_characters: bool,
|
||||||
|
password_letters: bool,
|
||||||
|
password_numbers: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ResponseError {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
signups_enabled: true,
|
||||||
|
gorb_id_valid: true,
|
||||||
|
gorb_id_available: true,
|
||||||
|
email_valid: true,
|
||||||
|
email_available: true,
|
||||||
|
password_minimum_length: true,
|
||||||
|
password_special_characters: true,
|
||||||
|
password_letters: true,
|
||||||
|
password_numbers: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct Response {
|
||||||
|
access_token: String,
|
||||||
|
user_id: String,
|
||||||
|
expires_in: u64,
|
||||||
|
refresh_token: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
const MAX_SIZE: usize = 262_144;
|
||||||
|
|
||||||
|
#[post("/register")]
|
||||||
|
pub async fn res(mut payload: web::Payload, data: web::Data<Data>) -> Result<HttpResponse, Error> {
|
||||||
|
let mut body = web::BytesMut::new();
|
||||||
|
while let Some(chunk) = payload.next().await {
|
||||||
|
let chunk = chunk?;
|
||||||
|
// limit max size of in-memory payload
|
||||||
|
if (body.len() + chunk.len()) > MAX_SIZE {
|
||||||
|
return Err(error::ErrorBadRequest("overflow"));
|
||||||
|
}
|
||||||
|
body.extend_from_slice(&chunk);
|
||||||
|
}
|
||||||
|
|
||||||
|
let account_information = serde_json::from_slice::<AccountInformation>(&body)?;
|
||||||
|
|
||||||
|
let uuid = Uuid::now_v7();
|
||||||
|
|
||||||
|
let email_regex = Regex::new(r"[-A-Za-z0-9!#$%&'*+/=?^_`{|}~]+(?:\.[-A-Za-z0-9!#$%&'*+/=?^_`{|}~]+)*@(?:[A-Za-z0-9](?:[-A-Za-z0-9]*[A-Za-z0-9])?\.)+[A-Za-z0-9](?:[-A-Za-z0-9]*[A-Za-z0-9])?").unwrap();
|
||||||
|
|
||||||
|
if !email_regex.is_match(&account_information.email) {
|
||||||
|
return Ok(HttpResponse::Forbidden().json(
|
||||||
|
ResponseError {
|
||||||
|
email_valid: false,
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
let username_regex = Regex::new(r"[a-zA-Z0-9.-_]").unwrap();
|
||||||
|
|
||||||
|
if !username_regex.is_match(&account_information.identifier) || account_information.identifier.len() < 3 || account_information.identifier.len() > 32 {
|
||||||
|
return Ok(HttpResponse::Forbidden().json(
|
||||||
|
ResponseError {
|
||||||
|
gorb_id_valid: false,
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(match data.pool.execute(
|
||||||
|
&*format!(
|
||||||
|
"INSERT INTO users VALUES ( '{}', '{}', NULL, '{}', '{}', '0' )",
|
||||||
|
uuid,
|
||||||
|
account_information.identifier,
|
||||||
|
account_information.password,
|
||||||
|
account_information.email,
|
||||||
|
)
|
||||||
|
).await {
|
||||||
|
Ok(v) => {
|
||||||
|
HttpResponse::Ok().json(
|
||||||
|
Response {
|
||||||
|
access_token: "bogus".to_string(),
|
||||||
|
user_id: "bogus".to_string(),
|
||||||
|
expires_in: 1,
|
||||||
|
refresh_token: "bogus".to_string(),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Err(error) => {
|
||||||
|
let err_msg = error.as_database_error().unwrap().message();
|
||||||
|
|
||||||
|
match err_msg {
|
||||||
|
err_msg if err_msg.contains("unique") && err_msg.contains("username_key") => HttpResponse::Forbidden().json(ResponseError {
|
||||||
|
gorb_id_available: false,
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
err_msg if err_msg.contains("unique") && err_msg.contains("email_key") => HttpResponse::Forbidden().json(ResponseError {
|
||||||
|
email_available: false,
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
_ => HttpResponse::Forbidden().json(ResponseError {
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
use crate::Error;
|
use crate::Error;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
use sqlx::postgres::PgConnectOptions;
|
||||||
use tokio::fs::read_to_string;
|
use tokio::fs::read_to_string;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
|
@ -12,7 +13,7 @@ pub struct ConfigBuilder {
|
||||||
pub struct Database {
|
pub struct Database {
|
||||||
username: String,
|
username: String,
|
||||||
password: String,
|
password: String,
|
||||||
hostname: String,
|
host: String,
|
||||||
database: String,
|
database: String,
|
||||||
port: u16,
|
port: u16,
|
||||||
}
|
}
|
||||||
|
@ -67,3 +68,14 @@ pub struct Web {
|
||||||
pub port: u16,
|
pub port: u16,
|
||||||
pub ssl: bool,
|
pub ssl: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Database {
|
||||||
|
pub fn connect_options(&self) -> PgConnectOptions {
|
||||||
|
PgConnectOptions::new()
|
||||||
|
.database(&self.database)
|
||||||
|
.host(&self.host)
|
||||||
|
.username(&self.username)
|
||||||
|
.password(&self.password)
|
||||||
|
.port(self.port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
15
src/main.rs
15
src/main.rs
|
@ -1,4 +1,5 @@
|
||||||
use actix_web::{App, HttpServer, web};
|
use actix_web::{App, HttpServer, web};
|
||||||
|
use sqlx::{Executor, PgPool, Pool, Postgres};
|
||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
mod config;
|
mod config;
|
||||||
use config::{Config, ConfigBuilder};
|
use config::{Config, ConfigBuilder};
|
||||||
|
@ -8,6 +9,7 @@ type Error = Box<dyn std::error::Error>;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct Data {
|
struct Data {
|
||||||
|
pub pool: Pool<Postgres>,
|
||||||
pub config: Config,
|
pub config: Config,
|
||||||
pub start_time: SystemTime,
|
pub start_time: SystemTime,
|
||||||
}
|
}
|
||||||
|
@ -18,7 +20,20 @@ async fn main() -> Result<(), Error> {
|
||||||
|
|
||||||
let web = config.web.clone();
|
let web = config.web.clone();
|
||||||
|
|
||||||
|
let pool = PgPool::connect_with(config.database.connect_options()).await?;
|
||||||
|
|
||||||
|
pool.execute(r#"CREATE TABLE IF NOT EXISTS users (
|
||||||
|
uuid uuid UNIQUE NOT NULL,
|
||||||
|
username varchar(32) UNIQUE NOT NULL,
|
||||||
|
display_name varchar(64),
|
||||||
|
password varchar(512) NOT NULL,
|
||||||
|
email varchar(100) UNIQUE NOT NULL,
|
||||||
|
email_verified integer NOT NULL DEFAULT '0',
|
||||||
|
PRIMARY KEY (uuid)
|
||||||
|
)"#).await?;
|
||||||
|
|
||||||
let data = Data {
|
let data = Data {
|
||||||
|
pool,
|
||||||
config,
|
config,
|
||||||
start_time: SystemTime::now(),
|
start_time: SystemTime::now(),
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue