[schemas] restrict all possible values for extension point attributes

sky42src · Aug 8, 2018 · a5d6270 · a5d6270
1 parent 542f6c4
commit a5d6270
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 18 deletions.
diff --git a/addons/kodi.binary.instance.game/controller.xsd b/addons/kodi.binary.instance.game/controller.xsd
@@ -15,7 +15,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="kodi\.game\.controller"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/addons/kodi.resource/images.xsd b/addons/kodi.resource/images.xsd
@@ -3,9 +3,14 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:element name="extension">
     <xs:complexType>
-      <xs:attribute name="point" type="xs:string" use="required"/>
+      <xs:attribute name="point" type="simpleIdentifier" use="required"/>
       <xs:attribute name="compile" type="xs:boolean"/>
       <xs:attribute name="type" type="xs:string"/>
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="simpleIdentifier">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="kodi\.resource\.images"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>
diff --git a/addons/kodi.resource/language.xsd b/addons/kodi.resource/language.xsd
@@ -55,7 +55,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="kodi\.resource\.language"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/addons/kodi.resource/uisounds.xsd b/addons/kodi.resource/uisounds.xsd
@@ -10,7 +10,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="kodi\.resource\.uisounds"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/addons/xbmc.addon/metadata.xsd b/addons/xbmc.addon/metadata.xsd
@@ -26,7 +26,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="(kodi|xbmc)\.addon\.metadata"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:complexType name="translatedString">
@@ -53,7 +53,7 @@
   </xs:simpleType>
   <xs:simpleType name="langIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[a-z]{2}(_[A-Z]{2}(@\S+)?)?"/>
+      <xs:pattern value="[a-z]{2,3}(_[A-Z]{2}(@\S+)?)?"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:complexType name="assetsList">

diff --git a/addons/xbmc.addon/repository.xsd b/addons/xbmc.addon/repository.xsd
@@ -38,7 +38,7 @@
   </xs:complexType>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="xbmc\.addon\.repository"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/addons/xbmc.gui/skin.xsd b/addons/xbmc.gui/skin.xsd
@@ -26,7 +26,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="xbmc\.gui\.skin"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/addons/xbmc.metadata/scraper.xsd b/addons/xbmc.metadata/scraper.xsd
@@ -3,8 +3,8 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:element name="extension">
     <xs:complexType>
-      <xs:attribute name="point" type="xs:string" use="required"/>
-      <xs:attribute name="id" type="simpleIdentifier"/>
+      <xs:attribute name="point" type="simpleIdentifier" use="required"/>
+      <xs:attribute name="id" type="xs:string"/>
       <xs:attribute name="name" type="xs:string"/>
       <xs:attribute name="library" type="xs:string" use="required"/>
       <xs:attribute name="language" type="xs:string"/>
@@ -14,7 +14,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="xbmc\.metadata\.scraper\.(albums|artists|library|movies|musicvideos|tvshows)"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/addons/xbmc.python/contextitem.xsd b/addons/xbmc.python/contextitem.xsd
@@ -27,12 +27,12 @@
   </xs:complexType>
   <xs:simpleType name="pointIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="kodi.context.item"/>
+      <xs:pattern value="kodi\.context\.item"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="menuIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="kodi.core.main|kodi.core.manage"/>
+      <xs:pattern value="kodi\.core\.(manage|main)"/>
     </xs:restriction>
   </xs:simpleType>
-</xs:schema>
+</xs:schema>
diff --git a/addons/xbmc.python/pluginsource.xsd b/addons/xbmc.python/pluginsource.xsd
@@ -15,7 +15,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="xbmc\.python\.pluginsource"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="providesType">

diff --git a/addons/xbmc.python/script.xsd b/addons/xbmc.python/script.xsd
@@ -14,7 +14,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="xbmc\.(python\.(library|lyrics|module|script|weather)|ui\.screensaver|subtitle\.module)"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="providesList">

diff --git a/addons/xbmc.python/service.xsd b/addons/xbmc.python/service.xsd
@@ -12,7 +12,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="xbmc\.service"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/addons/xbmc.webinterface/webinterface.xsd b/addons/xbmc.webinterface/webinterface.xsd
@@ -13,7 +13,7 @@
   </xs:element>
   <xs:simpleType name="simpleIdentifier">
     <xs:restriction base="xs:string">
-      <xs:pattern value="[^.]+"/>
+      <xs:pattern value="xbmc\.webinterface"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="webinterfaceType">