fix: enumerate RestrictAddressFamilies= AF_ names instead of loose regex#492
Merged
Conversation
config_parse_address_families resolves each name through af_from_name, whose set
is generated from the AF_* macros in <sys/socket.h> (minus AF_UNSPEC/AF_MAX). The
validator matched the loose RegexTerminal("AF_[A-Z0-9_]+"), so any AF_-prefixed
token (AF_BOGUS, AF_INETZ, AF_DECNET) passed validation incorrectly.
Replace it with a FlexibleLiteralChoiceTerminal enumerating the real names: it
still matches the shape leniently (so coloring / error localization keep working)
but is semantically valid only for an exact name. This is a correctness fix on
the default path (both engines), and it sets up grammar-based completion and the
valid-but-kernel-removed deprecation annotator (AF_DECnet, AF_IRDA, ...).
Tests: adds enumerated-valid and unknown-rejected cases to the validator test;
now that AF_BOGUS is honestly invalid, the grammar-engine e2e test uses it to
cover the SemanticError -> highlight mapping (replacing a 242.x-safe workaround).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Unit Test Results (grammar engine true)1 137 tests 1 137 ✅ 48s ⏱️ Results for commit 78999e2. |
Unit Test Results (grammar engine false)1 137 tests 1 137 ✅ 46s ⏱️ Results for commit 78999e2. |
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
1 participant
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.
What
RestrictAddressFamilies=validated names with the looseRegexTerminal("AF_[A-Z0-9_]+"), so anyAF_-prefixed token slipped through —AF_BOGUS,AF_INETZ,AF_DECNET(wrong case for the realAF_DECnet) all passed. systemd'sconfig_parse_address_familiesresolves each name throughaf_from_name, whose set is generated from theAF_*macros in<sys/socket.h>(minusAF_UNSPEC/AF_MAX).This replaces the loose regex with a
FlexibleLiteralChoiceTerminalenumerating the real names: it still matches the shape leniently (so coloring and error localization keep working on a typo) but is semantically valid only for an exact name.Why it's the right shape
This is the "generous RegexTerminal → enumerated choice" cleanup we flagged: an enumerated terminal gives correct validation and sets up grammar-based completion (the names become suggestions) and the valid-but-kernel-removed deprecation annotator (
AF_DECnet,AF_IRDA,AF_ECONET,AF_WANPIPE) — all for free.Scope / behavior
SemanticMatchand the newparse()), since the change is in the grammar, not the machinery.AF_*tokens are now flagged (well-formed but invalid).Tests
testValidEnumeratedFamilies(aliases / mixed-case / newest names / inverted list still accepted) andtestUnknownFamiliesAreNowRejected(the regression guard) to the validator test.AF_BOGUSis honestly invalid, the grammar-engine e2e test (GrammarParseEngineInspectionTest) uses it to cover theSemanticError→ highlight path, replacing the 242.x-safe workaround introduced in feat: opt-in list-of-successes grammar engine + dual-engine test infra #490.Verification
./gradlew testand./gradlew test -Dsystemd.unit.grammarParseEngine=trueboth pass.Unblocks the deprecation annotator (#484), which needs the names enumerated rather than a loose regex.
🤖 Generated with Claude Code