Multi-tenancy: the inbuxa-features crate, the permission ceiling and tenant disk quota (MT-12, MT-13, MT-14, MT-15, MT-16, MT-19, MT-20)

New crate crates/features (inbuxa-features), AGPL-3.0-only, holding the
tenancy rules. Hooks in common: a tenant's roles and permission lists cap
its people's permissions; a change to a tenant, or to a role a tenant holds,
drops its members' cached permissions; delivery and every other write check
the tenant's maxDiskQuota; usedDiskQuota reads the tenant usage counter.
The default Tenant Administrator role gains sysTenantGet and sysTenantQuery.
This commit is contained in:
2026-09-18 15:19:58 -07:00
parent b6b345a129
commit ad0db8b2b0
18 changed files with 1398 additions and 5 deletions
+42 -2
View File
@@ -45,8 +45,7 @@ impl Server {
&self,
permissions: &structs::Permissions,
role_ids: &[Id],
// inbuxa: unused until multi-tenancy is rebuilt: the tenant permission ceiling (docs/spec/features/multi-tenancy.md MT-13)
_tenant_id: Option<u32>,
tenant_id: Option<u32>,
) -> trc::Result<PermissionsGroup> {
// Calculate effective permissions
let (mut permissions, roles) = match permissions {
@@ -65,10 +64,46 @@ impl Server {
.caused_by(trc::location!())?
}
// inbuxa: MT-13, MT-14, MT-15: cut down to what the tenant allows
if let Some(tenant_id) = tenant_id {
self.apply_tenant_ceiling(&mut permissions, tenant_id)
.await
.caused_by(trc::location!())?;
}
Ok(permissions)
}
/// inbuxa: MT-13. The tenant's roles give the base; its own permission
/// lists adjust it (`inbuxa_features::tenancy::ceiling`).
async fn apply_tenant_ceiling(
&self,
permissions: &mut PermissionsGroup,
tenant_id: u32,
) -> trc::Result<()> {
use inbuxa_features::tenancy::ceiling::{Policy, ceiling};
let tenant = self.tenant(tenant_id).await?;
let base = self
.add_role_permissions(PermissionsGroup::default(), tenant.id_roles.iter().copied())
.await?
.finalize();
let policy = match tenant.permissions.as_deref() {
None => Policy::Inherit,
Some(list) if list.merge => Policy::Merge {
enabled: &list.enabled,
disabled: &list.disabled,
},
Some(list) => Policy::Replace {
enabled: &list.enabled,
disabled: &list.disabled,
},
};
ceiling(base, policy).apply(&mut permissions.enabled, &mut permissions.disabled);
Ok(())
}
pub async fn can_set_permissions(
&self,
access_token: &AccessToken,
@@ -225,6 +260,11 @@ impl Default for DefaultPermissions {
default.superuser.push(permission);
default.tenant.push(permission);
}
// inbuxa: MT-12: a tenant administrator reads its own tenant
Permission::SysTenantGet | Permission::SysTenantQuery => {
default.superuser.push(permission);
default.tenant.push(permission);
}
permission => {
let name = permission.as_str();
if name.starts_with("jmap")