Skip to content

disallow an empty language ext without ext-seg #1247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Sep 17, 2026
Merged

disallow an empty language ext without ext-seg #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/ssvc/utils/namespace_patterns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,5 @@
)
translation = f'\\.({reverse_dns}|{x_name})\\${bcp47}'
ext_seg = f'({bcp47}|\\.{x_name}|{translation})'
lang_ext = f'(/|/{bcp47})'
extensions = f'{lang_ext}((/{ext_seg})+)?'
extensions = f'(/{bcp47}(/{ext_seg})*|/(/{ext_seg})+)'
namespace = f'{base_ns}({extensions})?'
10 changes: 4 additions & 6 deletions src/ssvc/utils/ssvc_namespace_pattern.abnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ label = ALNUMLOW [ *61ALNUMLOWDASH ALNUMLOW ]

fragment-seg = 1*ALNUMLOW *( SPECIALCHAR 1*ALNUMLOW )

extensions = lang-ext [ 1*( "/" ext-seg ) ]

; Language extension: either / (empty language extension)
; or /<bcp47> (BCP-47 language code)

lang-ext = "/" / ( "/" bcp47 )
; Extension:
; either /<bcp47> (BCP-47 language code) optionally followed by ext-segs
; or / (empty language extension => default: en-US) followed by ext-segs
extensions = ("/" bcp47 *("/" ext-seg)) / ("/" 1*( "/" ext-seg ))

; Extension segment between slashes.
; - is either a language or
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_namespaces_pattern.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def setUp(self):
"abc", # not in enum, but valid for the pattern
"ssvc#reference-arch-1", # valid namespace with hash
"x_example.test#test",
"x_example.test#test/",
"x_example.test#test//.org.example#bar",
"ssvc/de-DE/.org.example#reference-arch-1", # valid BCP-47 tag, reverse domain notation, hash
"ssvc//.de.bund.bsi$de-DE", # BSI's translation of SSVC
Expand Down Expand Up @@ -81,6 +80,7 @@ def setUp(self):
"ssvc$de-DE", # official translations / base language are at the first extension level
"anssi#800-30$fr-FR", # official translations / base language are at the first extension level
"x_gov.nist#800-30$de-DE", # official translations / base language are at the first extension level
"ssvc/", # empty language extension without extension segment; see #1233
"ssvc/de-DE/example.organization##reference-arch-1", # valid BCP-47 tag, reverse domain notation, double hash
"ssvc/de-DE/example.organization#multi#hash#forbidden", # valid BCP-47 tag, reverse domain notation, more than one hash per segment
"x_custom.extension.", # ends with punctuation
Expand Down
Loading