hrw4u: Fix u4wrh raw %{...} passthrough for unresolved HRW variables#13206
Open
Clendenin wants to merge 1 commit into
Open
hrw4u: Fix u4wrh raw %{...} passthrough for unresolved HRW variables#13206Clendenin wants to merge 1 commit into
Clendenin wants to merge 1 commit into
Conversation
The reverse symbol resolver silently swallowed SymbolResolutionError in the visitor cache and emitted raw HRW percent tags into HRW4U output, producing syntax that hrw4u then failed to re-parse. Add the missing reverse mappings for bare CLIENT-URL and CLIENT-CERT:APRN-RAW, and surface unmapped tags as explicit errors rather than invalid output so future gaps cannot hide. Registers BARE_TAG_MAP through REVERSE_RESOLUTION_MAP so every reverse table has a single source of truth.
Clendenin
force-pushed
the
bugfix/u4wrh-raw-pct
branch
from
8c15e89 to
6f45102
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves HRW4U reverse conversion for legacy raw HRW percent tags by adding missing reverse mappings and tests for u4wrh round-trip validity.
Changes:
- Adds reverse mapping support for bare
CLIENT-URLand legacy bareCLIENT-CERTtags. - Registers
BARE_TAG_MAPin the generated reverse resolution map. - Adds fixtures and a round-trip test to ensure u4wrh output does not contain raw
%{...}tags for covered legacy cases.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
tools/hrw4u/src/types.py |
Allows APRN-RAW as a certificate suffix. |
tools/hrw4u/src/tables.py |
Adds fallback and bare-tag reverse mappings. |
tools/hrw4u/src/generators.py |
Includes bare-tag mappings in reverse resolution generation. |
tools/hrw4u/src/hrw_symbols.py |
Resolves bare percent tags through BARE_TAG_MAP. |
tools/hrw4u/src/hrw_visitor.py |
Stops swallowing symbol resolution errors in cached condition resolution. |
tools/hrw4u/tests/test_u4wrh_round_trip.py |
Adds round-trip validation for selected legacy bare HRW tags. |
tools/hrw4u/tests/data/conds/exceptions.txt |
Marks new fixtures as reverse-only expectations. |
tools/hrw4u/tests/data/conds/bare-client-url.*.txt |
Adds bare CLIENT-URL reverse fixture. |
tools/hrw4u/tests/data/conds/bare-client-cert-aprn.*.txt |
Adds bare CLIENT-CERT:APRN-RAW reverse fixture. |
tools/hrw4u/tests/data/conds/bare-client-cert-san-dns.*.txt |
Adds bare multi-colon CLIENT-CERT:SAN:DNS reverse fixture. |
Comment on lines
+69
to
+72
| def _cached_symbol_to_ident(self, pct_text: str, section_name: str) -> tuple[str, bool]: | ||
| """Cache expensive symbol resolution operations.""" | ||
| try: | ||
| section = SectionType(section_name) | ||
| return self.symbol_resolver.percent_to_ident_or_func(pct_text, section) | ||
| except (ValueError, SymbolResolutionError): | ||
| return pct_text, "" | ||
| section = SectionType(section_name) | ||
| return self.symbol_resolver.percent_to_ident_or_func(pct_text, section) |
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
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
The reverse symbol resolver silently swallowed
SymbolResolutionErrorin thevisitor cache and emitted raw HRW percent tags into Prism output, producing
syntax that hrw4u then failed to re-parse.
This change adds the missing reverse mappings for bare
CLIENT-URLandCLIENT-CERT:APRN-RAW, and surfaces unmapped tags as explicit errors ratherthan invalid output so future gaps cannot hide.
BARE_TAG_MAPis registeredthrough
REVERSE_RESOLUTION_MAPso every reverse table has a single source oftruth.