Skip to content

fix(referencing): accept https $schema for drafts 04/06/07 and add tests #803

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(referencing): accept https $schema for drafts 04/06/07 and add tests #803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4020be8
fix(referencing): accept https $schema for drafts 04/06/07 and add tests
Artifizer Sep 21, 2025
2bf9d74
Merge branch 'Stranger6667:master' into master
Artifizer Sep 21, 2025
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
22 changes: 16 additions & 6 deletions crates/jsonschema-referencing/src/specification/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,19 @@ impl Draft {
.and_then(|contents| contents.get("$schema"))
.and_then(|schema| schema.as_str())
{
Ok(match schema.trim_end_matches('#') {
"https://json-schema.org/draft/2020-12/schema" => Draft::Draft202012,
"https://json-schema.org/draft/2019-09/schema" => Draft::Draft201909,
"http://json-schema.org/draft-07/schema" => Draft::Draft7,
"http://json-schema.org/draft-06/schema" => Draft::Draft6,
"http://json-schema.org/draft-04/schema" => Draft::Draft4,
let normalized = schema.trim_end_matches('#');
Ok(match normalized {
// Accept both HTTPS and HTTP for all known drafts
"https://json-schema.org/draft/2020-12/schema"
| "http://json-schema.org/draft/2020-12/schema" => Draft::Draft202012,
"https://json-schema.org/draft/2019-09/schema"
| "http://json-schema.org/draft/2019-09/schema" => Draft::Draft201909,
"https://json-schema.org/draft-07/schema"
| "http://json-schema.org/draft-07/schema" => Draft::Draft7,
"https://json-schema.org/draft-06/schema"
| "http://json-schema.org/draft-06/schema" => Draft::Draft6,
"https://json-schema.org/draft-04/schema"
| "http://json-schema.org/draft-04/schema" => Draft::Draft4,
value => return Err(Error::unknown_specification(value)),
})
} else {
Expand Down Expand Up @@ -199,8 +206,11 @@ mod tests {
#[test_case(&json!({"$schema": "https://json-schema.org/draft/2020-12/schema#"}), Draft::Draft202012; "detect Draft 2020-12 with fragment")]
#[test_case(&json!({"$schema": "https://json-schema.org/draft/2019-09/schema"}), Draft::Draft201909; "detect Draft 2019-09")]
#[test_case(&json!({"$schema": "http://json-schema.org/draft-07/schema"}), Draft::Draft7; "detect Draft 7")]
#[test_case(&json!({"$schema": "https://json-schema.org/draft-07/schema"}), Draft::Draft7; "detect Draft 7 https")]
#[test_case(&json!({"$schema": "http://json-schema.org/draft-06/schema"}), Draft::Draft6; "detect Draft 6")]
#[test_case(&json!({"$schema": "https://json-schema.org/draft-06/schema"}), Draft::Draft6; "detect Draft 6 https")]
#[test_case(&json!({"$schema": "http://json-schema.org/draft-04/schema"}), Draft::Draft4; "detect Draft 4")]
#[test_case(&json!({"$schema": "https://json-schema.org/draft-04/schema"}), Draft::Draft4; "detect Draft 4 https")]
#[test_case(&json!({}), Draft::Draft7; "default to Draft 7 when no $schema")]
fn test_detect(contents: &serde_json::Value, expected: Draft) {
let result = Draft::Draft7
Expand Down
Loading