Add base status bar

Build base web page
Serve static files
2025-01-22 21:09:45 +01:00 · 2025-01-22 20:56:35 +01:00 · 2025-01-22 20:35:52 +01:00
8 changed files with 12450 additions and 6 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -352,6 +352,50 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"

+[[package]]
+name = "askama"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28"
+dependencies = [
+ "askama_derive",
+ "askama_escape",
+ "humansize",
+ "num-traits",
+ "percent-encoding",
+]
+
+[[package]]
+name = "askama_derive"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83"
+dependencies = [
+ "askama_parser",
+ "basic-toml",
+ "mime",
+ "mime_guess",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn",
+]
+
+[[package]]
+name = "askama_escape"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
+
+[[package]]
+name = "askama_parser"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.85"
@@ -442,6 +486,15 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

+[[package]]
+name = "basic-toml"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "2.8.0"
@@ -1174,6 +1227,15 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"

+[[package]]
+name = "humansize"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -1471,6 +1533,12 @@ version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

+[[package]]
+name = "libm"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+
 [[package]]
 name = "light-openid"
 version = "1.0.2"
@@ -1537,12 +1605,15 @@ dependencies = [
 "actix-session",
 "actix-web",
 "anyhow",
+ "askama",
 "clap",
 "env_logger",
 "lazy_static",
 "light-openid",
 "log",
+ "mime_guess",
 "rand 0.9.0-beta.3",
+ "rust-embed",
 "rust-s3",
 "serde",
 "thiserror 2.0.11",
@@ -1577,6 +1648,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"

+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "minidom"
 version = "0.16.0"
@@ -1586,6 +1667,12 @@ dependencies = [
 "rxml",
 ]

+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.8.3"
@@ -1624,6 +1711,16 @@ dependencies = [
 "tempfile",
 ]

+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -2060,6 +2157,40 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

+[[package]]
+name = "rust-embed"
+version = "8.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
+dependencies = [
+ "rust-embed-impl",
+ "rust-embed-utils",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-impl"
+version = "8.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rust-embed-utils",
+ "syn",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-utils"
+version = "8.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
+dependencies = [
+ "sha2",
+ "walkdir",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.21.1"
@@ -2203,6 +2334,15 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"

+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.27"
@@ -2676,6 +2816,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.14"
@@ -2751,6 +2897,16 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -2869,6 +3025,15 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,4 +15,7 @@ actix-web = "4"
 actix-session = { version = "0.10.1", features = ["redis-session"] }
 light-openid = "1.0.2"
 thiserror = "2.0.11"
-rand = "0.9.0-beta.3"
+rand = "0.9.0-beta.3"
+rust-embed = "8.5.0"
+mime_guess = "2.0.5"
+askama = "0.12.1"
--- a/assets/bootstrap.css
+++ b/assets/bootstrap.css
--- a/assets/favicon.png
+++ b/assets/favicon.png
--- a/src/app_config.rs
+++ b/src/app_config.rs
@@ -155,3 +155,14 @@ pub struct OIDCProvider<'a> {
    pub configuration_url: &'a str,
    pub redirect_url: String,
 }
+
+#[cfg(test)]
+mod test {
+    use crate::app_config::AppConfig;
+
+    #[test]
+    fn verify_cli() {
+        use clap::CommandFactory;
+        AppConfig::command().debug_assert()
+    }
+}
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,4 @@
+use actix_session::config::SessionLifecycle;
 use actix_session::{storage::RedisSessionStore, SessionMiddleware};
 use actix_web::cookie::Key;
 use actix_web::{web, App, HttpServer};
@@ -23,11 +24,14 @@ async fn main() -> std::io::Result<()> {
    HttpServer::new(move || {
        App::new()
            // Add session management to your application using Redis for session state storage
-            .wrap(SessionMiddleware::new(
-                redis_store.clone(),
-                secret_key.clone(),
-            ))
+            .wrap(
+                SessionMiddleware::builder(redis_store.clone(), secret_key.clone())
+                    .cookie_name("matrixgw-session".to_string())
+                    .session_lifecycle(SessionLifecycle::BrowserSession(Default::default()))
+                    .build(),
+            )
            // Web configuration routes
+            .route("/assets/{tail:.*}", web::get().to(web_ui::static_file))
            .route("/", web::get().to(web_ui::home))
            .route("/oidc_cb", web::get().to(web_ui::oidc_cb))
            .route("/sign_out", web::get().to(web_ui::sign_out))
--- a/src/server/web_ui.rs
+++ b/src/server/web_ui.rs
@@ -5,8 +5,34 @@ use crate::user::{User, UserID};
 use crate::utils;
 use actix_session::Session;
 use actix_web::{web, HttpResponse};
+use askama::Template;
 use light_openid::primitives::OpenIDConfig;

+/// Static assets
+#[derive(rust_embed::Embed)]
+#[folder = "assets/"]
+struct Assets;
+
+/// Serve static file
+pub async fn static_file(path: web::Path<String>) -> HttpResult {
+    match Assets::get(path.as_ref()) {
+        Some(content) => Ok(HttpResponse::Ok()
+            .content_type(
+                mime_guess::from_path(path.as_str())
+                    .first_or_octet_stream()
+                    .as_ref(),
+            )
+            .body(content.data.into_owned())),
+        None => Ok(HttpResponse::NotFound().body("404 Not Found")),
+    }
+}
+
+#[derive(askama::Template)]
+#[template(path = "index.html")]
+struct HomeTemplate {
+    name: String,
+}
+
 /// Main route
 pub async fn home(session: Session) -> HttpResult {
    // Get user information, requesting authentication if information is missing
@@ -27,7 +53,9 @@ pub async fn home(session: Session) -> HttpResult {
            .finish());
    };

-    Ok(HttpResponse::Ok().body("You are authenticated!"))
+    Ok(HttpResponse::Ok()
+        .insert_header(("content-type", "text/html"))
+        .body(HomeTemplate { name: user.name }.render().unwrap()))
 }

 #[derive(serde::Deserialize)]
--- a/templates/index.html
+++ b/templates/index.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Matrix GW</title>
+    <link rel="icon" type="image/png" href="/assets/favicon.png"/>
+
+    <link rel="stylesheet" href="/assets/bootstrap.css"/>
+</head>
+<body>
+
+<!-- Header -->
+<header data-bs-theme="dark">
+    <div class="navbar navbar-dark bg-dark shadow-sm">
+        <div class="container">
+            <a href="#" class="navbar-brand d-flex align-items-center">
+                <svg xxmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" stroke="currentColor"
+                     stroke-linecap="round" stroke-linejoin="round" stroke-width="1" aria-hidden="true" class="me-2"
+                     viewBox="0 0 24 24">
+                    <path d="M10 11.5H17V13H10V11.5M10 8.5H19V10H10V8.5M20 5H9C7.9 5 7 5.9 7 7V21L11 17H20C21.1 17 22 16.1 22 15V7C22 5.9 21.1 5 20 5M20 15H10.2L9 16.2V7H20V15M3 7C2.4 7 2 7.4 2 8S2.4 9 3 9H5V7H3M2 11C1.4 11 1 11.4 1 12S1.4 13 2 13H5V11H2M1 15C.4 15 0 15.4 0 16C0 16.6 .4 17 1 17H5V15H1Z"/>
+                </svg>
+                <strong>Matrix GW</strong>
+            </a>
+            <div class="navbar">
+                <span>Hi <span style="font-style: italic;">{{ name }}</span>&nbsp;&nbsp;</span>
+                <a  href="/sign_out">Sign out</a>
+            </div>
+        </div>
+    </div>
+</header>
+
+
+</body>
+</html>
Author	SHA1	Message	Date
Pierre HUBERT	d133513daf	Add base status bar	2025-01-22 21:09:45 +01:00
Pierre HUBERT	3b208c0103	Build base web page	2025-01-22 20:56:35 +01:00
Pierre HUBERT	f31e0ebbcc	Serve static files	2025-01-22 20:35:52 +01:00