feat(sessions): load and apply user policy - #733
Merged
Merged
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (6)
🚧 Files skipped from review as they are similar to previous changes (6)
📝 WalkthroughWalkthroughUser policy loading and enforcement now flow through minimal activation. Policy expansion supports non-absolute patterns, rejects per-user tilde prefixes, and applies deny-over-ignore precedence. Activation passes loaded policy and compose options through contribution composition and pending handling. ChangesUser policy flow
Estimated code review effort: 4 (Complex) | ~45 minutes Sequence Diagram(s)sequenceDiagram
participant cmd_activate
participant config_read_user_policy
participant read_user_policy_or_default
participant compose_user_contribution
participant drive_pending_to_active
participant handle_response
cmd_activate->>config_read_user_policy: load user_policy.toml
config_read_user_policy->>read_user_policy_or_default: read policy or return empty policy
read_user_policy_or_default-->>config_read_user_policy: UserPolicy
cmd_activate->>compose_user_contribution: compose loadouts with UserPolicy and ComposeOptions
cmd_activate->>drive_pending_to_active: pass UserPolicy and ComposeOptions
drive_pending_to_active->>handle_response: handle pending response with policy and options
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches📝 Generate docstrings
Comment |
twitchyliquid64
approved these changes
Jul 13, 2026
twitchyliquid64
left a comment
Member
There was a problem hiding this comment.
cargo fmt && cargo clippy --all-targets --fix --allow-dirty -- -D warnings && cargo fmt
evanspearman
force-pushed
the
evan/policy
branch
2 times, most recently
from
July 14, 2026 20:07
b72188a to
4e87874
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Load
user_policy.tomlfrom<config>/minimal/and thread it throughactivation. Fills in the placeholder
UserPolicy::empty()/UserPolicy::default()sites that were shipping unenforced.sessions::core::policy—read_user_policy_file/_or_defaultloaders (empty policy on
NotFound).minimal::config::read_user_policy— helper mirroringread_client_config. Loaded once incmd_activate, passed intoboth
compose_user_contributionanddrive_pending_to_active.drive_pending_to_activenow takesUserPolicy+ComposeOptions(was defaults) — daemon-response pending items get gated against
the real policy.
Policy semantics fixes
Two behavior corrections uncovered while wiring this up:
VarsPolicyandExpandedPatchPolicy. Deny is the emergency stop — it can't besilently hidden behind an overlapping ignore glob.
PathDecision::combinewas already correct; single-path
decide/checkwere inverted.expand_source(patch-source, must-be-absolute walker input) fromexpand_policy_pattern(matcher against real paths).deny = ["**/*.pem"]inuser_policy.tomlnow works.~name/tilde-userform still rejected loudly (was previously caught by the absolute
check; now has its own
ExpandError::UnsupportedTildeUservariantso both code paths surface the footgun).
Summary by CodeRabbit
user_policy.toml, with missing files defaulting to an empty policy.denyrules now consistently take precedence overignorefor both variables and patch matching, including overlapping rules.~name/...) are rejected earlier with a clearer error.