Add site permission clear confirmation
This commit is contained in:
@@ -29,6 +29,11 @@ impl BrowserCore {
|
||||
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> {
|
||||
let active_tab = self.active_tab()?;
|
||||
let Some(origin) = SiteOrigin::from_url(active_tab.url())? else {
|
||||
@@ -106,6 +111,35 @@ impl BrowserCore {
|
||||
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> {
|
||||
if self.profiles.iter().any(|profile| profile.id() == profile_id) {
|
||||
return Ok(());
|
||||
|
||||
@@ -90,6 +90,56 @@ fn revoke_site_permission_removes_entry_and_records_audit() -> Result<(), Box<dy
|
||||
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]
|
||||
fn site_settings_command_opens_active_origin() -> Result<(), Box<dyn Error>> {
|
||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||
|
||||
Reference in New Issue
Block a user