finish: chapter 10

.env.example

@@ -4,6 +4,7 @@ RUST_LOG=info # https://docs.rs/env_logger/latest/env_logger/#enabling-logging
 SUBSCRIPTIONS__PORT=1337
 SUBSCRIPTIONS__HOST=0.0.0.0
 SUBSCRIPTIONS__BASE_URL=http://localhost:1337
+SUBSCRIPTIONS__HMAC_SECRET=secret
 
 # Subscriptions Database
 SUBSCRIPTIONS__DATABASE__BASE_URL=ws://database:4000

.env.test

@@ -4,6 +4,7 @@ RUST_LOG=debug # https://docs.rs/env_logger/latest/env_logger/#enabling-logging
 SUBSCRIPTIONS__PORT=1337 # not used by tests
 SUBSCRIPTIONS__HOST=0.0.0.0 # not used by tests
 SUBSCRIPTIONS__BASE_URL=http://localhost:1337 # not used by tests
+SUBSCRIPTIONS__HMAC_SECRET=secret
 
 # Subscriptions Database
 SUBSCRIPTIONS__DATABASE__BASE_URL=mem://

.github/workflows/cd.yml

@@ -84,6 +84,7 @@ jobs:
             SUBSCRIPTIONS__EMAIL_CLIENT__BASE_URL=${{ vars.SUBSCRIPTIONS__EMAIL_CLIENT__BASE_URL }}
             SUBSCRIPTIONS__EMAIL_CLIENT__AUTH_TOKEN=${{ secrets.SUBSCRIPTIONS__EMAIL_CLIENT__AUTH_TOKEN }}
             SUBSCRIPTIONS__EMAIL_CLIENT__TIMEOUT=${{ vars.SUBSCRIPTIONS__EMAIL_CLIENT__TIMEOUT }}
+            SUBSCRIPTIONS__HMAC_SECRET=${{ vars.SUBSCRIPTIONS__HMAC_SECRET }}
 
       - name: Deployment URL
         run: 'echo "${{ steps.deploy.outputs.url }}"'

Cargo.toml

@@ -38,6 +38,16 @@ validator = "0.20.0"
 serde_json = "1.0.143"
 rand = { version = "0.9.2", features = ["std_rng"] }
 include_dir = "0.7.4"
+base64 = "0.22.1"
+urlencoding = "2.1.3"
+htmlescape = "0.3.1"
+hmac = { version = "0.12.1", features = ["std"] }
+sha2 = "0.10.9"
+hex = "0.4.3"
+tower-cookies = "0.11.0"
+axum-messages = "0.8.0"
+tower-sessions = "0.14.0"
+tower-sessions-surrealdb-store = "0.7.0"
 
 [dev-dependencies]
 mime = "0.3.17"

src/config.rs

@@ -10,6 +10,7 @@ pub struct Config {
     pub port: u16,
     pub host: String,
     pub base_url: Url,
+    pub hmac_secret: SecretString,
     pub database: DatabaseConfig,
     pub email_client: EmailClientConfig,
 }

src/errors.rs

@@ -1,11 +1,15 @@
-use axum::{http::StatusCode, response::IntoResponse};
+use axum::{
+    body::Body,
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
 
 pub type Result<T = ()> = std::result::Result<T, Error>;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error(transparent)]
-    SurrealDb(Box<surrealdb::Error>),
+    SurrealDb(#[from] Box<surrealdb::Error>),
     #[error("{0:?}")]
     Migrations(String),
     #[error(transparent)]
@@ -20,6 +24,10 @@ pub enum Error {
     ValidationError(#[from] validator::ValidationError),
     #[error(transparent)]
     Reqwest(#[from] reqwest::Error),
+    #[error(transparent)]
+    Session(#[from] tower_sessions::session::Error),
+    #[error("{0:?}")]
+    Auth(String),
 
     #[error("{0:?}")]
     Custom(String),
@@ -32,12 +40,20 @@ impl From<surrealdb::Error> for Error {
 }
 
 impl IntoResponse for Error {
-    fn into_response(self) -> axum::response::Response {
+    fn into_response(self) -> Response {
         match self {
             Self::ValidationErrors(_) | Self::ValidationError(_) => {
-                tracing::info!("Bad request: - {self:?}");
+                tracing::warn!("Bad request: - {self:?}");
                 StatusCode::BAD_REQUEST.into_response()
             }
+            Self::Auth(_) => {
+                tracing::warn!("Unauthorized : - {self:?}");
+                Response::builder()
+                    .status(StatusCode::UNAUTHORIZED)
+                    .header("WWW-Authenticate", r#"Basic realm="publish""#)
+                    .body(Body::empty())
+                    .unwrap_or(StatusCode::INTERNAL_SERVER_ERROR.into_response())
+            }
             _ => {
                 tracing::error!("Internal Server: - {self:?}");
                 StatusCode::INTERNAL_SERVER_ERROR.into_response()

src/handlers/admin/mod.rs

@@ -0,0 +1,37 @@
+use crate::{Result, model::ModelManager, session_state::TypedSession};
+use axum::{
+    extract::State,
+    response::{Html, IntoResponse, Redirect},
+};
+use reqwest::StatusCode;
+use std::sync::Arc;
+
+pub async fn admin_dashboard(
+    State(mm): State<Arc<ModelManager>>,
+    session: TypedSession,
+) -> Result<impl IntoResponse> {
+    let username = match session.get_user_id().await {
+        Ok(Some(user_id)) => mm.get_username(user_id).await?,
+        reason => {
+            tracing::error!("Failed to authenticate: {reason:?}");
+            return Ok(Redirect::to("/login").into_response());
+        }
+    };
+
+    let body = format!(
+        r#"
+        <!DOCTYPE html>
+        <html>
+            <head>
+                <meta http-equiv="content-type" content="text/html; charset=utf-8">
+                <title>Admin dashboard</title>
+            </head>
+            <body>
+                <p>Welcome {username}</p>
+            </body>
+        </html>
+        "#
+    );
+
+    Ok((StatusCode::OK, Html(body)).into_response())
+}

src/handlers/home/home.html

@@ -0,0 +1,10 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <title>Home</title>
+    </head>
+    <body>
+        <p>Welcome to our newsletter!</p>
+    </body>
+</html>

src/handlers/home/mod.rs

@@ -0,0 +1,7 @@
+use crate::Result;
+use axum::response::{Html, IntoResponse};
+use reqwest::StatusCode;
+
+pub async fn home() -> Result<impl IntoResponse> {
+    Ok((StatusCode::OK, Html(include_str!("home.html"))))
+}

src/handlers/login/get.rs

@@ -0,0 +1,49 @@
+use crate::Result;
+use axum::response::{Html, IntoResponse};
+use axum_messages::Messages;
+use reqwest::StatusCode;
+
+pub async fn login(
+    messages: Messages,
+    // Query(query): Option<Query<QueryParams>>,
+) -> Result<impl IntoResponse> {
+    let error_message = messages
+        .into_iter()
+        .map(|message| format!("<p><i>{}</i></p>", message.message))
+        .collect::<Vec<_>>()
+        .join("");
+
+    let body = format!(
+        r#"
+        <!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta http-equiv="content-type" content="text/html; charset=utf-8">
+            <title>Login</title>
+        </head>
+        <body>
+            {error_message}
+            <form action="/login" method="post">
+                <label>Username
+                    <input
+                        type="text"
+                        placeholder="Enter Username"
+                        name="username"
+                    >
+                </label>
+                <label>Password
+                    <input
+                        type="password"
+                        placeholder="Enter Password"
+                        name="password"
+                    >
+                </label>
+                <button type="submit">Login</button>
+            </form>
+        </body>
+        </html>
+        "#
+    );
+
+    Ok((StatusCode::OK, Html(body)))
+}