Add site permission clear confirmation
This commit is contained in:
@@ -25,6 +25,12 @@ impl ElyShell {
|
|||||||
.gap_5()
|
.gap_5()
|
||||||
.child(render_site_permissions_header(snapshot))
|
.child(render_site_permissions_header(snapshot))
|
||||||
.child(render_site_permissions_summary(snapshot))
|
.child(render_site_permissions_summary(snapshot))
|
||||||
|
.child(render_site_permissions_controls(
|
||||||
|
snapshot,
|
||||||
|
self.site_permissions_clear_confirmation.as_ref()
|
||||||
|
== Some(&snapshot.active_profile_id),
|
||||||
|
cx,
|
||||||
|
))
|
||||||
.child(render_site_permissions_list(snapshot, cx)),
|
.child(render_site_permissions_list(snapshot, cx)),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -102,6 +108,102 @@ fn site_permission_metric(label: &'static str, value: usize) -> AnyElement {
|
|||||||
.into_any_element()
|
.into_any_element()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn render_site_permissions_controls(
|
||||||
|
snapshot: &BrowserSnapshot,
|
||||||
|
confirming_clear: bool,
|
||||||
|
cx: &mut Context<ElyShell>,
|
||||||
|
) -> AnyElement {
|
||||||
|
if snapshot.site_permissions.is_empty() {
|
||||||
|
return div().into_any_element();
|
||||||
|
}
|
||||||
|
|
||||||
|
if confirming_clear {
|
||||||
|
return render_clear_confirmation(cx);
|
||||||
|
}
|
||||||
|
|
||||||
|
div()
|
||||||
|
.flex()
|
||||||
|
.items_center()
|
||||||
|
.justify_between()
|
||||||
|
.gap_4()
|
||||||
|
.child(
|
||||||
|
div()
|
||||||
|
.text_sm()
|
||||||
|
.text_color(rgb(colors::MUTED))
|
||||||
|
.child("Clear all configured permissions for this Profile."),
|
||||||
|
)
|
||||||
|
.child(
|
||||||
|
Button::new("request-clear-site-permissions")
|
||||||
|
.danger()
|
||||||
|
.xsmall()
|
||||||
|
.label("Clear Permissions")
|
||||||
|
.tooltip("Clear Profile Permissions")
|
||||||
|
.on_click(cx.listener(|shell, _, _, cx| {
|
||||||
|
shell.request_clear_site_permissions_confirmation(cx);
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.into_any_element()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn render_clear_confirmation(cx: &mut Context<ElyShell>) -> AnyElement {
|
||||||
|
div()
|
||||||
|
.rounded_md()
|
||||||
|
.border_1()
|
||||||
|
.border_color(rgb(colors::ERROR))
|
||||||
|
.bg(rgb(colors::CANVAS_SOFT))
|
||||||
|
.px_4()
|
||||||
|
.py_3()
|
||||||
|
.flex()
|
||||||
|
.items_center()
|
||||||
|
.justify_between()
|
||||||
|
.gap_4()
|
||||||
|
.child(
|
||||||
|
div()
|
||||||
|
.min_w_0()
|
||||||
|
.flex()
|
||||||
|
.flex_col()
|
||||||
|
.gap_1()
|
||||||
|
.child(
|
||||||
|
div()
|
||||||
|
.text_sm()
|
||||||
|
.font_semibold()
|
||||||
|
.text_color(rgb(colors::INK))
|
||||||
|
.child("Confirm permission clearing"),
|
||||||
|
)
|
||||||
|
.child(
|
||||||
|
div()
|
||||||
|
.text_xs()
|
||||||
|
.text_color(rgb(colors::MUTED))
|
||||||
|
.child("Each cleared permission records a local audit event."),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.child(
|
||||||
|
div()
|
||||||
|
.flex()
|
||||||
|
.items_center()
|
||||||
|
.gap_2()
|
||||||
|
.child(
|
||||||
|
Button::new("cancel-clear-site-permissions")
|
||||||
|
.ghost()
|
||||||
|
.xsmall()
|
||||||
|
.label("Cancel")
|
||||||
|
.on_click(cx.listener(|shell, _, _, cx| {
|
||||||
|
shell.cancel_clear_site_permissions_confirmation(cx);
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.child(
|
||||||
|
Button::new("confirm-clear-site-permissions")
|
||||||
|
.danger()
|
||||||
|
.xsmall()
|
||||||
|
.label("Clear")
|
||||||
|
.on_click(cx.listener(|shell, _, _, cx| {
|
||||||
|
shell.clear_active_profile_site_permissions(cx);
|
||||||
|
})),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.into_any_element()
|
||||||
|
}
|
||||||
|
|
||||||
fn render_site_permissions_list(
|
fn render_site_permissions_list(
|
||||||
snapshot: &BrowserSnapshot,
|
snapshot: &BrowserSnapshot,
|
||||||
cx: &mut Context<ElyShell>,
|
cx: &mut Context<ElyShell>,
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ pub struct ElyShell {
|
|||||||
download_action_error: Option<String>,
|
download_action_error: Option<String>,
|
||||||
download_clear_confirmation: bool,
|
download_clear_confirmation: bool,
|
||||||
download_security_confirmation: Option<PendingDownloadFileAction>,
|
download_security_confirmation: Option<PendingDownloadFileAction>,
|
||||||
|
site_permissions_clear_confirmation: Option<ProfileId>,
|
||||||
plugin_install_error: Option<String>,
|
plugin_install_error: Option<String>,
|
||||||
pending_plugin_install: Option<PendingPluginInstall>,
|
pending_plugin_install: Option<PendingPluginInstall>,
|
||||||
pending_plugin_uninstall: Option<PendingPluginUninstall>,
|
pending_plugin_uninstall: Option<PendingPluginUninstall>,
|
||||||
@@ -97,6 +98,7 @@ impl ElyShell {
|
|||||||
download_action_error: None,
|
download_action_error: None,
|
||||||
download_clear_confirmation: false,
|
download_clear_confirmation: false,
|
||||||
download_security_confirmation: None,
|
download_security_confirmation: None,
|
||||||
|
site_permissions_clear_confirmation: None,
|
||||||
plugin_install_error: None,
|
plugin_install_error: None,
|
||||||
pending_plugin_install: None,
|
pending_plugin_install: None,
|
||||||
pending_plugin_uninstall: None,
|
pending_plugin_uninstall: None,
|
||||||
|
|||||||
@@ -30,4 +30,30 @@ impl ElyShell {
|
|||||||
cx.notify();
|
cx.notify();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(super) fn request_clear_site_permissions_confirmation(&mut self, cx: &mut Context<Self>) {
|
||||||
|
if let ShellState::Ready(core) = &mut self.state
|
||||||
|
&& let Ok(snapshot) = core.snapshot()
|
||||||
|
{
|
||||||
|
self.site_permissions_clear_confirmation = Some(snapshot.active_profile_id);
|
||||||
|
cx.notify();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn cancel_clear_site_permissions_confirmation(&mut self, cx: &mut Context<Self>) {
|
||||||
|
self.site_permissions_clear_confirmation = None;
|
||||||
|
cx.notify();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn clear_active_profile_site_permissions(&mut self, cx: &mut Context<Self>) {
|
||||||
|
if let ShellState::Ready(core) = &mut self.state
|
||||||
|
&& let Ok(snapshot) = core.snapshot()
|
||||||
|
&& self.site_permissions_clear_confirmation.as_ref()
|
||||||
|
== Some(&snapshot.active_profile_id)
|
||||||
|
&& core.clear_active_profile_site_permissions().is_ok()
|
||||||
|
{
|
||||||
|
self.site_permissions_clear_confirmation = None;
|
||||||
|
cx.notify();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,11 @@ impl BrowserCore {
|
|||||||
self.revoke_site_permission_for_profile(&profile_id, origin, feature)
|
self.revoke_site_permission_for_profile(&profile_id, origin, feature)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn clear_active_profile_site_permissions(&mut self) -> Result<usize, CoreError> {
|
||||||
|
let profile_id = self.active_profile_id.clone();
|
||||||
|
self.clear_site_permissions_for_profile(&profile_id)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn active_tab_site_settings_url(&self) -> Result<Option<UrlText>, CoreError> {
|
pub fn active_tab_site_settings_url(&self) -> Result<Option<UrlText>, CoreError> {
|
||||||
let active_tab = self.active_tab()?;
|
let active_tab = self.active_tab()?;
|
||||||
let Some(origin) = SiteOrigin::from_url(active_tab.url())? else {
|
let Some(origin) = SiteOrigin::from_url(active_tab.url())? else {
|
||||||
@@ -106,6 +111,35 @@ impl BrowserCore {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn clear_site_permissions_for_profile(
|
||||||
|
&mut self,
|
||||||
|
profile_id: &ProfileId,
|
||||||
|
) -> Result<usize, CoreError> {
|
||||||
|
self.require_profile(profile_id)?;
|
||||||
|
let mut revoked_permissions = Vec::new();
|
||||||
|
|
||||||
|
self.site_permissions.retain(|entry| {
|
||||||
|
if entry.profile_id() == profile_id {
|
||||||
|
revoked_permissions.push((entry.origin().clone(), entry.feature()));
|
||||||
|
false
|
||||||
|
} else {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let revoked_count = revoked_permissions.len();
|
||||||
|
for (origin, feature) in revoked_permissions {
|
||||||
|
self.record_site_permission_audit_event(
|
||||||
|
profile_id.clone(),
|
||||||
|
origin,
|
||||||
|
feature,
|
||||||
|
SitePermissionAuditAction::Revoked,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(revoked_count)
|
||||||
|
}
|
||||||
|
|
||||||
fn require_profile(&self, profile_id: &ProfileId) -> Result<(), CoreError> {
|
fn require_profile(&self, profile_id: &ProfileId) -> Result<(), CoreError> {
|
||||||
if self.profiles.iter().any(|profile| profile.id() == profile_id) {
|
if self.profiles.iter().any(|profile| profile.id() == profile_id) {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
|
|||||||
@@ -90,6 +90,56 @@ fn revoke_site_permission_removes_entry_and_records_audit() -> Result<(), Box<dy
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn clear_site_permissions_removes_only_active_profile_entries() -> Result<(), Box<dyn Error>> {
|
||||||
|
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||||
|
let default_profile_id = core.snapshot()?.active_profile_id;
|
||||||
|
let personal_profile_id = core.create_profile("Personal", 0xf54e00, ProfileKind::Standard)?;
|
||||||
|
let default_origin = SiteOrigin::parse("https://example.com")?;
|
||||||
|
let personal_origin = SiteOrigin::parse("https://personal.example")?;
|
||||||
|
|
||||||
|
core.set_site_permission(
|
||||||
|
personal_origin,
|
||||||
|
SitePermissionFeature::Notifications,
|
||||||
|
SitePermissionDecision::DenyAlways,
|
||||||
|
)?;
|
||||||
|
core.select_profile(&default_profile_id)?;
|
||||||
|
core.set_site_permission(
|
||||||
|
default_origin,
|
||||||
|
SitePermissionFeature::Camera,
|
||||||
|
SitePermissionDecision::AllowAlways,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let removed_count = core.clear_active_profile_site_permissions()?;
|
||||||
|
let default_snapshot = core.snapshot()?;
|
||||||
|
assert_eq!(removed_count, 1);
|
||||||
|
assert!(default_snapshot.site_permissions.is_empty());
|
||||||
|
assert_eq!(default_snapshot.site_permission_audit_events.len(), 2);
|
||||||
|
assert_eq!(
|
||||||
|
default_snapshot.site_permission_audit_events[1].action(),
|
||||||
|
&SitePermissionAuditAction::Revoked,
|
||||||
|
);
|
||||||
|
|
||||||
|
core.select_profile(&personal_profile_id)?;
|
||||||
|
let personal_snapshot = core.snapshot()?;
|
||||||
|
assert_eq!(personal_snapshot.site_permissions.len(), 1);
|
||||||
|
assert_eq!(personal_snapshot.site_permission_audit_events.len(), 1);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn clear_site_permissions_without_entries_is_empty_change() -> Result<(), Box<dyn Error>> {
|
||||||
|
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||||
|
|
||||||
|
let removed_count = core.clear_active_profile_site_permissions()?;
|
||||||
|
let snapshot = core.snapshot()?;
|
||||||
|
|
||||||
|
assert_eq!(removed_count, 0);
|
||||||
|
assert!(snapshot.site_permissions.is_empty());
|
||||||
|
assert!(snapshot.site_permission_audit_events.is_empty());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn site_settings_command_opens_active_origin() -> Result<(), Box<dyn Error>> {
|
fn site_settings_command_opens_active_origin() -> Result<(), Box<dyn Error>> {
|
||||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||||
|
|||||||
Reference in New Issue
Block a user