LibreTunes/LibreTunes-DX
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: LibreTunes:c4cba925a71f864c8acd2edbcb02b0ca0cf60858
Branches Tags
LibreTunes:main
..
compare: LibreTunes:328b23f305357c310d9b8aa5dde533392bc3f951
Branches Tags
LibreTunes:main

1 Commits
c4cba925a7 ... 328b23f305

Author SHA1 Message Date
Ethan Girouard
328b23f305 Move router setup to build_router
Some checks failed
Push Workflows / rustfmt (push) Failing after 5s
Details
Push Workflows / tailwind-build (push) Successful in 5s
Details
Push Workflows / docs (push) Successful in 19s
Details
Push Workflows / clippy (push) Successful in 17s
Details
Push Workflows / test (push) Successful in 24s
Details
Push Workflows / build (push) Successful in 46s
Details
Push Workflows / nix-build (push) Successful in 5m11s
Details
2026-07-19 10:24:54 -04:00
3 changed files with 25 additions and 35 deletions
Expand all files Collapse all files

3
Dioxus.toml
View File

@@ -18,6 +18,3 @@ script = []
# Javascript code file # Javascript code file
# serve: [dev-server] only # serve: [dev-server] only
script = [] script = []
[web]
pre_compress = true

45
src/server/main.rs
View File

@@ -4,20 +4,16 @@ use dioxus::{
server::axum::Extension, server::axum::Extension,
}; };
use tokio::net::TcpListener; use tokio::net::TcpListener;
use tower_http::services::{ServeDir, ServeFile}; use tower_http::services::ServeFile;
use crate::App; use crate::App;
use crate::app::LOGO_ICO; use crate::app::LOGO_ICO;
use crate::server::{ use crate::server::{
auth::build_auth_layer, auth::build_auth_layer, config::Config, database::{self, DbPool}, key_val_store::{self, KeyValPool},
config::Config,
database::{self, DbPool},
key_val_store::{self, KeyValPool},
require_auth_mw::require_auth_middleware, require_auth_mw::require_auth_middleware,
}; };
use crate::util::error::{Contextualize, Error, ErrorType, Result}; use crate::util::error::{Contextualize, Error, ErrorType, Result};
// Build the `axum::Router` and attach config, database, and key/val store as extensions
pub fn build_router(config: Config, db_pool: DbPool, key_val_pool: KeyValPool) -> Router { pub fn build_router(config: Config, db_pool: DbPool, key_val_pool: KeyValPool) -> Router {
let favicon_path = { let favicon_path = {
// Resolve the favicon path // Resolve the favicon path
@@ -33,34 +29,13 @@ pub fn build_router(config: Config, db_pool: DbPool, key_val_pool: KeyValPool) -
let auth_layer = build_auth_layer(db_pool.clone(), key_val_pool, config.auth.cookies_secure); let auth_layer = build_auth_layer(db_pool.clone(), key_val_pool, config.auth.cookies_secure);
let public_path = config.server.public_path.clone(); Router::new()
.serve_dioxus_application(ServeConfig::new(), App)
let serve_assets = ServeDir::new(public_path.join("assets"));
let serve_index = ServeFile::new(public_path.join("index.html"));
let serve_favicon = ServeFile::new(favicon_path);
let router = Router::new()
.serve_api_application(ServeConfig::new(), App)
.layer(from_fn(require_auth_middleware)) .layer(from_fn(require_auth_middleware))
.layer(Extension(config)) .layer(Extension(config))
.layer(Extension(db_pool)) .layer(Extension(db_pool))
.layer(auth_layer); .layer(auth_layer)
.nest_service("/favicon.ico", ServeFile::new(favicon_path))
// In release mode, serve precompressed assets. In debug mode, serve WASM patch files.
if cfg!(debug_assertions) {
let serve_wasm = ServeDir::new(public_path.join("wasm"));
router
.nest_service("/wasm", serve_wasm)
.nest_service("/assets", serve_assets)
.nest_service("/index.html", serve_index)
.nest_service("/favicon.ico", serve_favicon)
} else {
router
.nest_service("/assets", serve_assets.precompressed_br())
.nest_service("/index.html", serve_index)
.nest_service("/favicon.ico", serve_favicon.precompressed_br())
}
} }
pub async fn main() -> Result<std::convert::Infallible> { pub async fn main() -> Result<std::convert::Infallible> {
@@ -76,6 +51,14 @@ pub async fn main() -> Result<std::convert::Infallible> {
tracing::debug!("Loaded configuration: {config:#?}"); tracing::debug!("Loaded configuration: {config:#?}");
config.log_warnings(); config.log_warnings();
// Dioxus doesn't expose a way to configure the public path other than this environment
// variable, and also doesn't provide a way to read what the public path is. As a workaround we
// expose a config option and set this variable that Dioxus expects.
// SAFETY: "This function is safe to call in a single-threaded program."
unsafe {
std::env::set_var("DIOXUS_PUBLIC_PATH", config.server.public_path.clone());
}
let db_pool = database::setup(config.database.connection_uri()) let db_pool = database::setup(config.database.connection_uri())
.await .await
.err_context("Failed database setup")?; .err_context("Failed database setup")?;

12
src/server/require_auth_mw.rs
View File

@@ -7,6 +7,12 @@ use dioxus::prelude::*;
use crate::server::auth::AuthSession; use crate::server::auth::AuthSession;
#[cfg(not(debug_assertions))]
const ALLOWED_PATH_PREFIX: [&str; 1] = ["/assets/"];
#[cfg(debug_assertions)]
const ALLOWED_PATH_PREFIX: [&str; 2] = ["/assets/", "/wasm/"];
const ALLOWED_PATHS: [&str; 6] = [ const ALLOWED_PATHS: [&str; 6] = [
"/login", "/login",
"/signup", "/signup",
@@ -23,7 +29,11 @@ pub async fn require_auth_middleware(
) -> Result<Response<Body>, (StatusCode, &'static str)> { ) -> Result<Response<Body>, (StatusCode, &'static str)> {
let path = req.uri().path(); let path = req.uri().path();
if ALLOWED_PATHS.contains(&path) { if ALLOWED_PATH_PREFIX
.iter()
.any(|prefix| path.starts_with(prefix))
|| ALLOWED_PATHS.contains(&path)
{
let response = next.run(req).await; let response = next.run(req).await;
return Ok(response); return Ok(response);
} }