Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 3 additions & 16 deletions specs/jsonschema-validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -437,12 +437,7 @@ These attributes apply to string instances.
A string instance is valid against these format values if it is a valid Internet
email address as follows:

- *email:* As defined by the "Mailbox" ABNF rule in [RFC 5321, section
4.1.2](https://www.rfc-editor.org/info/rfc5321).
- *idn-email:* As defined by the extended "Mailbox" ABNF rule in [RFC 6531,
section 3.3](https://www.rfc-editor.org/info/rfc6531). Note that all strings
valid against the "email" attribute are also valid against the "idn-email"
attribute.
- *email:* As defined by the "Mailbox" ABNF rule in [RFC 5321, section 4.1.2](https://www.rfc-editor.org/info/rfc5321).

#### Hostnames

Expand All @@ -451,15 +446,7 @@ These attributes apply to string instances.
A string instance is valid against these attributes if it is a valid
representation for an Internet hostname as follows:

- *hostname:* As defined by
[RFC 1123, section 2.1](https://www.rfc-editor.org/info/rfc1123), including
host names produced using the Punycode algorithm specified in [RFC 5891,
section 4.4](https://www.rfc-editor.org/info/rfc5891).
- *idn-hostname:* As defined by either RFC 1123 as for hostname, or an
internationalized hostname as defined by [RFC 5890, section
2.3.2.3](https://www.rfc-editor.org/info/rfc5890). Note that all strings valid
against the "hostname" attribute are also valid against the "idn-hostname"
attribute.
- *hostname:* As defined by [RFC 1123, section 2.1](https://www.rfc-editor.org/info/rfc1123).

#### IP Addresses

Expand Down Expand Up @@ -853,7 +840,7 @@ to the document.
document
- Also allow RFC 4648 encodings in `contentEncoding`
- Added `minContains` and `maxContains`
- Update RFC reference for nhostname" and "idn-hostname"
- Update RFC reference for "hostname" and "idn-hostname"
- Add "uuid" and "duration" formats
- *draft-handrews-json-schema-validation-01*
- This draft is purely a clarification with no functional changes
Expand Down
10 changes: 3 additions & 7 deletions specs/registries/format.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,14 @@
"supportedBy": []
},
"idn-email": {
"description": "An email address as defined as Mailbox in RFC6531",
"definingBody": "JSON Schema",
"definition": "https://json-schema.org/draft/2020-12/json-schema-validation.html#name-email-addresses",
"description": "An email address as defined by Mailbox in RFC6531 with the domain using the UTS #46 mapping for IDNs",
"types": ["string"],
"examples": ["user@exämple.com"],
"deprecated": false,
"supportedBy": []
},
"idn-hostname": {
"description": "An internationalized host name as defined by RFC5890",
"definingBody": "JSON Schema",
"definition": "https://json-schema.org/draft/2020-12/json-schema-validation.html#name-hostnames",
"description": "An internationalized host name as defined by IDNA2008 using the UTS #46 mapping",
"types": ["string"],
"examples": ["exämple.com"],
"deprecated": false,
Expand Down Expand Up @@ -372,4 +368,4 @@
"deprecated": false,
"supportedBy": []
}
}
}
Loading