Delivery and DMARC troubleshooting (closes stalwartlabs/mail-server#420)

Author: mdecimus

src/components/icon.rs

@@ -783,3 +783,19 @@ pub fn IconHandRaised(
         </SvgWrapper>
     }
 }
+
+#[component]
+pub fn IconBeaker(
+    #[prop(optional)] size: Option<usize>,
+    #[prop(attrs)] attrs: Vec<(&'static str, Attribute)>,
+) -> impl IntoView {
+    view! {
+        <SvgWrapper size attrs>
+            <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                d="M9.75 3.104v5.714a2.25 2.25 0 0 1-.659 1.591L5 14.5M9.75 3.104c-.251.023-.501.05-.75.082m.75-.082a24.301 24.301 0 0 1 4.5 0m0 0v5.714c0 .597.237 1.17.659 1.591L19.8 15.3M14.25 3.104c.251.023.501.05.75.082M19.8 15.3l-1.57.393A9.065 9.065 0 0 1 12 15a9.065 9.065 0 0 0-6.23-.693L5 14.5m14.8.8 1.402 1.402c1.232 1.232.65 3.318-1.067 3.611A48.309 48.309 0 0 1 12 21c-2.773 0-5.491-.235-8.135-.687-1.718-.293-2.3-2.379-1.067-3.61L5 14.5"
+            ></path>
+        </SvgWrapper>
+    }
+}

src/core/mod.rs

@@ -106,6 +106,7 @@ pub enum Permission {
     TracingLive,
     MetricsList,
     MetricsLive,
+    Troubleshoot,
 
     // Account Management
     ManageEncryption,

src/main.rs

@@ -10,9 +10,9 @@ use std::{sync::Arc, time::Duration};
 
 use components::{
     icon::{
-        IconAdjustmentsHorizontal, IconChartBarSquare, IconClock, IconDocumentChartBar, IconKey,
-        IconLockClosed, IconQueueList, IconShieldCheck, IconSignal, IconSquare2x2, IconUserGroup,
-        IconWrench,
+        IconAdjustmentsHorizontal, IconBeaker, IconChartBarSquare, IconClock, IconDocumentChartBar,
+        IconKey, IconLockClosed, IconQueueList, IconShieldCheck, IconSignal, IconSquare2x2,
+        IconUserGroup, IconWrench,
     },
     layout::MenuItem,
 };
@@ -33,7 +33,10 @@ use pages::{
         tracing::{display::SpanDisplay, list::SpanList, live::LiveTracing},
         undelete::UndeleteList,
     },
-    manage::spam::{SpamTest, SpamTrain},
+    manage::{
+        spam::{SpamTest, SpamTrain},
+        troubleshoot::{TroubleshootDelivery, TroubleshootDmarc},
+    },
 };
 
 pub static VERSION_NAME: &str = concat!("Stalwart Management UI v", env!("CARGO_PKG_VERSION"),);
@@ -419,6 +422,28 @@ pub fn App() -> impl IntoView {
                         }
                     />
 
+                    <ProtectedRoute
+                        path="/troubleshoot/delivery"
+                        view=TroubleshootDelivery
+                        redirect_path="/login"
+                        condition=move || {
+                            permissions
+                                .get()
+                                .map_or(false, |p| { p.has_access(Permission::Troubleshoot) })
+                        }
+                    />
+
+                    <ProtectedRoute
+                        path="/troubleshoot/dmarc"
+                        view=TroubleshootDmarc
+                        redirect_path="/login"
+                        condition=move || {
+                            permissions
+                                .get()
+                                .map_or(false, |p| { p.has_access(Permission::Troubleshoot) })
+                        }
+                    />
+
                 </ProtectedRoute>
                 <ProtectedRoute
                     path="/settings"
@@ -653,6 +678,15 @@ impl LayoutBuilder {
             .route("/spam/test")
             .insert(true)
             .insert(permissions.has_access(Permission::SieveRun))
+            .create("Troubleshoot")
+            .icon(view! { <IconBeaker/> })
+            .create("E-mail Delivery")
+            .route("/troubleshoot/delivery")
+            .insert(true)
+            .create("DMARC")
+            .route("/troubleshoot/dmarc")
+            .insert(true)
+            .insert(permissions.has_access(Permission::Troubleshoot))
             .create("Settings")
             .icon(view! { <IconAdjustmentsHorizontal/> })
             .raw_route(DEFAULT_SETTINGS_URL)
@@ -717,6 +751,7 @@ pub fn build_schemas() -> Arc<Schemas> {
         .build_mfa()
         .build_app_passwords()
         .build_live_tracing()
+        .build_troubleshoot()
         .build()
         .into()
 }

src/pages/authorize.rs

@@ -49,19 +49,10 @@ pub fn Authorize() -> impl IntoView {
             let state = query.get().get("state").cloned();
 
             async move {
-
                 match &request {
-                    OAuthCodeRequest::Code {
-                        redirect_uri,
-                        ..
-                    } => {
-                        match oauth_user_authentication(
-                            BASE_URL,
-                            &username,
-                            &password,
-                            &request,
-                        )
-                        .await
+                    OAuthCodeRequest::Code { redirect_uri, .. } => {
+                        match oauth_user_authentication(BASE_URL, &username, &password, &request)
+                            .await
                         {
                             AuthenticationResult::Success(response) => {
                                 let url = if let Some(state) = state {
@@ -92,27 +83,26 @@ pub fn Authorize() -> impl IntoView {
                         }
                     }
                     OAuthCodeRequest::Device { .. } => {
-                        let message =
-                            match oauth_device_authentication(BASE_URL, &username, &password, &request)
-                                .await
-                            {
-                                AuthenticationResult::Success(true) => {
-                                    Alert::success("Device authenticated")
-                                        .with_details(
-                                            "You have successfully authenticated your device",
-                                        )
-                                        .without_timeout()
-                                }
-                                AuthenticationResult::Success(false) => Alert::warning(
-                                    "Device authentication failed",
-                                )
-                                .with_details("The code you entered is invalid or has expired"),
-                                AuthenticationResult::TotpRequired => {
-                                    show_totp.set(true);
-                                    return;
-                                }
-                                AuthenticationResult::Error(err) => err,
-                            };
+                        let message = match oauth_device_authentication(
+                            BASE_URL, &username, &password, &request,
+                        )
+                        .await
+                        {
+                            AuthenticationResult::Success(true) => {
+                                Alert::success("Device authenticated")
+                                    .with_details("You have successfully authenticated your device")
+                                    .without_timeout()
+                            }
+                            AuthenticationResult::Success(false) => {
+                                Alert::warning("Device authentication failed")
+                                    .with_details("The code you entered is invalid or has expired")
+                            }
+                            AuthenticationResult::TotpRequired => {
+                                show_totp.set(true);
+                                return;
+                            }
+                            AuthenticationResult::Error(err) => err,
+                        };
 
                         alert.set(message);
                     }

src/pages/directory/edit.rs

@@ -1118,7 +1118,10 @@ impl FormData {
                 principal.disabled_permissions.as_string_list(),
             ),
             ("urls", principal.urls.as_string_list()),
-            ("external-members", principal.external_members.as_string_list()),
+            (
+                "external-members",
+                principal.external_members.as_string_list(),
+            ),
         ] {
             self.array_set(key, list.iter());
         }
@@ -1181,7 +1184,7 @@ impl FormData {
                 ("enabled-permissions", &mut principal.enabled_permissions),
                 ("disabled-permissions", &mut principal.disabled_permissions),
                 ("urls", &mut principal.urls),
-                ("external-members", &mut principal.external_members)
+                ("external-members", &mut principal.external_members),
             ] {
                 *list = PrincipalValue::StringList(
                     self.array_value(key).map(|m| m.to_string()).collect(),

src/pages/directory/list.rs

@@ -674,7 +674,39 @@ fn PrincipalItem(principal: Principal, params: Parameters) -> impl IntoView {
                                 }
                             >
 
-                                DNS records
+                                View DNS records
+                            </a>
+                            <a
+                                class="flex items-center gap-x-3 py-2 px-3 rounded-lg text-sm text-gray-800 hover:bg-gray-100 focus:ring-2 focus:ring-blue-500 dark:text-neutral-400 dark:hover:bg-neutral-700 dark:hover:text-neutral-300"
+                                href=move || {
+                                    format!(
+                                        "/manage/troubleshoot/delivery?target={}",
+                                        principal.get_untracked().name().unwrap_or_default(),
+                                    )
+                                }
+
+                                class:hidden=move || {
+                                    !matches!(selected_type, PrincipalType::Domain)
+                                }
+                            >
+
+                                Test Email Delivery
+                            </a>
+                            <a
+                                class="flex items-center gap-x-3 py-2 px-3 rounded-lg text-sm text-gray-800 hover:bg-gray-100 focus:ring-2 focus:ring-blue-500 dark:text-neutral-400 dark:hover:bg-neutral-700 dark:hover:text-neutral-300"
+                                href=move || {
+                                    format!(
+                                        "/manage/troubleshoot/dmarc?target={}",
+                                        principal.get_untracked().name().unwrap_or_default(),
+                                    )
+                                }
+
+                                class:hidden=move || {
+                                    !matches!(selected_type, PrincipalType::Domain)
+                                }
+                            >
+
+                                Test DMARC
                             </a>
                             <a
                                 class="flex items-center gap-x-3 py-2 px-3 rounded-lg text-sm text-gray-800 hover:bg-gray-100 focus:ring-2 focus:ring-blue-500 dark:text-neutral-400 dark:hover:bg-neutral-700 dark:hover:text-neutral-300"

src/pages/directory/mod.rs

@@ -624,7 +624,7 @@ impl<'de> serde::Deserialize<'de> for StringOrU64 {
     {
         struct StringOrU64Visitor;
 
-        impl<'de> Visitor<'de> for StringOrU64Visitor {
+        impl Visitor<'_> for StringOrU64Visitor {
             type Value = StringOrU64;
 
             fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

src/pages/enterprise/dashboard.rs

@@ -175,10 +175,10 @@ pub fn Dashboard() -> impl IntoView {
     create_effect(move |_| match start_live_telemetry.get() {
         Some(Ok(auth_token)) => {
             let url_builer = UrlBuilder::new(format!(
-                "{}/api/telemetry/metrics/live/{}",
+                "{}/api/telemetry/metrics/live",
                 auth.get_untracked().base_url,
-                auth_token
             ))
+            .with_parameter("token", auth_token)
             .with_parameter("interval", "30")
             .with_parameter(
                 "metrics",

src/pages/enterprise/tracing/live.rs

@@ -71,8 +71,9 @@ pub fn LiveTracing() -> impl IntoView {
                 let auth = auth.get_untracked();
                 let filter = data.get().value::<String>("filter").unwrap_or_default();
                 let mut url_builer = UrlBuilder::new(
-                    format!("{}/api/telemetry/traces/live/{}", auth.base_url, auth_token),
-                );
+                        format!("{}/api/telemetry/traces/live", auth.base_url),
+                    )
+                    .with_parameter("token", auth_token);
                 if !filter.is_empty() {
                     for keyword in filter.split_ascii_whitespace() {
                         if let Some((key, value)) = keyword.split_once(':') {

src/pages/manage/mod.rs

@@ -7,3 +7,4 @@
 pub mod logs;
 pub mod maintenance;
 pub mod spam;
+pub mod troubleshoot;