cleaning up aif
This commit is contained in:
@@ -2,19 +2,11 @@
|
||||
<xs:schema targetNamespace="http://schema.xml.r00t2.io/net.xsd"
|
||||
xmlns="http://schema.xml.r00t2.io/net.xsd"
|
||||
xmlns:net="http://schema.xml.r00t2.io/net.xsd"
|
||||
xmlns:std="http://schema.xml.r00t2.io/std.xsd"
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
elementFormDefault="qualified"
|
||||
attributeFormDefault="qualified">
|
||||
|
||||
<xs:simpleType name="t_qualified_addr_ip4">
|
||||
<!-- This is a REALLY LAZY regex. Matching IPv4 in regex is ugly as heck, so we do that in-code.
|
||||
This is just a gatekeeper. -->
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="[0-9.]{7,15}/[0-9]{1,2}"/>
|
||||
<xs:whiteSpace value="collapse"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_addr_ip4">
|
||||
<xs:restriction base="xs:string">
|
||||
<!-- This is a REALLY LAZY regex. Matching IPv4 in regex is ugly as heck, so we do that in-code.
|
||||
@@ -24,15 +16,6 @@
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_qualified_addr_ip6">
|
||||
<!-- This is a REALLY LAZY regex. Matching IPv6 in regex is ugly as heck, so we do that in-code.
|
||||
This is just a gatekeeper. -->
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="[A-Za-z0-9:]+/[0-9]{1,3}"/>
|
||||
<xs:whiteSpace value="collapse"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_addr_ip6">
|
||||
<xs:restriction base="xs:string">
|
||||
<!-- This is a REALLY LAZY regex. Matching IPv6 in regex is ugly as heck, so we do that in-code.
|
||||
@@ -42,12 +25,13 @@
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_both_qualified_addr">
|
||||
<xs:union memberTypes="net:t_qualified_addr_ip4 net:t_qualified_addr_ip6"/>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_both_addr">
|
||||
<xs:union memberTypes="net:t_addr_ip4 net:t_addr_ip6"/>
|
||||
<xs:simpleType name="t_authselect">
|
||||
<xs:restriction base="xs:token">
|
||||
<xs:enumeration value="basic"/>
|
||||
<xs:enumeration value="digest"/>
|
||||
<xs:enumeration value="none"/>
|
||||
<xs:whiteSpace value="collapse"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_auto_ip6">
|
||||
@@ -57,6 +41,25 @@
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_both_addr">
|
||||
<xs:union memberTypes="net:t_addr_ip4 net:t_addr_ip6"/>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_both_qualified_addr">
|
||||
<xs:union memberTypes="net:t_qualified_addr_ip4 net:t_qualified_addr_ip6"/>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:complexType name="t_http_resource">
|
||||
<xs:simpleContent>
|
||||
<xs:extension base="std:t_uri">
|
||||
<xs:attribute name="user" type="std:t_nonempty" use="optional"/>
|
||||
<xs:attribute name="password" type="std:t_nonempty" use="optional"/>
|
||||
<xs:attribute name="realm" type="std:t_nonempty" use="optional"/>
|
||||
<xs:attribute name="authtype" type="net:t_authselect" use="optional" default="none"/>
|
||||
</xs:extension>
|
||||
</xs:simpleContent>
|
||||
</xs:complexType>
|
||||
|
||||
<xs:simpleType name="t_mac_addr">
|
||||
<xs:restriction base="xs:token">
|
||||
<!-- EUI48[RFC7043§3] (previously MAC48[RFC7042§2.1]) -->
|
||||
@@ -68,6 +71,42 @@
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_netproto">
|
||||
<xs:restriction base="xs:token">
|
||||
<xs:enumeration value="ipv4"/>
|
||||
<xs:enumeration value="ipv6"/>
|
||||
<xs:whiteSpace value="collapse"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_proto">
|
||||
<!-- TODO: expand? Remove gre? -->
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="tcp"/>
|
||||
<xs:enumeration value="udp"/>
|
||||
<xs:enumeration value="icmp"/>
|
||||
<xs:enumeration value="gre"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_qualified_addr_ip4">
|
||||
<!-- This is a REALLY LAZY regex. Matching IPv4 in regex is ugly as heck, so we do that in-code.
|
||||
This is just a gatekeeper. -->
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="[0-9.]{7,15}/[0-9]{1,2}"/>
|
||||
<xs:whiteSpace value="collapse"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<xs:simpleType name="t_qualified_addr_ip6">
|
||||
<!-- This is a REALLY LAZY regex. Matching IPv6 in regex is ugly as heck, so we do that in-code.
|
||||
This is just a gatekeeper. -->
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="[A-Za-z0-9:]+/[0-9]{1,3}"/>
|
||||
<xs:whiteSpace value="collapse"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
<!-- TODO: "enterprise" WPA2 (add'l details)?
|
||||
WPA3?
|
||||
EAP,
|
||||
@@ -110,12 +149,4 @@
|
||||
</xs:all>
|
||||
</xs:complexType>
|
||||
|
||||
<xs:simpleType name="t_netproto">
|
||||
<xs:restriction base="xs:token">
|
||||
<xs:enumeration value="ipv4"/>
|
||||
<xs:enumeration value="ipv6"/>
|
||||
<xs:whiteSpace value="collapse"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
</xs:schema>
|
||||
|
||||
Reference in New Issue
Block a user