Skip to content

Make sure the regex validation is anchored #236

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
Bergmann89 merged 2 commits into from
Feb 13, 2026
Merged

Make sure the regex validation is anchored #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce3fbf7
Make sure the regex is anchored
p32blo Feb 11, 2026
97cf1e1
Support absolute paths for `str` builtin
p32blo Feb 12, 2026
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
16 changes: 10 additions & 6 deletions xsd-parser/src/pipeline/renderer/steps/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,23 +222,27 @@ impl ConstrainsData<'_> {
return None;
}

let str_ = ctx.resolve_build_in("::core::primitive::str");
let regex = ctx.resolve_ident_path("::regex::Regex");
let lazy_lock = ctx.resolve_ident_path("::std::sync::LazyLock");
let validate_error = ctx.resolve_ident_path("::xsd_parser_types::quick_xml::ValidateError");

let sz = self.meta.patterns.len();
let patterns = self.meta.patterns.iter().map(|x| {
let rx = Literal::string(x);
let pa = Literal::string(x);

quote!(#regex::new(#rx).unwrap())
// Make sure the pattern is anchored, otherwise it would be possible to match only a part of the string
let rx = Literal::string(&format!("^(?:{})$", x));

quote!((#pa, #regex::new(#rx).unwrap()))
});

Some(quote! {
static PATTERNS: #lazy_lock<[#regex; #sz]> = #lazy_lock::new(|| [ #( #patterns )* ]);
static PATTERNS: #lazy_lock<[(&#str_, #regex); #sz]> = #lazy_lock::new(|| [ #( #patterns )* ]);

for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(#validate_error::Pattern(pattern.as_str()));
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(#validate_error::Pattern(pattern));
}
}
})
Expand Down
10 changes: 5 additions & 5 deletions xsd-parser/tests/feature/enumeration/expected/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ pub enum EnumType {
}
impl EnumType {
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z]+").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> =
LazyLock::new(|| [("[A-Z]+", Regex::new("^(?:[A-Z]+)$").unwrap())]);
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
10 changes: 5 additions & 5 deletions xsd-parser/tests/feature/enumeration/expected/quick_xml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ pub enum EnumType {
}
impl EnumType {
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z]+").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> =
LazyLock::new(|| [("[A-Z]+", Regex::new("^(?:[A-Z]+)$").unwrap())]);
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
10 changes: 5 additions & 5 deletions xsd-parser/tests/feature/enumeration/expected/serde_quick_xml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ pub enum EnumType {
}
impl EnumType {
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z]+").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> =
LazyLock::new(|| [("[A-Z]+", Regex::new("^(?:[A-Z]+)$").unwrap())]);
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
10 changes: 5 additions & 5 deletions xsd-parser/tests/feature/enumeration/expected/serde_xml_rs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ pub enum EnumTypeValue {
}
impl EnumType {
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z]+").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> =
LazyLock::new(|| [("[A-Z]+", Regex::new("^(?:[A-Z]+)$").unwrap())]);
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
10 changes: 5 additions & 5 deletions xsd-parser/tests/feature/enumeration/expected/serde_xml_rs_v7.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ pub enum EnumType {
}
impl EnumType {
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z]+").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> =
LazyLock::new(|| [("[A-Z]+", Regex::new("^(?:[A-Z]+)$").unwrap())]);
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
14 changes: 9 additions & 5 deletions xsd-parser/tests/feature/facets/expected/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,15 @@ impl RestrictedStringType {
self.0
}
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z][a-z]{4,9}").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> = LazyLock::new(|| {
[(
"[A-Z][a-z]{4,9}",
Regex::new("^(?:[A-Z][a-z]{4,9})$").unwrap(),
)]
});
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
14 changes: 9 additions & 5 deletions xsd-parser/tests/feature/facets/expected/quick_xml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,15 @@ impl RestrictedStringType {
self.0
}
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z][a-z]{4,9}").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> = LazyLock::new(|| {
[(
"[A-Z][a-z]{4,9}",
Regex::new("^(?:[A-Z][a-z]{4,9})$").unwrap(),
)]
});
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
14 changes: 9 additions & 5 deletions xsd-parser/tests/feature/facets/expected/serde_quick_xml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,15 @@ impl RestrictedStringType {
self.0
}
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z][a-z]{4,9}").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> = LazyLock::new(|| {
[(
"[A-Z][a-z]{4,9}",
Regex::new("^(?:[A-Z][a-z]{4,9})$").unwrap(),
)]
});
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
14 changes: 9 additions & 5 deletions xsd-parser/tests/feature/facets/expected/serde_xml_rs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,15 @@ impl RestrictedStringType {
self.0
}
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[A-Z][a-z]{4,9}").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> = LazyLock::new(|| {
[(
"[A-Z][a-z]{4,9}",
Regex::new("^(?:[A-Z][a-z]{4,9})$").unwrap(),
)]
});
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
10 changes: 5 additions & 5 deletions xsd-parser/tests/feature/union/expected/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ pub enum UnionType {
}
impl UnionType {
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[a-z0-9]+").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> =
LazyLock::new(|| [("[a-z0-9]+", Regex::new("^(?:[a-z0-9]+)$").unwrap())]);
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down
10 changes: 5 additions & 5 deletions xsd-parser/tests/feature/union/expected/quick_xml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ pub enum UnionType {
}
impl UnionType {
pub fn validate_str(s: &str) -> Result<(), ValidateError> {
static PATTERNS: LazyLock<[Regex; 1usize]> =
LazyLock::new(|| [Regex::new("[a-z0-9]+").unwrap()]);
for pattern in PATTERNS.iter() {
if !pattern.is_match(s) {
return Err(ValidateError::Pattern(pattern.as_str()));
static PATTERNS: LazyLock<[(&str, Regex); 1usize]> =
LazyLock::new(|| [("[a-z0-9]+", Regex::new("^(?:[a-z0-9]+)$").unwrap())]);
for (pattern, regex) in PATTERNS.iter() {
if !regex.is_match(s) {
return Err(ValidateError::Pattern(pattern));
}
}
Ok(())
Expand Down