Skip to content

feat: add email forwarding management UI #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
filippoadessi wants to merge 1 commit into from
Closed

feat: add email forwarding management UI #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ use pages::{
mfa::ManageMfa,
},
config::edit::DEFAULT_SETTINGS_URL,
directory::{dns::DnsDisplay, edit::PrincipalEdit, list::PrincipalList},
directory::{
dns::DnsDisplay,
edit::PrincipalEdit,
forward::{edit::ForwardEdit, list::ForwardList},
list::PrincipalList,
},
manage::{
spam::{SpamTest, SpamTrain},
troubleshoot::{TroubleshootDelivery, TroubleshootDmarc},
Expand Down Expand Up @@ -76,9 +81,6 @@ pub const STATE_STORAGE_KEY: &str = "webadmin_state";
pub const STATE_LOGIN_NAME_KEY: &str = "webadmin_login_name";

fn main() {
core::schema::print_schemas(&build_schemas());
return;

_ = console_log::init_with_level(log::Level::Debug);
console_error_panic_hook::set_once();
leptos::mount_to_body(|| view! { <App/> })
Expand Down Expand Up @@ -238,6 +240,28 @@ pub fn App() -> impl IntoView {
}
/>

<ProtectedRoute
path="/directory/forwards"
view=ForwardList
redirect_path="/login"
condition=move || {
permissions
.get()
.is_some_and(|p| p.has_access(Permission::SettingsList))
}
/>

<ProtectedRoute
path="/directory/forwards/:id/edit"
view=ForwardEdit
redirect_path="/login"
condition=move || {
permissions
.get()
.is_some_and(|p| p.has_access(Permission::SettingsUpdate))
}
/>

<ProtectedRoute
path="/dns/:id/view"
view=DnsDisplay
Expand Down Expand Up @@ -591,6 +615,9 @@ impl LayoutBuilder {
.create("Accounts")
.route("/directory/accounts")
.insert(permissions.has_access(Permission::IndividualList))
.create("Forwards")
.route("/directory/forwards")
.insert(permissions.has_access(Permission::SettingsList))
.create("Groups")
.route("/directory/groups")
.insert(permissions.has_access(Permission::GroupList))
Expand Down Expand Up @@ -621,6 +648,7 @@ impl LayoutBuilder {
Permission::MailingListList,
Permission::OauthClientList,
Permission::ApiKeyList,
Permission::SettingsList,
]))
.create("Queues")
.icon(view! { <IconQueueList/> })
Expand Down Expand Up @@ -708,6 +736,9 @@ impl LayoutBuilder {
.create("Accounts")
.route("/directory/accounts")
.insert(permissions.has_access(Permission::IndividualList))
.create("Forwards")
.route("/directory/forwards")
.insert(permissions.has_access(Permission::SettingsList))
.create("Groups")
.route("/directory/groups")
.insert(permissions.has_access(Permission::GroupList))
Expand Down Expand Up @@ -735,6 +766,7 @@ impl LayoutBuilder {
Permission::MailingListList,
Permission::OauthClientList,
Permission::ApiKeyList,
Permission::SettingsList,
]))
.create("Queues")
.icon(view! { <IconQueueList/> })
Expand Down
6 changes: 3 additions & 3 deletions src/pages/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ use crate::{
components::{
form::input::{Duration, Rate},
icon::{
IconCalendarDays, IconCircleStack, IconCodeBracket, IconHandRaised, IconInbox,
IconInboxArrowDown, IconInboxStack, IconKey, IconServer, IconServerStack,
IconShieldCheck, IconSignal,
IconArrowRightCircle, IconCalendarDays, IconCircleStack, IconCodeBracket,
IconHandRaised, IconInbox, IconInboxArrowDown, IconInboxStack, IconKey, IconServer,
IconServerStack, IconShieldCheck, IconSignal,
},
layout::{LayoutBuilder, MenuItem},
},
Expand Down
118 changes: 116 additions & 2 deletions src/pages/directory/edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,17 @@ use crate::{
},
};

use super::{build_app_password, parse_app_password, SpecialSecrets};
use crate::pages::config::UpdateSettings;

use super::{
build_app_password,
forward::{
forward_prefix, list::{parse_forward_settings, rebuild_sieve_for_domains, SettingsList},
AccountForwardSection, ForwardRule,
},
parse_app_password,
SpecialSecrets,
};

type PrincipalMap = AHashMap<PrincipalType, Vec<(String, String)>>;

Expand Down Expand Up @@ -95,6 +105,47 @@ pub fn PrincipalEdit() -> impl IntoView {
let data = expect_context::<Arc<Schemas>>()
.build_form("principals")
.into_signal();
let primary_email = Signal::derive(move || {
data.get().value::<String>("email").unwrap_or_default()
});

let forward_to: RwSignal<Vec<String>> = create_rw_signal(Vec::new());
let forward_keep_copy: RwSignal<bool> = create_rw_signal(false);

// Load forward rule whenever the account email changes
let load_forward = create_resource(
move || primary_email.get(),
move |addr| {
let auth = auth.get();
async move {
if addr.is_empty() || !addr.contains('@') {
return Ok(ForwardRule::default());
}
let raw = HttpRequest::get("/api/settings/list")
.with_parameter("prefix", format!("mail.forward.{addr}"))
.with_authorization(&auth)
.send::<SettingsList>()
.await?;
let mut rule = ForwardRule { from: addr, keep_copy: false, to: Vec::new() };
for (key, value) in &raw.items {
if key.starts_with("to.") {
rule.to.push(value.clone());
} else if key == "keep-copy" {
rule.keep_copy = value == "true";
}
}
rule.to.sort();
Ok::<ForwardRule, http::Error>(rule)
}
},
);
create_effect(move |_| {
if let Some(Ok(rule)) = load_forward.get() {
forward_to.set(rule.to);
forward_keep_copy.set(rule.keep_copy);
}
});

let fetch_principal = create_resource(
move || params.get().get("id").cloned().unwrap_or_default(),
move |name| {
Expand Down Expand Up @@ -247,6 +298,9 @@ pub fn PrincipalEdit() -> impl IntoView {
let changes = changes.clone();
let auth = auth.get();
let selected_type = selected_type.get();
let fwd_to = forward_to.get();
let fwd_keep = forward_keep_copy.get();
let fwd_email = primary_email.get();

async move {
set_pending.set(true);
Expand Down Expand Up @@ -297,9 +351,62 @@ pub fn PrincipalEdit() -> impl IntoView {

result
};
// Also save forwarding rule for Individual accounts
let fwd_result = if selected_type == PrincipalType::Individual
&& result.is_ok()
&& !fwd_email.is_empty()
&& fwd_email.contains('@')
{
use std::collections::HashSet;
let domain = fwd_email.splitn(2, '@').nth(1).unwrap_or("").to_string();
let affected = HashSet::from([domain]);
let mut updates: Vec<UpdateSettings> = vec![UpdateSettings::Clear {
prefix: format!("{}.", forward_prefix(&fwd_email)),
filter: None,
}];
let to_addrs: Vec<String> = fwd_to
.iter()
.map(|s| s.trim().to_lowercase())
.filter(|s| s.contains('@'))
.collect();
if !to_addrs.is_empty() {
let mut values: Vec<(String, String)> = to_addrs
.iter()
.enumerate()
.map(|(i, addr)| (format!("to.{i}"), addr.clone()))
.collect();
values.push(("keep-copy".to_string(), fwd_keep.to_string()));
updates.push(UpdateSettings::Insert {
prefix: Some(forward_prefix(&fwd_email)),
values,
assert_empty: false,
});
}
let fwd_save = HttpRequest::post("/api/settings")
.with_authorization(&auth)
.with_body(updates)
.unwrap()
.send::<Option<String>>()
.await;
if fwd_save.is_ok() {
if let Ok(all_raw) = HttpRequest::get("/api/settings/list")
.with_parameter("prefix", "mail.forward")
.with_authorization(&auth)
.send::<SettingsList>()
.await
{
let all_rules = parse_forward_settings(&all_raw.items);
let _ = rebuild_sieve_for_domains(&auth, &affected, &all_rules).await;
}
}
fwd_save.map(|_| ())
} else {
Ok(())
};

set_pending.set(false);

match result {
match result.and(fwd_result) {
Ok(_) => {
use_navigate()(
&format!("/manage/directory/{}", selected_type.resource_name()),
Expand Down Expand Up @@ -421,6 +528,8 @@ pub fn PrincipalEdit() -> impl IntoView {
| PrincipalType::ApiKey
)
.then_some("Permissions".to_string()),
matches!(typ, PrincipalType::Individual)
.then_some("Forwarding".to_string()),
]
})>

Expand Down Expand Up @@ -1064,6 +1173,11 @@ pub fn PrincipalEdit() -> impl IntoView {

</FormSection>

<AccountForwardSection
forward_to=forward_to
forward_keep_copy=forward_keep_copy
/>

</Tab>
}
.into_view(),
Expand Down
Loading