feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns - #1007

Merged
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397
Aug 20, 2026
Merged

feat(guardrails): capture-group scoping + configurable replacement for pii custom patterns#1007
membphis merged 2 commits into
mainfrom
claude/kind-shamir-d85397

Conversation

@membphis

@membphismembphis commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Closes half of api7/AISIX-Cloud#1334 (DP side). Paired CP PR: api7/AISIX-Cloud#1347.

Problem

The first-level regex guardrail could detect but not usefully rewrite the POC's two fixed shapes. mask_all replaced caps[0] (the whole match) and the mask token was hard-derived from the detector name, so:

  • "version": "12.1" → the key, quotes and colon were swallowed, breaking the JSON structure;
  • anchoring only the value (\d+\.\d+) false-positives on every duration/size/IP/file:line in a log;
  • the regex crate has no lookaround, so there is no syntax-level escape — the semantics had to come from capture groups.

Changes

  • Capture-group scoping: a custom pattern whose regex declares at least one capture group rewrites only group 1 of each match; the rest of the match is kept byte-for-byte. Patterns without groups keep the whole-match semantics (backward compatible — built-ins are unchanged).
  • Validators follow the replaced span: the checksum validators (Luhn, ISO 7064 MOD 11-2) now run on group 1 when present, so a prefixed pattern cannot silently disable its validator. Unit-tested both ways (mask + block actions).
  • custom_patterns[].replacement (optional, ≤256 chars): literal override for the default [<NAME>_REDACTED] token; empty string deletes the span; no $n expansion. A replacement on a pattern whose effective action is block rejects the row at build time — a knob is enforced as written or rejected, never accepted-but-unread.
  • Regenerated schemas/resources/guardrail.schema.json.

Compatibility

  • Old rows without replacement load and behave identically (serde default + skip_serializing_if).
  • A row withreplacement row-kills on every released DP: the guardrail config structs deny unknown fields behind the flattened kind enum (pinned by unknown_field_rejected_by_inner_kind_struct), so this is the row_rejected class, not field_ignored. The paired CP PR registers the dpCompatGate entry (MinDP unreleased) and carries the save-time warning plumbing + wire e2e.
  • A capture-group regex on an older DP (without this change) masks the whole match instead of group 1 — strictly more redaction, never less, and never a block, so no separate gate is needed for the semantics change itself.

Reference check (CLAUDE.md §7)

The managed DLP services of the three major clouds and the leading open-source PII anonymizer all pair strong-format regexes with a configurable replacement value and context-anchored matching rather than lookaround; scoping the rewrite to an explicit capture group is the established way to express "replace the value, keep the label" when the engine (like Rust's regex, see https://docs.rs/regex/latest/regex/#untrusted-input and its documented absence of lookaround) trades lookaround for linear-time matching. The branded survey lives in api7/AISIX-Cloud#1331 / #1334.

Verification

  • cargo test -p aisix-guardrails -p aisix-core: 259 + 603 pass (9 new unit tests: group scoping, JSON parseability, hard negatives byte-diff, validator-on-group for mask and block, non-participating group, default/empty/literal replacement, no-group replacement).
  • New e2e guardrail-pii-capture-group-e2e.test.ts against a real DP + etcd: request-side rewrite in place (zh + en labels), hard negatives (Elapsed: 12.345s, 4.2 GB, 0.13um, top.v:12:1, 10.2.255.1) byte-identical via exact-equality assertions, no-hit prompt byte-identical, response-side JSON form rewritten and re-parsed (version == "***", sibling fields intact), whole flow 200 — mask never blocks. 3/3 pass.
  • Existing pii redaction e2e: 6/6 pass (regression).
  • cargo fmt + clippy: clean.

…r pii custom patterns (AISIX-Cloud#1334)
- A custom pattern regex with at least one capture group now rewrites
only group 1 of each match, keeping the rest of the match verbatim,
so a rule can replace a value while preserving its key/label
("version": "12.1" -> "version": "***" stays parseable JSON).
Patterns without capture groups keep the whole-match semantics.
- Checksum validators (Luhn / ISO 7064) now run on the replaced span
(group 1 when present), so a prefixed pattern cannot silently
disable its validator.
- PiiCustomPattern gains an optional replacement field overriding the
default [<NAME>_REDACTED] token; empty string deletes the span; the
text is literal (no group expansion).
- replacement on a pattern whose effective action is block rejects the
row at build time (a knob is enforced as written or rejected, never
accepted-but-unread).
- e2e: capture-group rules drive a real DP end to end - request and
response rewritten in place (zh + en), hard negatives byte-identical,
embedded JSON still parses; regenerated guardrail.schema.json.
@coderabbitai

coderabbitaiBot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Your included review limit has been reached.

You’re in a promotional period — use the checkbox below to run this review for free:

  • Run review for free

On-demand reviews are free for the next 31 days. After that, they cost $0.25 per reviewed file.

How can I continue?

Run this review now using the option above, or comment @coderabbitai review --use-credits.

You can also wait for the limit to reset (next review available in 1 minute), then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3128ea60-35a8-45b6-ba47-466613a6e85f

📥 Commits

Reviewing files that changed from the base of the PR and between 59c7364 and 9291b34.

📒 Files selected for processing (5)
  • crates/aisix-core/src/models/guardrail.rs
  • crates/aisix-guardrails/src/build.rs
  • crates/aisix-guardrails/src/pii.rs
  • schemas/resources/guardrail.schema.json
  • tests/e2e/src/cases/guardrail-pii-capture-group-e2e.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…groups
group_scoped is auto-detected from the pattern, so an accidental
capturing group in a future builtin would silently narrow its
replacement to group 1. Assert captures_len() == 1 for every builtin
(audit rider on #1007).
@membphis
membphis merged commit b783cdc into mainAug 20, 2026
15 checks passed
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:35
@membphis
membphis restored the claude/kind-shamir-d85397 branch August 20, 2026 08:36
@membphis
membphis deleted the claude/kind-shamir-d85397 branch August 20, 2026 08:37
membphis added a commit that referenced this pull request Aug 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@membphis