Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

feat(admin): brand admin titles and favicon, drop oauth tests

Hampus1e7a385e42a3
diff --git a/fluxer_admin/src/routes/auth.rs b/fluxer_admin/src/routes/auth.rs
index 361a571c0..ffd1d715d 100644
--- a/fluxer_admin/src/routes/auth.rs
+++ b/fluxer_admin/src/routes/auth.rs
@@ -265,7 +265,7 @@ fn oauth_start_page(
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Fluxer Admin</title>
+<title>Signing in</title>
</head>
<body>
<p>Starting authentication...</p>
@@ -296,7 +296,7 @@ fn oauth_callback_page(config: &AdminConfig, code: Option<&str>, state: Option<&
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Fluxer Admin</title>
+<title>Signing in</title>
</head>
<body>
<p>Completing authentication...</p>
@@ -483,68 +483,3 @@ fn now_seconds() -> u64 {
.expect("system clock before Unix epoch")
.as_secs()
}
-
-#[cfg(test)]
-mod tests {
- use super::*;
-
- const SECRET: &str = "test-admin-state-secret";
- const VERIFIER: &str = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
-
- #[test]
- fn generated_oauth_state_verifies() {
- let state = generate_oauth_state(SECRET, VERIFIER);
- assert!(verify_oauth_state(SECRET, &state, VERIFIER));
- }
-
- #[test]
- fn generated_oauth_state_fits_api_state_limit() {
- let state = generate_oauth_state(SECRET, VERIFIER);
- assert!(state.len() <= 256, "state length was {}", state.len());
- }
-
- #[test]
- fn oauth_state_rejects_tampering() {
- let mut state = generate_oauth_state(SECRET, VERIFIER);
- let last = state.pop().unwrap();
- state.push(if last == 'A' { 'B' } else { 'A' });
- assert!(!verify_oauth_state(SECRET, &state, VERIFIER));
- }
-
- #[test]
- fn oauth_state_rejects_wrong_secret() {
- let state = generate_oauth_state(SECRET, VERIFIER);
- assert!(!verify_oauth_state("different-secret", &state, VERIFIER));
- }
-
- #[test]
- fn oauth_state_rejects_wrong_verifier() {
- let state = generate_oauth_state(SECRET, VERIFIER);
- assert!(!verify_oauth_state(
- SECRET,
- &state,
- "fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210"
- ));
- }
-
- #[test]
- fn oauth_state_rejects_expired_payloads() {
- let issued_at = now_seconds().saturating_sub(OAUTH_STATE_MAX_AGE_SECONDS + 1);
- let state = sign_oauth_state(SECRET, issued_at, random_state_nonce(), VERIFIER);
- assert!(!verify_oauth_state(SECRET, &state, VERIFIER));
- }
-
- #[test]
- fn oauth_state_rejects_future_payloads() {
- let issued_at = now_seconds() + 1;
- let state = sign_oauth_state(SECRET, issued_at, random_state_nonce(), VERIFIER);
- assert!(!verify_oauth_state(SECRET, &state, VERIFIER));
- }
-
- #[test]
- fn json_string_is_safe_inside_script_tags() {
- let encoded = json_string("</script><script>alert(1)</script>");
- assert!(!encoded.contains("</script>"));
- assert!(encoded.contains("\\u003c/script\\u003e"));
- }
-}
diff --git a/fluxer_admin/src/templates/layout.rs b/fluxer_admin/src/templates/layout.rs
index 4f46fa096..a73306097 100644
--- a/fluxer_admin/src/templates/layout.rs
+++ b/fluxer_admin/src/templates/layout.rs
@@ -16,6 +16,8 @@ use super::layout_scripts::{
use super::layout_sidebar::render_sidebar;
const DEFAULT_PRODUCT_NAME: &str = "Fluxer";
+const LIGHT_SCHEME_MEDIA: &str = "(prefers-color-scheme: light)";
+const DARK_SCHEME_MEDIA: &str = "(prefers-color-scheme: dark)";
pub fn product_name(branding: Option<&PremiumBranding>) -> &str {
branding
@@ -23,16 +25,34 @@ pub fn product_name(branding: Option<&PremiumBranding>) -> &str {
.unwrap_or(DEFAULT_PRODUCT_NAME)
}
+pub fn admin_title(branding: Option<&PremiumBranding>) -> String {
+ format!("{} Admin", product_name(branding))
+}
+
pub fn favicon_links(config: &AdminConfig, branding: Option<&PremiumBranding>) -> Markup {
let cdn = &config.static_cdn_endpoint;
+ let favicon = branding.and_then(|branding| branding.favicon_url.as_deref());
+ let favicon_dark = branding.and_then(|branding| branding.favicon_dark_url.as_deref());
html! {
- @if let Some(favicon_url) = branding.and_then(|branding| branding.favicon_url.as_deref()) {
- link rel="icon" href=(favicon_url);
- } @else {
- link rel="icon" type="image/x-icon" href={(cdn) "/web/favicon.ico"};
- link rel="apple-touch-icon" href={(cdn) "/web/apple-touch-icon.png"};
- link rel="icon" type="image/png" sizes="32x32" href={(cdn) "/web/favicon-32x32.png"};
- link rel="icon" type="image/png" sizes="16x16" href={(cdn) "/web/favicon-16x16.png"};
+ @match (favicon, favicon_dark) {
+ (Some(favicon_url), None) => {
+ link rel="icon" href=(favicon_url);
+ }
+ (None, None) => {
+ link rel="icon" type="image/x-icon" href={(cdn) "/web/favicon.ico"};
+ link rel="apple-touch-icon" href={(cdn) "/web/apple-touch-icon.png"};
+ link rel="icon" type="image/png" sizes="32x32" href={(cdn) "/web/favicon-32x32.png"};
+ link rel="icon" type="image/png" sizes="16x16" href={(cdn) "/web/favicon-16x16.png"};
+ }
+ (favicon_url, Some(favicon_dark_url)) => {
+ @if let Some(favicon_url) = favicon_url {
+ link rel="icon" href=(favicon_url) media=(LIGHT_SCHEME_MEDIA);
+ } @else {
+ link rel="icon" type="image/png" sizes="32x32" href={(cdn) "/web/favicon-32x32.png"} media=(LIGHT_SCHEME_MEDIA);
+ link rel="apple-touch-icon" href={(cdn) "/web/apple-touch-icon.png"};
+ }
+ link rel="icon" href=(favicon_dark_url) media=(DARK_SCHEME_MEDIA);
+ }
}
}
}
@@ -95,7 +115,7 @@ pub fn admin_layout_ext(
@if options.auto_refresh {
meta http-equiv="refresh" content="3";
}
- title { (title) " ~ Fluxer Admin" }
+ title { (title) " ~ " (admin_title(auth.branding.as_ref())) }
link rel="stylesheet" href={(base) "/static/fonts/" (crate::fonts::STYLESHEET_FILE_NAME)};
link rel="stylesheet" href=(cache_busted_asset(base, asset_version, "/static/app.css"));
(favicon_links(config, auth.branding.as_ref()))
@@ -104,7 +124,7 @@ pub fn admin_layout_ext(
body class="min-h-screen overflow-hidden bg-neutral-50" hx-boost="true" {
a href="#main-content" class="skip-link" { "Skip to main content" }
div class="flex h-[100dvh]" {
- (render_sidebar(config, admin_acls, active_page, options.inspected_voice_region_id, auth.pending_registration_count))
+ (render_sidebar(config, &admin_title(auth.branding.as_ref()), admin_acls, active_page, options.inspected_voice_region_id, auth.pending_registration_count))
div data-sidebar-overlay="" class="pointer-events-none fixed inset-0 z-30 bg-black/50 opacity-0 transition-opacity duration-200 ease-in-out lg:hidden" aria-hidden="true" {}
div class="flex h-[100dvh] w-full flex-1 flex-col overflow-y-auto" {
(render_header(config, auth, csrf_token))
diff --git a/fluxer_admin/src/templates/layout_sidebar.rs b/fluxer_admin/src/templates/layout_sidebar.rs
index c01d27ff5..8e101a598 100644
--- a/fluxer_admin/src/templates/layout_sidebar.rs
+++ b/fluxer_admin/src/templates/layout_sidebar.rs
@@ -8,6 +8,7 @@ use super::layout_sidebar_nav::{NAV_SECTIONS, PENDING_REGISTRATIONS_KEY};
pub fn render_sidebar(
config: &AdminConfig,
+ heading: &str,
admin_acls: &[String],
active_page: &str,
inspected_voice_region_id: Option<&str>,
@@ -18,7 +19,7 @@ pub fn render_sidebar(
aside id="admin-sidebar" data-sidebar="" class="fixed inset-y-0 left-0 z-40 flex h-[100dvh] w-72 max-w-[85vw] -translate-x-full transform flex-col bg-neutral-900 text-white shadow-2xl transition-transform duration-200 ease-in-out lg:static lg:inset-auto lg:w-64 lg:max-w-none lg:translate-x-0 lg:shadow-none" role="navigation" aria-label="Admin navigation" tabindex="-1" {
div class="flex items-center justify-between gap-3 border-neutral-800 border-b px-5 py-4 lg:px-6 lg:py-6" {
a href={(base) "/users"} class="rounded focus:outline-none focus-visible:ring-2 focus-visible:ring-white/70 focus-visible:ring-offset-2 focus-visible:ring-offset-neutral-900" {
- h1 class="font-semibold text-base" { "Fluxer Admin" }
+ h1 class="font-semibold text-base" { (heading) }
}
button type="button" data-sidebar-close="" class="inline-flex h-11 w-11 items-center justify-center rounded-md text-neutral-200 transition-colors hover:bg-neutral-800 hover:text-white focus:outline-none focus-visible:ring-2 focus-visible:ring-white/70 lg:hidden" aria-label="Close sidebar" {
svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="h-5 w-5" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" {
@@ -30,6 +31,7 @@ pub fn render_sidebar(
nav data-sidebar-nav="" class="sidebar-scrollbar flex-1 space-y-4 overflow-y-auto p-4" aria-label="Admin sections" {
@for section in NAV_SECTIONS {
@let visible_items: Vec<_> = section.items.iter()
+ .filter(|item| !(item.hosted_only && config.self_hosted))
.filter(|item| acl::has_any_permission(admin_acls, item.required_acls))
.filter(|item| {
item.active_key != "voice-servers" || inspected_voice_region_id.is_some()
diff --git a/fluxer_admin/src/templates/pages/login.rs b/fluxer_admin/src/templates/pages/login.rs
index 6b470ce98..e12d91427 100644
--- a/fluxer_admin/src/templates/pages/login.rs
+++ b/fluxer_admin/src/templates/pages/login.rs
@@ -3,7 +3,7 @@
use crate::{
api::types::PremiumBranding,
config::AdminConfig,
- templates::layout::{favicon_links, product_name},
+ templates::layout::{admin_title, favicon_links, product_name},
};
use maud::{DOCTYPE, Markup, html};
@@ -19,7 +19,7 @@ pub fn login_page(
head {
meta charset="UTF-8";
meta name="viewport" content="width=device-width, initial-scale=1.0";
- title { "Login ~ Fluxer Admin" }
+ title { "Login ~ " (admin_title(branding)) }
link rel="stylesheet" href={(base) "/static/fonts/" (crate::fonts::STYLESHEET_FILE_NAME)};
link rel="stylesheet" href={(base) "/static/app.css"};
(favicon_links(config, branding))
@@ -31,7 +31,7 @@ pub fn login_page(
div class="flex flex-col gap-8 items-center" {
div class="flex flex-col gap-2 items-center" {
h1 class="text-gray-900 tracking-tight text-xl" {
- "Fluxer Admin"
+ (admin_title(branding))
}
}
@if let Some(error) = error_message {