fix(server): preserve credential key names in redacted provider responses#569
Merged
johntmyers merged 1 commit intomainfrom Mar 24, 2026
Merged
Conversation
…nses redact_provider_credentials used HashMap::clear() which removed both keys and values, causing provider list/get to report 0 credential keys. Replace with value-only redaction so key names and counts are preserved while secret values remain hidden. Refs: #350
drew
approved these changes
Mar 24, 2026
johntmyers
added a commit
that referenced
this pull request
Mar 24, 2026
PR #569 changed credential redaction from clearing the map to replacing values with 'REDACTED'. Update e2e assertions to expect credential keys with REDACTED values instead of an empty map.
johntmyers
added a commit
that referenced
this pull request
Mar 24, 2026
…ision with overlapping policies (#571) * fix(sandbox,server): fix chunk merge duplicates and OPA variable collision with overlapping policies Two related bugs triggered when a draft rule approval creates a second policy entry for the same host:port: 1. merge_chunk_into_policy looked up existing rules by chunk.rule_name (auto-generated as allow_{host}_{port}), which never matched the user's original rule name. Now scans all network_policies entries for a host:port endpoint match before falling back to insertion, and merges allowed_ips into the existing endpoint. 2. The Rego allow_request rule and _matching_endpoint_configs comprehension used 'some ep; ep := policy.endpoints[_]' which caused regorus to error with 'duplicated definition of local variable ep' when multiple policies covered the same host:port. Refactored to isolate endpoint iteration inside helper functions (_policy_allows_l7, _policy_endpoint_configs) so variables are scoped per-policy evaluation. Refs: #567 * test(e2e): add overlapping policy tests and update FWD-2 for implicit allowed_ips - Update FWD-2 (test_forward_proxy_denied_without_allowed_ips -> test_forward_proxy_allows_private_ip_host_without_allowed_ips): literal IP host no longer requires explicit allowed_ips, expects 200. - Add OVL-1: overlapping L4 policies for same host:port must not crash OPA and should allow forward proxy connections. - Add OVL-2: overlapping L7 policies for same host:port must not crash OPA and should allow CONNECT tunnel establishment. Refs: #567 * style: apply cargo fmt formatting * test(e2e): update SSRF-3 and SSRF-6 for implicit allowed_ips behavior SSRF-6: Private IP with literal IP host now gets implicit allowed_ips from PR #570, so CONNECT returns 200 instead of 403. SSRF-3: Loopback is still blocked but via the always-blocked path (implicit allowed_ips is synthesized, then resolve_and_check_allowed_ips catches it). Log message says 'always-blocked' instead of 'internal address'. * fix(e2e): use negative assertion for SSRF-6 when nothing listens on target port When the SSRF check passes but nothing listens on the target port, recv() returns empty bytes. Use 'assert 403 not in' (matching SSRF-4 pattern) instead of 'assert 200 in'. * fix(e2e): update provider tests for redacted credential values PR #569 changed credential redaction from clearing the map to replacing values with 'REDACTED'. Update e2e assertions to expect credential keys with REDACTED values instead of an empty map.
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.
Summary
Fix
provider listandprovider getshowing 0 credential keys by replacingHashMap::clear()with value-only redaction inredact_provider_credentials.Related Issue
Refs #350
Changes
redact_provider_credentialsnow iteratesvalues_mut()and replaces each value with"REDACTED"instead of callingcredentials.clear()"REDACTED") instead of empty mapsRoot Cause
Commit
2d3e6432(part of security hardening PR #548) addedredact_provider_credentialswithcredentials.clear()to prevent credential values from leaking over the API. This correctly hid secrets but also destroyed key names and the key count, causingprovider listto showCREDENTIAL_KEYS: 0andprovider getto show<none>for credential keys.Testing
mise run pre-commitpassesopenshell provider listnow shows correct credential countChecklist