mirror of
https://github.com/block/buzz.git
synced 2026-11-06 09:21:45 +00:00
The frozen base for the multi-tenant rewrite. Consolidated 0001 schema makes community_id a first-class, server-resolved key on every scoped row, mapped table-by-table to docs/multi-tenant-conformance.md. Schema highlights: - channels PK is (community_id, id): the same channel UUID may legitimately co-exist in two communities; child FKs (channel_members, workflows, thread_metadata) are composite (community_id, channel_id) so a child can never reference a cross-community channel — DB-enforced, not by handler discipline. channels.community_id is immutable (BEFORE UPDATE trigger). - communities.host uniqueness is UNIQUE(lower(host)); normalize_host applies the same rule on the resolution side, so case/dot/default-port variants can never split one tenant into two. - every scoped unique/PK leads with community_id; cross-community dedup of the same signed event is allowed, within-community dup rejected. - new tables: communities (host map), scheduled_workflow_fires (the cron at-most-once claim), audit_log (per-community chain), and an explicit _operator_global_tables registry the migration lint reads. buzz-core: - normalize_host(host): the one shared host-canonicalization rule. - TenantContext fence doc corrected to say plainly it is a lint-and-review fence, not a compiler fence (resolved()/from_uuid are pub) — honest about the guarantee the API actually gives. Schema proven against Postgres with an adversarial fence suite (re-tenant rejected, cross-community FKs rejected, same-UUID/same-event cross-community allowed, host-case collision rejected). buzz-core: 189 tests + 2 doctests green. Folds in review round 1 from Mari (channel global-uniqueness leak, host normalization, fence-claim honesty) and Sami (NIP-98 localhost normalization to be dropped in the auth lane). Co-authored-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@sprout-oss.stage.blox.sqprod.co> Signed-off-by: tlongwell-block <109685178+tlongwell-block@users.noreply.github.com>
200 lines
7.8 KiB
Rust
200 lines
7.8 KiB
Rust
//! Tenant identity: the server-resolved community key carried on every scoped path.
|
|
//!
|
|
//! These types live in `buzz-core` (zero I/O deps) so the DB, auth, pub/sub,
|
|
//! search, audit, media, and relay-wiring layers all name a community the same
|
|
//! way without depending on each other.
|
|
//!
|
|
//! ## The fence
|
|
//!
|
|
//! The whole multi-tenant safety story rests on one invariant from the formal
|
|
//! model (conformance "row zero"): a request's community is *resolved from the
|
|
//! connection host by the server*, never supplied or influenced by the client.
|
|
//!
|
|
//! [`TenantContext`] expresses that invariant in the type system as far as the
|
|
//! type system can carry it: there is no `Default`, no `Deserialize`, and no
|
|
//! way to *parse* a community from client input. A `CommunityId` only ever
|
|
//! comes from host resolution or from a DB row the server already scoped.
|
|
//!
|
|
//! This is a **lint-and-review fence, not a compiler fence.**
|
|
//! [`TenantContext::resolved`] and [`CommunityId::from_uuid`] are public so the
|
|
//! host-resolution path (in another crate) can call them — which means a
|
|
//! determined caller elsewhere *could* call them too. The migration-lint
|
|
//! harness forbids constructing a `TenantContext` outside host resolution and
|
|
//! tests; the type only removes the *accidental* path (deserializing a
|
|
//! client-chosen community), and review/lint closes the deliberate one. We say
|
|
//! this plainly rather than overclaim a guarantee the `pub` API doesn't give.
|
|
|
|
use std::fmt;
|
|
use uuid::Uuid;
|
|
|
|
/// A community: the first-class tenant key on every scoped row.
|
|
///
|
|
/// Opaque UUID newtype. Equality and ordering are the underlying UUID's.
|
|
/// There is deliberately no `community_id` parsed from client input anywhere;
|
|
/// a `CommunityId` only ever originates from host resolution or from a DB row
|
|
/// the server already scoped.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
|
|
pub struct CommunityId(Uuid);
|
|
|
|
impl CommunityId {
|
|
/// Wrap a UUID that the server has already established as a community id
|
|
/// (e.g. read back from the `communities` table during host resolution).
|
|
///
|
|
/// This is intentionally not a parse-from-client entry point: callers must
|
|
/// already hold a server-trusted UUID.
|
|
pub const fn from_uuid(id: Uuid) -> Self {
|
|
Self(id)
|
|
}
|
|
|
|
/// The underlying UUID, for DB binds and Redis key construction.
|
|
pub const fn as_uuid(&self) -> &Uuid {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for CommunityId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
fmt::Display::fmt(&self.0, f)
|
|
}
|
|
}
|
|
|
|
/// The resolved tenant of an in-flight request, bound once at connection /
|
|
/// request establishment before any handler observes tenant data.
|
|
///
|
|
/// Carried by reference (`&TenantContext`) through every scoped call. This is
|
|
/// the *only* way to name a community downstream, and it cannot be constructed
|
|
/// from client input — see the module-level "fence" note.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct TenantContext {
|
|
community: CommunityId,
|
|
host: String,
|
|
}
|
|
|
|
impl TenantContext {
|
|
/// Construct a context from a completed host resolution.
|
|
///
|
|
/// Call this *only* from the host-resolution path (the function that maps a
|
|
/// connection's host to a `communities` row). Everywhere else takes
|
|
/// `&TenantContext` and reads it; nothing else mints one.
|
|
pub fn resolved(community: CommunityId, host: impl Into<String>) -> Self {
|
|
Self {
|
|
community,
|
|
host: host.into(),
|
|
}
|
|
}
|
|
|
|
/// The community every scoped operation under this request must use.
|
|
pub const fn community(&self) -> CommunityId {
|
|
self.community
|
|
}
|
|
|
|
/// The host that resolved to this community.
|
|
///
|
|
/// Authoritative for the NIP-05 domain and audit labelling; never re-derive
|
|
/// the community from it downstream — the community is already fixed.
|
|
pub fn host(&self) -> &str {
|
|
&self.host
|
|
}
|
|
}
|
|
|
|
/// Normalize a connection `Host` into the canonical form used as the community
|
|
/// lookup key.
|
|
///
|
|
/// This is the *one* normalization rule shared by both sides of the fence:
|
|
/// the `communities.host` column is stored already-normalized, and host
|
|
/// resolution normalizes the incoming `Host` header with this same function
|
|
/// before looking it up. Because both sides agree by construction,
|
|
/// `Relay.Example`, `relay.example.`, and `relay.example:443` all resolve to
|
|
/// the one community — they can never split into distinct tenants.
|
|
///
|
|
/// Rules (host only — the caller has already split off any path/scheme):
|
|
/// - ASCII-lowercase (hosts are case-insensitive per RFC 3986);
|
|
/// - strip a single trailing dot (the FQDN root label);
|
|
/// - strip a default port suffix (`:80`, `:443`) — non-default ports are kept,
|
|
/// since a deployment may legitimately serve different communities on
|
|
/// different ports of the same name.
|
|
///
|
|
/// The input is trimmed of surrounding whitespace. An empty result (e.g. the
|
|
/// caller passed `""`) is returned as-is; resolution treats an empty or
|
|
/// unmapped host as a fail-closed rejection, never a default tenant.
|
|
#[must_use]
|
|
pub fn normalize_host(host: &str) -> String {
|
|
let host = host.trim();
|
|
let mut host = host.to_ascii_lowercase();
|
|
// Strip default ports. We only touch a `:port` suffix that is exactly a
|
|
// default port, so IPv6 literals like `[::1]` (which contain colons but no
|
|
// trailing `:80`/`:443`) are left intact.
|
|
if let Some(stripped) = host
|
|
.strip_suffix(":443")
|
|
.or_else(|| host.strip_suffix(":80"))
|
|
{
|
|
host = stripped.to_string();
|
|
}
|
|
// Strip a single trailing FQDN-root dot.
|
|
if let Some(stripped) = host.strip_suffix('.') {
|
|
host = stripped.to_string();
|
|
}
|
|
host
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn community_id_roundtrips_uuid() {
|
|
let u = Uuid::from_u128(0x1234_5678_9abc_def0_1122_3344_5566_7788);
|
|
let c = CommunityId::from_uuid(u);
|
|
assert_eq!(c.as_uuid(), &u);
|
|
assert_eq!(c.to_string(), u.to_string());
|
|
}
|
|
|
|
#[test]
|
|
fn tenant_context_exposes_resolution_inputs() {
|
|
let u = Uuid::from_u128(1);
|
|
let ctx = TenantContext::resolved(CommunityId::from_uuid(u), "relay.example");
|
|
assert_eq!(ctx.community().as_uuid(), &u);
|
|
assert_eq!(ctx.host(), "relay.example");
|
|
}
|
|
|
|
#[test]
|
|
fn normalize_host_collapses_tenant_split_variants() {
|
|
// All of these are the SAME tenant and must normalize identically —
|
|
// this is the property that stops accidental split-tenant.
|
|
let canonical = "relay.example";
|
|
for variant in [
|
|
"relay.example",
|
|
"Relay.Example",
|
|
"RELAY.EXAMPLE",
|
|
"relay.example.", // trailing FQDN root dot
|
|
"relay.example:443", // default https port
|
|
"relay.example:80", // default http port
|
|
"Relay.Example.:443",
|
|
" relay.example ", // surrounding whitespace
|
|
] {
|
|
assert_eq!(normalize_host(variant), canonical, "variant {variant:?}");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn normalize_host_keeps_nondefault_port() {
|
|
// A non-default port is a legitimate distinct selector — keep it.
|
|
assert_eq!(normalize_host("relay.example:8443"), "relay.example:8443");
|
|
assert_eq!(normalize_host("relay.example:3000"), "relay.example:3000");
|
|
}
|
|
|
|
#[test]
|
|
fn normalize_host_leaves_ipv6_literal_intact() {
|
|
// IPv6 literals contain colons but no trailing default-port suffix.
|
|
assert_eq!(normalize_host("[::1]"), "[::1]");
|
|
assert_eq!(normalize_host("[::1]:443"), "[::1]");
|
|
}
|
|
|
|
#[test]
|
|
fn normalize_host_empty_stays_empty() {
|
|
// Empty / whitespace-only resolves to empty; resolution fails closed.
|
|
assert_eq!(normalize_host(""), "");
|
|
assert_eq!(normalize_host(" "), "");
|
|
}
|
|
}
|