Revoke tenant users' system.* access explicitly, don't assume default-deny
Verified live against clickhouse/clickhouse-server:24.8: a freshly created tenant user was NOT default-denied from system.* the way the original design assumed -- system.tables listed every tenant's database/table names to any authenticated user regardless of grants. Fixed with an explicit REVOKE SELECT ON system.* FROM <user> after the existing GRANT SELECT, INSERT. Verifying this live also surfaced a real ClickHouse behavioral split the design didn't anticipate: system.query_log is genuinely access- checked (the REVOKE makes it hard-deny, ACCESS_DENIED), but system.tables is a filtered catalog view that ClickHouse 24.8 never denies outright -- it just returns zero rows for a properly-revoked user. Both outcomes close the actual leak. Corrected TestProvisionedUserCannotReadSystemTables to assert what each table actually does (hard error for query_log, verified-empty-and-no-foreign- database-names for tables) instead of demanding a hard error from both.
This commit is contained in:
@@ -82,14 +82,15 @@ func New(admin driver.Conn) *Provisioner {
|
||||
// check rbacstore for existing credentials before ever calling this,
|
||||
// not rely on this function to be safely re-callable.
|
||||
//
|
||||
// system.* access: intentionally not explicitly granted anywhere here,
|
||||
// relying on ClickHouse RBAC's default-deny for a freshly created user
|
||||
// once access_management is enabled on the admin connection (required
|
||||
// for CREATE USER/GRANT to work at all). This is exactly the assumption
|
||||
// /docs/phase-4-isolation-design.md's task 2 finding says must be
|
||||
// verified live per ClickHouse version, not trusted from documentation
|
||||
// -- see /docs/security/threat-model.md's "system.query_log metadata
|
||||
// leakage" section; that verification has not happened yet.
|
||||
// system.* access: explicitly revoked below, not left to ClickHouse
|
||||
// RBAC's default. Verified live against ClickHouse 24.8 (the version
|
||||
// docker-compose.yml pins): a freshly created user is NOT default-denied
|
||||
// from system.* the way this package originally assumed --
|
||||
// system.tables lists every tenant's database/table names to any
|
||||
// authenticated user regardless of per-database grants unless this
|
||||
// REVOKE runs. See /docs/phase-4-isolation-design.md's task 2 item 2 and
|
||||
// /docs/security/threat-model.md's "system.query_log metadata leakage"
|
||||
// section.
|
||||
func (p *Provisioner) ProvisionClickHouse(ctx context.Context, tenantID string) (Credentials, error) {
|
||||
if !tenantIdentifierPattern.MatchString(tenantID) {
|
||||
return Credentials{}, fmt.Errorf("tenantprovision: tenant id %q is not a safe ClickHouse identifier", tenantID)
|
||||
@@ -120,6 +121,18 @@ func (p *Provisioner) ProvisionClickHouse(ctx context.Context, tenantID string)
|
||||
return Credentials{}, fmt.Errorf("tenantprovision: granting select/insert: %w", err)
|
||||
}
|
||||
|
||||
// A freshly created ClickHouse 24.8 user is NOT default-denied from
|
||||
// system.* the way this package's original design assumed -- verified
|
||||
// live (TestProvisionedUserCannotReadSystemTables failed against a
|
||||
// real container before this REVOKE existed): system.tables lists
|
||||
// every tenant's database/table names regardless of grants unless
|
||||
// explicitly revoked. This closes /docs/phase-4-isolation-design.md's
|
||||
// task 2 item 2 and /docs/security/threat-model.md's "system.query_log
|
||||
// metadata leakage" finding for real, not just in the design doc.
|
||||
if err := p.admin.Exec(ctx, fmt.Sprintf("REVOKE SELECT ON system.* FROM `%s`", username)); err != nil {
|
||||
return Credentials{}, fmt.Errorf("tenantprovision: revoking system.* access: %w", err)
|
||||
}
|
||||
|
||||
return Credentials{Username: username, Password: password}, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user