rust
/
jsonschema-rs
mirror of https://github.com/Stranger6667/jsonschema-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Incorrect handling of `\w` and `\W` character groups in `pattern` keywords 

Ref: #180
This commit is contained in:
Dmitry Dygalo 2021-03-25 23:06:55 +01:00 committed by Dmitry Dygalo
parent 17643fac76
commit d41a922704
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
## [Unreleased]
### Fixed
- Incorrect handling of `\w` and `\W` character groups in `pattern` keywords. [#180](https://github.com/Stranger6667/jsonschema-rs/issues/180)
## [0.6.0] - 2021-02-03
### Fixed

4
bindings/python/CHANGELOG.md
View File

@ -2,6 +2,10 @@
## [Unreleased]
### Fixed
- Incorrect handling of `\w` and `\W` character groups in `pattern` keywords. [#180](https://github.com/Stranger6667/jsonschema-rs/issues/180)
## [0.6.0] - 2021-02-03
### Added

18
jsonschema/src/keywords/pattern.rs
View File

@ -68,8 +68,8 @@ fn convert_regex(pattern: &str) -> Result<Regex, regex::Error> {
&new_pattern
.replace(r"\d", "[0-9]")
.replace(r"\D", "[^0-9]")
.replace(r"\w", "[A-Za-z]")
.replace(r"\W", "[^A-Za-z]")
.replace(r"\w", "[A-Za-z0-9_]")
.replace(r"\W", "[^A-Za-z0-9_]")
.replace(
r"\s",
"[ \t\n\r\u{000b}\u{000c}\u{2003}\u{feff}\u{2029}\u{00a0}]",
@ -103,3 +103,17 @@ pub(crate) fn compile(
) -> Option<CompilationResult> {
Some(PatternValidator::compile(schema))
}
#[cfg(test)]
mod tests {
use super::*;
use test_case::test_case;
#[test_case(r"^[\w\-\.\+]+$", "CC-BY-4.0", true)]
#[test_case(r"^[\w\-\.\+]+$", "CC-BY-!", false)]
#[test_case(r"^\W+$", "1_0", false)]
fn regex_matches(pattern: &str, text: &str, is_matching: bool) {
let compiled = convert_regex(pattern).expect("A valid regex");
assert_eq!(compiled.is_match(text), is_matching);
}
}