Mihaela Mihaljevic
cfaf9b7dd1
An identity constraint's selector and field xpath must be in the XSD 1.0 restricted-XPath subset (Part 1, 3.11.6), far narrower than full XPath: a leading optional .//, then /-separated steps, a step being '.', a name test (QName, '*', or NCName:*), or a child:: axis; a field path may end in an attribute step (@x or attribute::x). No predicates, no other axes, no absolute or interior //. The xpath was stored raw and compiled lazily with try?, so a malformed one was silently accepted. It is now lexed into a whitespace-tolerant token stream and parsed against the grammar: whitespace between tokens is allowed (child :: a, . //.) while // must be adjacent and a name test's own ':' may not be spaced. The name lexer uses the XML NameChar set so a non-ASCII NCName is accepted. The two identity tests that fed a malformed xpath and expected a validation-time located error now assert the stronger compile-time rejection. XSTS: invalid schemas accepted 785 to 736, valid schemas rejected held at 72, instance buckets unchanged.
72 lines
3.0 KiB
Swift
72 lines
3.0 KiB
Swift
@testable import PureXML
|
|
import Testing
|
|
|
|
/// The XSD 1.0 restricted-XPath subset (Part 1, 3.11.6) for an identity
|
|
/// constraint's `selector` and `field`. A `selector` is a path of abbreviated
|
|
/// steps (`.`, `.//`, name tests, the `child::` axis); a `field` may additionally
|
|
/// end in an attribute step (`@x` or `attribute::x`). Whitespace between tokens is
|
|
/// allowed, but `//` must be adjacent and a name test's `:` may not be spaced; no
|
|
/// predicates, no absolute paths, no other axes. These pin both the rejections and
|
|
/// the valid shapes the W3C suite expects accepted (idI/idJ).
|
|
@Suite("Identity-constraint XPath subset")
|
|
struct SchemaIdentityXPathTests {
|
|
private func compile(_ selector: String, fields: [String] = ["@v"]) throws {
|
|
let fieldElements = fields.map { #"<xs:field xpath="\#($0)"/>"# }.joined()
|
|
_ = try PureXML.Schema.Document(#"""
|
|
<xs:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
|
<xs:element name="root" type="xs:string"/>
|
|
<xs:element name="r">
|
|
<xs:complexType><xs:sequence><xs:element ref="root"/></xs:sequence></xs:complexType>
|
|
<xs:unique name="u">
|
|
<xs:selector xpath="\#(selector)"/>
|
|
\#(fieldElements)
|
|
</xs:unique>
|
|
</xs:element>
|
|
</xs:schema>
|
|
"""#)
|
|
}
|
|
|
|
private func rejectsSelector(_ selector: String) -> Bool {
|
|
do { try compile(selector)
|
|
return false
|
|
} catch { return true }
|
|
}
|
|
|
|
private func rejectsField(_ field: String) -> Bool {
|
|
do { try compile("root", fields: [field])
|
|
return false
|
|
} catch { return true }
|
|
}
|
|
|
|
@Test("valid selector paths compile")
|
|
func test_validSelectors() throws {
|
|
for selector in [".", ".//a", "a/b/c", "a|b", ".//a | .//b", "*", "ns:a", "ns:*", "child::a", "child::ns:*", ". //."] {
|
|
try compile(selector)
|
|
}
|
|
// A name test built from non-ASCII NCName characters (U+203F UNDERTIE) is a
|
|
// valid name and must not be rejected by the path lexer.
|
|
try compile("a\u{203F}b")
|
|
}
|
|
|
|
@Test("valid field paths compile, including attribute steps")
|
|
func test_validFields() throws {
|
|
for field in ["@v", "a/@v", "attribute::v", ".//a/@v", "@ns:v", "attribute::ns:v", "a | @v", "attribute :: v"] {
|
|
try compile("root", fields: [field])
|
|
}
|
|
}
|
|
|
|
@Test("malformed selector paths are rejected")
|
|
func test_invalidSelectors() {
|
|
for selector in ["", "|", "| a", "a|", "/", "//", "/a", ".//", ".//.//a", "a//b", "self::a", "descendant::a", "a[1]", "child::", "tid : *", "@v", "attribute::v"] {
|
|
#expect(rejectsSelector(selector), "expected rejection: '\(selector)'")
|
|
}
|
|
}
|
|
|
|
@Test("malformed field paths are rejected")
|
|
func test_invalidFields() {
|
|
for field in ["", "a[1]", "@ ", "@*[1]", "/@v", "self::v", "a/@v/b", "tid : *"] {
|
|
#expect(rejectsField(field), "expected rejection: '\(field)'")
|
|
}
|
|
}
|
|
}
|