Add logging and prettier error pages.

.gitignore

@@ -1 +1,2 @@
 /target
+.env

Cargo.lock

@@ -50,7 +50,7 @@ dependencies = [
  "mime_guess",
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -76,7 +76,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -208,6 +208,32 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "env_filter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d"
+dependencies = [
+ "env_filter",
+ "humantime",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -273,7 +299,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -347,9 +373,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "http"
@@ -403,6 +429,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "1.2.0"
@@ -440,10 +472,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "indexmap"
+name = "idna"
-version = "2.2.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -491,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "matchit"
@@ -540,9 +582,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",
@@ -636,7 +678,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -679,8 +721,11 @@ dependencies = [
  "askama",
  "askama_axum",
  "axum",
+ "dotenvy",
+ "env_logger",
  "justerror",
  "lazy_static",
+ "log",
  "rand",
  "serde",
  "thiserror",
@@ -689,6 +734,7 @@ dependencies = [
  "tower-http",
  "tower-sessions",
  "unicode-segmentation",
+ "ureq",
 ]
 
 [[package]]
@@ -780,7 +826,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -844,9 +890,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.50"
+version = "2.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -876,7 +922,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -910,6 +956,21 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
 [[package]]
 name = "tokio"
 version = "1.36.0"
@@ -935,7 +996,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1092,7 +1153,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.50",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1113,18 +1174,56 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
+[[package]]
+name = "ureq"
+version = "2.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35"
+dependencies = [
+ "base64",
+ "log",
+ "once_cell",
+ "url",
+]
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -1152,7 +1251,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.3",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -1172,17 +1271,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.3",
+ "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.3",
+ "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.3",
+ "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.3",
+ "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.3",
+ "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.3",
+ "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.3",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
 [[package]]
@@ -1193,9 +1292,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1205,9 +1304,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1217,9 +1316,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1229,9 +1328,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1241,9 +1340,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1253,9 +1352,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1265,6 +1364,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.3"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"

Cargo.toml

@@ -5,15 +5,19 @@ edition = "2021"
 
 [dependencies]
 askama = { version = "0.12", default-features = false, features = ["with-axum", "serde"] }
-askama_axum = { version = "0.4.0", default-features = false }
+askama_axum = { version = "0.4", default-features = false }
 axum = { version = "0.7", default-features = false, features = ["tokio", "http1", "form"] }
+dotenvy = { version = "0.15", default-features = false }
+env_logger = { version = "0.11", default-features = false, features = ["humantime"] }
 justerror = { version = "1" }
-lazy_static = "1.4.0"
+lazy_static = "1"
-rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
+log = { version = "0.4", default-features = false }
+rand = { version = "0.8", default-features = false, features = ["getrandom"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "1" }
-time = { version = "0.3.34", default-features = false }
+time = { version = "0.3", default-features = false }
 tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
-tower-http = { version = "0.5.2", default-features = false, features = ["fs"] }
+tower-http = { version = "0.5", default-features = false, features = ["fs"] }
 tower-sessions = { version = "0.10", default-features = false, features = ["axum-core", "memory-store"] }
 unicode-segmentation = { version = "1", default-features = false }
+ureq = { version = "2", default-features = false }

src/handlers.rs

@@ -23,27 +23,35 @@ lazy_static! {
 
 #[Error(desc = "Could not create user.")]
 #[non_exhaustive]
-pub struct CreateUserError(#[from] CreateUserErrorKind);
+pub struct CreateUserError(#[from] pub CreateUserErrorKind);
 
 impl IntoResponse for CreateUserError {
     fn into_response(self) -> Response {
-        (StatusCode::FORBIDDEN, format!("{:?}", self.0)).into_response()
+        let mut resp = SignupErrorPage(format!("{self}")).into_response();
+        *resp.status_mut() = StatusCode::FORBIDDEN;
+        resp
     }
 }
 
 #[Error]
 #[non_exhaustive]
 pub enum CreateUserErrorKind {
+    #[error(desc = "That username already exists")]
     AlreadyExists,
     #[error(desc = "Usernames must be between 1 and 50 characters long")]
     BadUsername,
+    #[error(desc = "Your passwords didn't match")]
     PasswordMismatch,
     #[error(desc = "Password must have at least 4 and at most 100 characters")]
     BadPassword,
     #[error(desc = "Display name must be less than 100 characters long")]
     BadDisplayname,
+    #[error(desc = "Your email is too short, it simply can't be real")]
     BadEmail,
+    #[error(desc = "We could not verify your payment")]
     BadPayment,
+    #[error(desc = "We couldn't retrieve your info from this browser session")]
+    NoFormFound,
 }
 
 #[derive(Debug, Default, Deserialize, PartialEq, Eq)]
@@ -76,28 +84,38 @@ pub async fn post_signup(
     ))
 }
 
+/*
+/// Handles the case when there was an error in the form
 pub async fn get_edit_signup(
     session: Session,
     receipt: Option<Path<String>>,
 ) -> Result<impl IntoResponse, CreateUserError> {
     Ok(())
 }
+*/
 
-pub async fn post_edit_signup(
+/// Redirected from Stripe with the receipt of payment.
-    session: Session,
-    Form(form): Form<SignupForm>,
-) -> Result<impl IntoResponse, CreateUserError> {
-    Ok(())
-}
-
-/// Called from Stripe with the receipt of payment.
 pub async fn payment_success(session: Session, receipt: Option<Path<String>>) -> impl IntoResponse {
     let user: User = session.get(&SIGNUP_KEY).await.unwrap().unwrap_or_default();
+
+    if receipt.is_none() {
+        log::info!("Got {:?} from the session, but no receipt.", &user);
+        return CreateUserError(CreateUserErrorKind::BadPayment).into_response();
+    }
+    let Path(receipt) = receipt.unwrap();
+
     if user == User::default() {
-        return SignupErrorPage("who you?".to_string()).into_response();
+        log::warn!("Could not find user in session; got receipt {}", receipt);
+        return CreateUserError(CreateUserErrorKind::NoFormFound).into_response();
     }
 
-    // TODO: check Stripe for the receipt, verify it's legit
+    // TODO: call the forgejo admin api to create the user
+
+    session.delete().await.unwrap_or_else(|e| {
+        log::error!("Got error deleting {} from session, got {}", &user, e);
+    });
+
+    log::info!("Added {:?}", &user);
     SignupSuccessPage(user).into_response()
 }
 

src/main.rs

@@ -1,6 +1,9 @@
-use std::net::SocketAddr;
+use std::{io::Write, net::SocketAddr};
 
-use axum::{routing::get, Router};
+use axum::{
+    routing::{get, MethodRouter},
+    Router,
+};
 use tower_http::services::ServeDir;
 use tower_sessions::{Expiry, MemoryStore, SessionManagerLayer};
 
@@ -20,6 +23,7 @@ use user::User;
 
 #[tokio::main]
 async fn main() {
+    init();
     // for javascript and css
     let assets_dir = std::env::current_dir().unwrap().join("assets");
     let assets_svc = ServeDir::new(assets_dir.as_path());
@@ -33,7 +37,8 @@ async fn main() {
     // the core application, defining the routes and handlers
     let app = Router::new()
         .nest_service("/assets", assets_svc)
-        .route("/signup", get(get_signup).post(post_signup))
+        .stripped_clone("/signup/", get(get_signup).post(post_signup))
+        .stripped_clone("/payment_success/", get(payment_success))
         .route("/payment_success/:receipt", get(payment_success))
         .layer(session_layer)
         .into_make_service();
@@ -43,3 +48,33 @@ async fn main() {
     let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
     axum::serve(listener, app).await.unwrap();
 }
+
+fn init() {
+    dotenvy::dotenv().expect("Could not read .env file.");
+    env_logger::builder()
+        .format(|buf, record| {
+            //
+            let ts = buf.timestamp();
+            writeln!(buf, "{}: {}", ts, record.args())
+        })
+        .init();
+}
+
+/// Adds both routes, with and without a trailing slash.
+trait RouterPathStrip<S>
+where
+    S: Clone + Send + Sync + 'static,
+{
+    fn stripped_clone(self, path: &str, method_router: MethodRouter<S>) -> Self;
+}
+
+impl<S> RouterPathStrip<S> for Router<S>
+where
+    S: Clone + Send + Sync + 'static,
+{
+    fn stripped_clone(self, path: &str, method_router: MethodRouter<S>) -> Self {
+        assert!(path.ends_with('/'));
+        self.route(path, method_router.clone())
+            .route(path.trim_end_matches('/'), method_router)
+    }
+}

src/user.rs

@@ -13,6 +13,9 @@ pub struct User {
 
 impl Debug for User {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if self == &User::default() {
+            write!(f, "Default User")
+        } else {
             let pw_check = if self.password == self.pw_verify {
                 "password matched"
             } else {
@@ -25,6 +28,7 @@ impl Debug for User {
                 .field("pw-check", &pw_check)
                 .finish()
         }
+    }
 }
 
 impl Display for User {