r00t2
/
xml
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

tighten up some restrictions

This commit is contained in:
brent s. 2019-12-18 09:12:10 -05:00
parent ae3a64801d
commit 43896ea67d
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
schema/lib/types/cksum.xsd
View File

@ -66,10 +66,11 @@
</xs:complexType> </xs:complexType>


<xs:complexType name="t_cksum_verify"> <xs:complexType name="t_cksum_verify">
<xs:sequence> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="checksum" minOccurs="0" maxOccurs="unbounded" type="t_cksum_hash"/> <xs:element name="checksum" minOccurs="0" maxOccurs="unbounded" type="t_cksum_hash">
</xs:element>
<xs:element name="checksumFile" minOccurs="0" maxOccurs="unbounded" type="t_cksum_file"/> <xs:element name="checksumFile" minOccurs="0" maxOccurs="unbounded" type="t_cksum_file"/>
</xs:sequence> </xs:choice>
</xs:complexType> </xs:complexType>


</xs:schema> </xs:schema>

3
schema/lib/types/gpg.xsd
View File

@ -8,7 +8,7 @@


<xs:simpleType name="t_gpg_key_id"> <xs:simpleType name="t_gpg_key_id">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern value="(auto|default)"/><!-- Program should accept any key IDs it finds (INSECURE) --> <xs:pattern value="auto"/><!-- Program should use hardcoded default (POSSIBLY INSECURE) -->
<xs:pattern value="\s*(0x)?[0-9A-Fa-f]{40}\s*"/><!-- Full key ID --> <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{40}\s*"/><!-- Full key ID -->
<xs:pattern value="\s*(0x)?[0-9A-Fa-f]{16}\s*"/><!-- Shorthand key ID ("keyid-format long") --> <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{16}\s*"/><!-- Shorthand key ID ("keyid-format long") -->
<xs:pattern value="\s*(0x)?[0-9A-Fa-f]{8}\s*"/><!-- Legacy shorter shorthand ("keyid-format short") --> <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{8}\s*"/><!-- Legacy shorter shorthand ("keyid-format short") -->
@ -26,6 +26,7 @@
<xs:element name="keyID" minOccurs="0" maxOccurs="unbounded" type="t_gpg_key_id"/> <xs:element name="keyID" minOccurs="0" maxOccurs="unbounded" type="t_gpg_key_id"/>
<xs:element name="keyFile" minOccurs="0" maxOccurs="unbounded" type="t_net_generic_resource"/> <xs:element name="keyFile" minOccurs="0" maxOccurs="unbounded" type="t_net_generic_resource"/>
</xs:choice> </xs:choice>
<xs:attribute name="detect" use="optional" default="false" type="xs:boolean"/>
</xs:complexType> </xs:complexType>


<xs:simpleType name="t_gpg_sig"> <xs:simpleType name="t_gpg_sig">

9
schema/lib/types/sys.xsd
View File

@ -18,9 +18,14 @@


<xs:complexType name="t_sys_verifyfile"> <xs:complexType name="t_sys_verifyfile">
<xs:choice minOccurs="1" maxOccurs="2"> <xs:choice minOccurs="1" maxOccurs="2">
<xs:element name="gpg" minOccurs="0" maxOccurs="1" type="t_gpg_verify"> <xs:element name="gpg" minOccurs="0" maxOccurs="1" type="t_gpg_verify"/>
<xs:element name="hash" minOccurs="0" maxOccurs="1" type="t_cksum_verify">
<xs:unique name="uniq_cksum_value_attr">
<xs:selector xpath="checksum"/>
<xs:field xpath="@hashType"/>
<xs:field xpath="."/>
</xs:unique>
</xs:element> </xs:element>
<xs:element name="hash" minOccurs="0" maxOccurs="1" type="t_cksum_verify"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>