1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
//! Diff `ALTER DEFAULT PRIVILEGES` rules.
//!
//! Rules are paired by `(target_role, schema, object_type)`. Within each pair
//! the grant list is diffed with the standard lenient policy from
//! [`super::grants::diff_grants`].
//!
//! ## Managed-roles extension for owned rules
//!
//! When the source catalog explicitly declares a rule (same key present in
//! `source`), we treat every grantee that appears in the target's grant list
//! for that rule as "managed" — even if that role does not appear elsewhere in
//! the source catalog. Rationale: pgevolve previously applied the GRANTs via
//! that same rule, so the grantees are our responsibility to revoke when the
//! desired grant list shrinks. The lenient unmanaged-drift policy is reserved
//! for rules that exist **only** in the live database and have no corresponding
//! source declaration.
use std::collections::{BTreeMap, BTreeSet};
use crate::identifier::Identifier;
use crate::ir::default_privileges::{DefaultPrivObjectType, DefaultPrivilegeRule};
use crate::ir::grant::{Grant, GrantTarget};
/// One ADD or REVOKE step for a default-privilege rule.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct DefaultPrivilegeChange {
/// `FOR ROLE x` — the grantor role this rule targets.
pub target_role: Identifier,
/// `IN SCHEMA y` — schema scope. `None` = global scope.
pub schema: Option<Identifier>,
/// Object-type discriminant.
pub object_type: DefaultPrivObjectType,
/// `true` = GRANT, `false` = REVOKE.
pub is_grant: bool,
/// The specific grant being added or revoked.
pub grant: Grant,
}
type RuleKey = (Identifier, Option<Identifier>, DefaultPrivObjectType);
/// Compute `ALTER DEFAULT PRIVILEGES` changes needed to converge `target`
/// (live database) toward `source` (desired state).
///
/// `managed_roles` is passed to the inner [`super::grants::diff_grants`] call
/// so that the lenient policy applies: unmanaged grantees in the live catalog
/// never produce REVOKE steps.
#[must_use]
pub fn diff_default_privileges(
target: &[DefaultPrivilegeRule],
source: &[DefaultPrivilegeRule],
managed_roles: &BTreeSet<Identifier>,
) -> Vec<DefaultPrivilegeChange> {
let key = |r: &DefaultPrivilegeRule| -> RuleKey {
(r.target_role.clone(), r.schema.clone(), r.object_type)
};
let target_map: BTreeMap<RuleKey, &DefaultPrivilegeRule> =
target.iter().map(|r| (key(r), r)).collect();
let source_map: BTreeMap<RuleKey, &DefaultPrivilegeRule> =
source.iter().map(|r| (key(r), r)).collect();
let mut all_keys: BTreeSet<RuleKey> = target_map.keys().cloned().collect();
all_keys.extend(source_map.keys().cloned());
let mut out = Vec::new();
for k in all_keys {
let target_grants = target_map
.get(&k)
.map_or(&[] as &[Grant], |r| r.grants.as_slice());
let source_grants = source_map
.get(&k)
.map_or(&[] as &[Grant], |r| r.grants.as_slice());
// When the source explicitly declares this rule, any grantee present in
// the target's grant list was placed there by a previous pgevolve apply
// and must be revocable. Extend the managed-roles set with those
// grantees so that `diff_grants` does not suppress them as "unmanaged".
let extended;
let effective_managed: &BTreeSet<Identifier> = if source_map.contains_key(&k) {
extended = target_grants
.iter()
.filter_map(|g| {
if let GrantTarget::Role(name) = &g.grantee {
Some(name.clone())
} else {
None
}
})
.fold(managed_roles.clone(), |mut acc, name| {
acc.insert(name);
acc
});
&extended
} else {
managed_roles
};
let (to_add, to_revoke, _unmanaged) =
super::grants::diff_grants(target_grants, source_grants, effective_managed);
// Emit REVOKEs before GRANTs (issue #33): revokes must precede grants so
// that WGO-change pairs (same grantee+privilege, different wgo) don't
// self-cancel when the changes are applied to the live database.
for g in to_revoke {
out.push(DefaultPrivilegeChange {
target_role: k.0.clone(),
schema: k.1.clone(),
object_type: k.2,
is_grant: false,
grant: g,
});
}
for g in to_add {
out.push(DefaultPrivilegeChange {
target_role: k.0.clone(),
schema: k.1.clone(),
object_type: k.2,
is_grant: true,
grant: g,
});
}
}
out
}
#[cfg(test)]
mod tests {
use super::*;
use crate::identifier::Identifier;
use crate::ir::default_privileges::{DefaultPrivObjectType, DefaultPrivilegeRule};
use crate::ir::grant::{Grant, GrantTarget, Privilege};
fn id(s: &str) -> Identifier {
Identifier::from_unquoted(s).unwrap()
}
fn grant_to(role: &str, priv_: Privilege) -> Grant {
Grant {
grantee: GrantTarget::Role(id(role)),
privilege: priv_,
with_grant_option: false,
columns: None,
}
}
fn rule(
target_role: &str,
schema: Option<&str>,
object_type: DefaultPrivObjectType,
grants: Vec<Grant>,
) -> DefaultPrivilegeRule {
DefaultPrivilegeRule {
target_role: id(target_role),
schema: schema.map(id),
object_type,
grants,
}
}
fn managed(roles: &[&str]) -> BTreeSet<Identifier> {
roles.iter().map(|r| id(r)).collect()
}
#[test]
fn add_only() {
// Source has a rule; target does not → all grants in source become ADDs.
let src = rule(
"app_owner",
None,
DefaultPrivObjectType::Tables,
vec![grant_to("web_anon", Privilege::Select)],
);
let changes = diff_default_privileges(&[], &[src], &managed(&["app_owner", "web_anon"]));
assert_eq!(changes.len(), 1);
assert!(changes[0].is_grant, "expected is_grant=true");
assert_eq!(changes[0].grant.privilege, Privilege::Select);
}
#[test]
fn revoke_only() {
// Target has a rule; source does not → grants in target become REVOKEs
// (for managed grantees).
let tgt = rule(
"app_owner",
None,
DefaultPrivObjectType::Tables,
vec![grant_to("web_anon", Privilege::Select)],
);
let changes = diff_default_privileges(&[tgt], &[], &managed(&["app_owner", "web_anon"]));
assert_eq!(changes.len(), 1);
assert!(!changes[0].is_grant, "expected is_grant=false");
assert_eq!(changes[0].grant.privilege, Privilege::Select);
}
#[test]
fn mixed_add_and_revoke() {
// Target has SELECT; source has INSERT.
// SELECT → REVOKE; INSERT → ADD.
let tgt = rule(
"app_owner",
Some("app"),
DefaultPrivObjectType::Sequences,
vec![grant_to("alice", Privilege::Select)],
);
let src = rule(
"app_owner",
Some("app"),
DefaultPrivObjectType::Sequences,
vec![grant_to("alice", Privilege::Usage)],
);
let changes = diff_default_privileges(&[tgt], &[src], &managed(&["app_owner", "alice"]));
assert_eq!(changes.len(), 2, "expected 2 changes, got: {changes:?}");
let adds: Vec<_> = changes.iter().filter(|c| c.is_grant).collect();
let revs: Vec<_> = changes.iter().filter(|c| !c.is_grant).collect();
assert_eq!(adds.len(), 1);
assert_eq!(revs.len(), 1);
assert_eq!(adds[0].grant.privilege, Privilege::Usage);
assert_eq!(revs[0].grant.privilege, Privilege::Select);
}
/// Regression for issue #23: when the mutated (source) catalog removes
/// grantees from a default-privilege rule but those grantees are not
/// mentioned elsewhere in the source catalog, they were silently dropped
/// from the REVOKE side (classified as "unmanaged"). The fix: when the
/// source catalog explicitly declares the rule (same key exists in source),
/// treat target grantees for that rule as managed regardless of the
/// catalog-wide `managed_roles` set.
#[test]
fn revoke_unmanaged_grantee_when_source_owns_the_rule() {
use crate::ir::grant::GrantTarget;
// Target has 3 grants including Role("app") as grantee.
let tgt = rule(
"app",
None,
DefaultPrivObjectType::Schemas,
vec![
Grant {
grantee: GrantTarget::Public,
privilege: Privilege::Usage,
with_grant_option: false,
columns: None,
},
Grant {
grantee: GrantTarget::Role(id("app")),
privilege: Privilege::Usage,
with_grant_option: false,
columns: None,
},
Grant {
grantee: GrantTarget::Role(id("app")),
privilege: Privilege::Create,
with_grant_option: false,
columns: None,
},
],
);
// Source has the same rule key but only 1 grant (Public/Usage).
// "app" does NOT appear in managed_roles.
let src = rule(
"app",
None,
DefaultPrivObjectType::Schemas,
vec![Grant {
grantee: GrantTarget::Public,
privilege: Privilege::Usage,
with_grant_option: false,
columns: None,
}],
);
// "app" is not in managed_roles — only "app_owner" is.
let changes = diff_default_privileges(&[tgt], &[src], &managed(&["app_owner"]));
// Must emit 2 REVOKEs for Role("app")/Usage and Role("app")/Create.
let revokes: Vec<_> = changes.iter().filter(|c| !c.is_grant).collect();
assert_eq!(
revokes.len(),
2,
"expected 2 revokes for Role(app) grants, got: {changes:?}"
);
let priv_set: std::collections::BTreeSet<Privilege> =
revokes.iter().map(|c| c.grant.privilege).collect();
assert!(
priv_set.contains(&Privilege::Usage),
"expected REVOKE Usage"
);
assert!(
priv_set.contains(&Privilege::Create),
"expected REVOKE Create"
);
// No spurious GRANTs.
let grants_count = changes.iter().filter(|c| c.is_grant).count();
assert_eq!(grants_count, 0, "expected no new grants, got: {changes:?}");
}
/// Regression for issue #30: same shape as #23 but the `target_role` of the
/// rule (`ops`) also appears as a grantee in the live (target) grants.
/// If `ops` is not in `managed_roles` and does not appear in the source's
/// grant list (only `readers` does), then prior to the fix the extended
/// managed set would not include `ops` and the two REVOKE steps would be
/// suppressed.
///
/// Scenario from the bug report:
/// target: `[Grant{ops, Usage}, Grant{ops, Create}, Grant{readers, Create}]`
/// source: `[Grant{readers, Create}]`
/// `managed_roles`: `{readers}` (tight — `ops` is absent)
///
/// Expected: 2 REVOKE steps (for the two `ops` grants).
#[test]
fn revoke_target_role_as_grantee_not_in_source_grants() {
// target (live database state)
let tgt = rule(
"ops",
None,
DefaultPrivObjectType::Schemas,
vec![
grant_to("ops", Privilege::Usage),
grant_to("ops", Privilege::Create),
grant_to("readers", Privilege::Create),
],
);
// source (desired state): only readers/Create remains
let src = rule(
"ops",
None,
DefaultPrivObjectType::Schemas,
vec![grant_to("readers", Privilege::Create)],
);
// managed_roles contains only `readers`; `ops` is deliberately absent
let changes = diff_default_privileges(&[tgt], &[src], &managed(&["readers"]));
let revokes: Vec<_> = changes.iter().filter(|c| !c.is_grant).collect();
assert_eq!(
revokes.len(),
2,
"expected 2 REVOKEs for the ops grants, got: {changes:?}"
);
let priv_set: std::collections::BTreeSet<Privilege> =
revokes.iter().map(|c| c.grant.privilege).collect();
assert!(
priv_set.contains(&Privilege::Usage),
"expected REVOKE Usage for ops"
);
assert!(
priv_set.contains(&Privilege::Create),
"expected REVOKE Create for ops"
);
// No spurious GRANTs.
let grants_count = changes.iter().filter(|c| c.is_grant).count();
assert_eq!(grants_count, 0, "expected no new grants, got: {changes:?}");
}
}