Merge pull request #2618 from OSInside/fix-application-id-schema

kiwi/schema: Fix allowed value type for ISO publisher and application ID
OSInside · Nov 20, 2024 · 8ab85d3 · 8ab85d3
2 parents 2faacfb + 1c0d1dd
commit 8ab85d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc
@@ -26,7 +26,7 @@ namespace nul = ""
 
 safe-posix-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]+"}
 safe-posix-short-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]{1,32}"}
-safe-posix-long-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]{1,128}"}
+ecma-119-achar-128-text = xsd:token {pattern = "[a-zA-Z0-9!-/:-?_ ]{1,128}"}
 locale-name = xsd:token {pattern = "(POSIX|[a-z]{2,3}_[A-Z]{2})(,[a-z]{2,3}_[A-Z]{2})*"}
 mac-address-type = xsd:token {pattern = "([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}"}
 size-type = xsd:token {pattern = "(\d*|image)"}
@@ -2232,7 +2232,7 @@ div {
         ## for the iso/(oem install iso) type only:
         ## Specifies the Application ID to be written
         ## into the master block. There is space for 128 characters.
-        attribute application_id { safe-posix-long-name }
+        attribute application_id { ecma-119-achar-128-text }
         >> sch:pattern [ id = "application_id" is-a = "image_type"
             sch:param [ name = "attr" value = "application_id" ]
             sch:param [ name = "types" value = "iso oem" ]
@@ -2272,7 +2272,7 @@ div {
         ]
     k.type.publisher.attribute =
         ## Specifies the publisher name of the ISO.
-        attribute publisher { text }
+        attribute publisher { ecma-119-achar-128-text }
         >> sch:pattern [ id = "publisher" is-a = "image_type"
             sch:param [ name = "attr" value = "publisher" ]
             sch:param [ name = "types" value = "iso" ]

diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng
@@ -31,9 +31,9 @@
       <param name="pattern">[a-zA-Z0-9_\-\.]{1,32}</param>
     </data>
   </define>
-  <define name="safe-posix-long-name">
+  <define name="ecma-119-achar-128-text">
     <data type="token">
-      <param name="pattern">[a-zA-Z0-9_\-\.]{1,128}</param>
+      <param name="pattern">[a-zA-Z0-9!-/:-?_ ]{1,128}</param>
     </data>
   </define>
   <define name="locale-name">
@@ -3219,7 +3219,7 @@ into the master block. There is space for 32 characters.</a:documentation>
         <a:documentation>for the iso/(oem install iso) type only:
 Specifies the Application ID to be written
 into the master block. There is space for 128 characters.</a:documentation>
-        <ref name="safe-posix-long-name"/>
+        <ref name="ecma-119-achar-128-text"/>
       </attribute>
       <sch:pattern id="application_id" is-a="image_type">
         <sch:param name="attr" value="application_id"/>
@@ -3273,6 +3273,7 @@ container image created by Kiwi.  Default is true.</a:documentation>
     <define name="k.type.publisher.attribute">
       <attribute name="publisher">
         <a:documentation>Specifies the publisher name of the ISO.</a:documentation>
+        <ref name="ecma-119-achar-128-text"/>
       </attribute>
       <sch:pattern id="publisher" is-a="image_type">
         <sch:param name="attr" value="publisher"/>