cddl 0.8.9 → 0.12.14

data/test/test-cddl.rb

@@ -171,6 +171,57 @@ HERE
     assert parser.validate_for_test(true)
   end
 
+  def test_validate_bignum
+    parser = CDDL::Parser.new <<HERE
+test = bigint
+HERE
+    assert parser.validate_for_test(2**4711)
+    assert parser.validate_for_test(-2**815)
+    assert parser.validate_for_test(1)
+    assert parser.validate_for_test(0)
+    assert parser.validate_for_test(-11)
+  end
+
+  def test_aaaaaaaa_invalidate_bignum
+    parser = CDDL::Parser.new <<HERE
+test = bignint
+HERE
+    refute parser.validate_for_test(2**4711, false)
+    assert parser.validate_for_test(-2**815)
+    refute parser.validate_for_test(1, false)
+    refute parser.validate_for_test(0, false)
+    assert parser.validate_for_test(-11)
+  end
+
+  
+  def test_aaaaaaaa_validate_bignum0b
+    parser = CDDL::Parser.new <<HERE
+test = #6.2("")
+HERE
+    refute parser.validate_for_test(1, false)
+    refute parser.validate_for_test(0, false)
+  end
+
+  
+  def test_aaaaaaaa_validate_bignum0
+    parser = CDDL::Parser.new <<HERE
+test = #6.2(h'')
+HERE
+    assert parser.validate_for_test(0)
+    refute parser.validate_for_test(1, false)
+  end
+
+  
+  def test_aaaaaaaa_validate_bignum1
+    parser = CDDL::Parser.new <<HERE
+test = #6.2(h'01')
+HERE
+    assert parser.validate_for_test(1)
+    refute parser.validate_for_test(0, false)
+    refute parser.validate_for_test(2, false)
+  end
+
+
   def test_validate_a
     parser = CDDL::Parser.new <<HERE
 test = [* one: 1]
@@ -224,7 +275,7 @@ b = (
   (x: int // y: int), z: int
 )
 HERE
-    assert parser.validate_for_test({})
+    refute parser.validate_for_test({}, false)
     assert parser.validate_for_test({"x" => 2, "z" => 1})
     assert parser.validate_for_test({"y" => 1, "z" => 2})
     refute parser.validate_for_test({"z" => 1}, false)
@@ -242,7 +293,7 @@ b = ( z: int
   (x: int // y: int)
 )
 HERE
-    assert parser.validate_for_test({})
+    refute parser.validate_for_test({}, false)
     assert parser.validate_for_test({"x" => 2, "z" => 1})
     assert parser.validate_for_test({"y" => 1, "z" => 2})
     refute parser.validate_for_test({"z" => 1}, false)

data/test-data/7807.cddl

@@ -0,0 +1,14 @@
+coap-problem-details = {
+ type => uint,
+ ? title => text,
+ ? response-code => bstr .size 1,
+ ? detail => text,
+ ? instance => uri,
+ * $$coap-problem-details-extension,
+}
+
+type = 0
+title = 1
+response-code = 2
+detail = 3
+instance = 4

data/test-data/abignum.cddl

@@ -0,0 +1 @@
+abignum = unsigned

data/test-data/abnf1.cddl

@@ -0,0 +1,3 @@
+foo = text .abnf '4DIGIT
+DIGIT          =  %x30-39 ; 0-9
+'

data/test-data/abnf2.cddl

@@ -0,0 +1,37 @@
+start = [Tag0, Tag1004]
+
+; for draft-ietf-cbor-date-tag
+Tag1004 = #6.1004(text .abnf full-date)
+; for RFC 7049
+Tag0 = #6.0(text .abnf date-time)
+
+full-date = "full-date" .cat rfc3339
+date-time = "date-time" .cat rfc3339
+
+; Note the trick of idiomatically starting with a newline, separating
+;   off the element in the .cat from the rule-list
+rfc3339 = '
+date-fullyear   = 4DIGIT
+date-month      = 2DIGIT  ; 01-12
+date-mday       = 2DIGIT  ; 01-28, 01-29, 01-30, 01-31 based on
+                        ; month/year
+time-hour       = 2DIGIT  ; 00-23
+time-minute     = 2DIGIT  ; 00-59
+time-second     = 2DIGIT  ; 00-58, 00-59, 00-60 based on leap sec
+                        ; rules
+time-secfrac    = "." 1*DIGIT
+time-numoffset  = ("+" / "-") time-hour ":" time-minute
+time-offset     = "Z" / time-numoffset
+
+partial-time    = time-hour ":" time-minute ":" time-second
+                [time-secfrac]
+full-date       = date-fullyear "-" date-month "-" date-mday
+full-time       = partial-time time-offset
+
+date-time       = full-date "T" full-time
+' .cat rfc5234-core
+
+rfc5234-core = '
+DIGIT          =  %x30-39 ; 0-9
+; abbreviated here
+'

data/test-data/abnf3.cddl

@@ -0,0 +1,32 @@
+start = [tt, tb, bt, bb]
+
+
+tt = text .abnf '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+tb = text .abnfb '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+bt = bytes .abnf '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+bb = bytes .abnfb '4DIGIT 1FOO
+DIGIT          =  %x30-39 ; 0-9
+FOO = %xc0-cf
+'
+
+; ["7408\xC6", "7073\xC3", h'30383131CD', h'32363738CD']
+; ["5892\u00ca", "2145\u00c6", h'33333338C38B', h'31343033C388']
+
+
+; ** ENCOED UTF-8
+; ** ENCOED UTF-8
+; ** ENCOED UTF-8
+; ** ENCOED UTF-8
+; ["5845\u00c6", "9329\u00cb", h'38393538C389', h'33343230C386']
+
+
+; ["1066\u00cc", "9253\xC9", h'38333533C38A', h'32373337C4']

data/test-data/b64c-sloppy.cddl

@@ -0,0 +1 @@
+a = text .b64c-sloppy 'mnoabcdue=='

data/test-data/b64c.cddl

@@ -0,0 +1 @@
+a = text .b64c 'mnoabcd'

data/test-data/b64u-strict.cddl

@@ -0,0 +1,12 @@
+a = text .b64u bytes
+
+;;gp 10
+
+;;vp "AAAA"
+;;vp "AAA-"
+;;vp "AAA_"
+; fail with 0.11.5:
+;;vp "AAA+"
+;;vp "AAA/"
+;;vp "AAA="
+;;vp "+kd8"

data/test-data/b64u.cddl

@@ -0,0 +1 @@
+a = text .b64u 'mnoabcd'

data/test-data/base32.cddl

@@ -0,0 +1 @@
+a = text .b32 'mnoabcd'

data/test-data/base32hex.cddl

@@ -0,0 +1 @@
+a = text .h32 'mnoabcd'

data/test-data/bat.cddl

@@ -0,0 +1,16 @@
+start = [v1, v2, v3, v4]
+
+v1 = "a" .bat "b"
+
+v2 = "a" .bat " b"
+
+v3 = "a" .bat '
+  oid = 1*arc
+  roid = *arc
+  arc = [nlsb] %x00-7f
+  nlsb = %x81-ff *%x80-ff
+'
+
+bbat<v1, v2> = ("" .bat v1) .bat v2
+
+v4 = bbat<" a", "   b">

data/test-data/cat-re.cddl

@@ -0,0 +1,4 @@
+foo = text .regexp myregexp
+myregexp = "A" .cat "B"
+
+;;gp 10

data/test-data/catb64.cddl

@@ -0,0 +1,8 @@
+a1 = '' .cat a2
+a2 = text .b64u ain
+; a = "e30" .b64u ain
+ain = '{}'
+
+;;gp 3
+;;vp 'e30'
+;;vp "e30"

data/test-data/complex-occ.cddl

@@ -0,0 +1,11 @@
+foo = {
+  2*4 any => any
+}
+
+;;sed -n 's/^; //p' complex-occ.cddl | sh
+; echo '{}' | cddl complex-occ.cddl v -
+; echo '{"1": 2}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4, "4": 5}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4, "4": 5, "5": 6}' | cddl complex-occ.cddl v -

data/test-data/coral.cddl

@@ -0,0 +1,10 @@
+coral = [+ s-exp]
+s-exp = ((text, value, ?coral) // directive)
+value = ctext / cbytes / cint / cfloat / cboolean / cdatetime / null / {"_link": tstr} / {"_form": tstr}
+ctext = text / {"_text": text}
+cint = {"_int": int}
+cfloat = float / {"_float": float}
+cboolean = bool / {"_bool": bool}
+cdatetime = {"_datetime": text}
+cbytes = {"_bytes": text} ; base64url no padding
+directive = (("_using", {* text => text}) // ("_base", text))

data/test-data/coral1.cddl

@@ -0,0 +1,5 @@
+document = {*element}
+element = (relation => value / [2*value])
+
+relation = text
+value = text

data/test-data/coral2.cddl

@@ -0,0 +1,7 @@
+document = {*element}
+element = (text => value / [2*value])
+value = text / float / bool / tagged
+tagged = {"_int":int,*element} / {"_float":float,*element} / {"_text":text,*element} / {"_bytes":bytes,*element} / {"_datetime":text,*element} / {"_bool":bool,*element} / {"_link":ciri,*element} / {"_form":ciri,*element}
+ciri = text ; full IRI given
+     / [text] ; suffix for default prefix
+     / [text, text] ; prefix, suffix for that prefix

data/test-data/coral3.cddl

@@ -0,0 +1,7 @@
+document = {? ("_using" => {* text => text}), *element}
+element = (text => value / [2*value])
+value = text / float / bool / tagged / {*element}
+tagged = {"_int": int, *element} / {"_float": float, *element} / {"_text": text, *element} / {"_bytes": bytes, *element} / {"_datetime": text, *element} / {"_bool": bool, *element} / {"_link": ciri, *element} / {"_form": ciri, *element}
+ciri = text ; full IRI given
+     / [text] ; suffix for default prefix
+     / [text, text] ; prefix, suffix for that prefix

data/test-data/decimal-warn.cddl

@@ -0,0 +1 @@
+s = [text .decimal 4711, text .base10 4712]

data/test-data/decimal.cddl

@@ -0,0 +1 @@
+a = text .decimal uint

data/test-data/decimal2.cddl

@@ -0,0 +1 @@
+a = text .decimal 4711

data/test-data/det1.cddl

@@ -0,0 +1,12 @@
+bar = ["" .cat foo, "" .cat cbor-tags-oid]
+
+foo = '' .det cbor-tags-oid
+
+ cbor-tags-oid = '
+   oid = 1*arc
+   roid = *arc
+   arc = [nlsb] %x00-7f
+   nlsb = %x81-ff *%x80-ff
+ ' .det ''
+
+cbor-tags-oid-decrypted = cbor-tags-oid .det (([]) .det ([]))

data/test-data/dotplus1.cddl

@@ -0,0 +1,3 @@
+a = b<13..15>
+b<T> = #7.<32 .plus T>
+; cddl dotplus1.cddl gp 10

data/test-data/dotplus2.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = #7.<T .plus 32>
+; cddl dotplus.cddl gp 10

data/test-data/dotplus3.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = 32.5 .plus T
+; cddl dotplus4.cddl gp 10

data/test-data/dotplus4.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = T .plus 32.5
+; cddl dotplus4.cddl gp 10

data/test-data/enum.cddl

@@ -0,0 +1,14 @@
+              terminal-color = &basecolors
+              basecolors = (
+                black: 0,  red: 1,  green: 2,  yellow: 3,
+                blue: 4,  magenta: 5,  cyan: 6,  white: 7,
+                reserved: (8..255) .feature "extension"
+              )
+              ; extended-color = &(
+              ;   basecolors,
+              ;   orange: 8,  pink: 9,  purple: 10,  brown: 11,
+              ; )
+
+;;gp 10
+;;vp 42
+;;vp 433

data/test-data/enum1.cddl

@@ -0,0 +1,12 @@
+terminal-color = $terminal-color / text .feature "extension"
+$terminal-color /= &basecolors
+basecolors = (
+               black: "black",  red: "red",  green: "green", 
+             )
+
+pastelcolors = ( pink: "pink", mauve: "mauve", peach: "peach", lavender: "lavender" )
+$terminal-color /= &pastelcolors
+
+;;gp 10
+;;vp "florp"
+;;vp "lavender"

data/test-data/feat1.cddl

@@ -0,0 +1,4 @@
+bla = {
+    a: int
+    ? ("b" .feature "foo") => float
+}

data/test-data/feature-controller.cddl

@@ -0,0 +1,6 @@
+a = b .feature 3
+b = c .feature 3.3
+c = d .feature (["drei", "ok"])
+d = e .feature ([[], "ok"])
+e = f .feature ([1, "ok"])
+f = int .feature (1)

data/test-data/feature-detail.cddl

@@ -0,0 +1,5 @@
+foo = {
+  kind: bar / baz .feature (["foo-extensions", "bazify"])
+}
+bar = int
+baz = text ; complex stuff that doesn't all need to be in the detail

data/test-data/hex.cddl

@@ -0,0 +1 @@
+a = text .hex 'mnoabcd'

data/test-data/hexlc.cddl

@@ -0,0 +1 @@
+a = text .hexlc 'mnoabcd'

data/test-data/hexuc.cddl

@@ -0,0 +1 @@
+a = text .hexuc 'mnoabcd'

data/test-data/homenet-de.cddl

@@ -0,0 +1,12 @@
+   hna-configuration = {
+     "registred_domain" : tstr,
+     "dm"               : tstr,
+     ? "dm_transport" : "53" // "DoT" // "DoH" // "DoQ"
+     ? "dm_port"        : uint,
+     ? "dm_acl"         : hna-acl // [ +hna-acl ]
+     ? "hna_auth_method": hna-auth-method
+     ? "hna_certificate": tstr
+   }
+
+   hna-acl          = tstr
+   hna-auth-method  /= "certificate"

data/test-data/homenet-fe.cddl

@@ -0,0 +1,12 @@
+hna-configuration = {
+  "registered_domain" : tstr,
+  "dm"                : tstr,
+  ? "dm_transport" : "53" / "DoT" / "DoH" / "DoQ"
+  ? "dm_port"        : uint,
+  ? "dm_acl"         : hna-acl / [ +hna-acl ]
+  ? "hna_auth_method": hna-auth-method
+  ? "hna_certificate": tstr
+}
+
+hna-acl          = tstr
+hna-auth-method  /= "certificate"

data/test-data/jim-cut-2.cddl

@@ -0,0 +1,11 @@
+
+map-example = {
+  ? optional-key : int,
+  * map-example-extension,
+  * tstr => any
+}
+
+map-example-extension = ()
+
+map-example-extension //= (another-optional-key : tstr,)
+map-example-extension //= ("and a third" : bstr,)

data/test-data/jim-cut.cddl

@@ -0,0 +1,12 @@
+map-example = {
+  ? "optional-key" : int,
+  map-example-extensions,
+  * tstr => any
+}
+
+map-example-extensions = ()
+
+map-example-extensions //= (
+  "another-optional-key" : tstr,
+ "and a third": bstr
+)

data/test-data/join.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", "c"])

data/test-data/joini.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", 3])

data/test-data/joinx.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", text])

data/test-data/json.cddl

@@ -0,0 +1 @@
+a = text .json ([4, uint .size 1, {"a": "b"}])

data/test-data/json1.cddl

@@ -0,0 +1,15 @@
+; JWT-JWS = text .join ([
+;              b64u<jwt-headers>, ".",
+;              b64u<jwt-payload>, ".",
+;              b64u<jwt-signature>])
+; ; a = jwt-headers
+; ; a = b64u<"abc"> ; fails
+; ; a = b64u<'abc'> ; succeeds
+; b64u<B> = text .b64u B
+jwt-headers = '' .cat jwt-headers1
+jwt-headers1 = text .json jwt-headermap
+jwt-headermap = { * text => any } ; simplified
+jwt-payload = bytes
+jwt-signature = bytes
+
+;;gp 10

data/test-data/json2.cddl

@@ -0,0 +1 @@
+a = text .json ([4, uint .size 2, {"a": "b"}])

data/test-data/jwt.cddl

@@ -0,0 +1,15 @@
+JWT-JWS = text .join ([
+             b64u<jwt-headers>, ".",
+             b64u<jwt-payload>, ".",
+             b64u<jwt-signature>])
+; a = jwt-headers
+; a = b64u<"abc"> ; fails
+; a = b64u<'abc'> ; succeeds
+b64u<B> = text .b64u B
+jwt-headers = '' .cat jwt-headers1
+jwt-headers1 = text .json jwt-headermap
+jwt-headermap = { * text => any } ; simplified
+jwt-payload = bytes
+jwt-signature = bytes
+
+;;gp 10

data/test-data/lint1.cddl

@@ -0,0 +1,9 @@
+$instance-value-choice = (
+  comid.mac-addr => mac-addr-type //
+  comid.ip-addr => ip-addr-type //
+  comid.serial-number => serial-number-type //
+  comid.ueid => ueid //
+  comid.uuid => uuid
+)
+
+; this populates a type socket with a group choice

data/test-data/mdl-ble.cddl

@@ -0,0 +1,9 @@
+BLEIdentification = {
+    ? 0 : bool,
+    ? 1 : bool,
+    ? 10 : bstr,
+; Indicates support for Peripheral server mode
+; Indicates support for Central client mode
+; Optional UUID for peripheral server mode
+    ? 11 : bstr ; Optional MAC address for peripheral server mode 
+}

data/test-data/mdl-deve.cddl

@@ -0,0 +1,54 @@
+deviceEngagement = [
+    uint,
+    security,
+    transferMethods,
+    options,
+    ? proprietary
+]
+security = [
+    bstr,
+uint, uint
+]
+transferMethods = [
+    * transferMethod
+]
+options = {
+    ?"WebAPI" : WebAPI,
+    ?"OIDC" : OIDC,
+    ?"compact" : bool
+}
+proprietary = {
+    * tstr => any
+}
+transferMethod = [
+    uint,
+uint, * any
+]
+OIDC = [
+  uint,
+  tstr,
+  tstr
+]
+WebAPI = [
+  uint,
+  tstr, tstr
+]
+; Version of device engagement structure, currently 1
+; Security structure
+; Transfer methods
+; Optional elements
+; Proprietary elements
+; mDL public ephemeral key, mDL.EPub
+; curve identifier, see Table 23
+; cipher suite identifier, see Table 22
+; details for transfer methods
+; any number of elements
+; type
+; version
+; specific option(s) to the type
+; version
+; url
+; token
+; version
+; url
+; token

data/test-data/mdl-dp.cddl

@@ -0,0 +1,11 @@
+driving_privileges = [
+    * driving_privilege
+]
+driving_privilege  = {
+    vehicle_category_code: tstr
+    ?issue_date: #6.0(tstr)
+    ?expiry_date: #6.0(tstr)
+    ?code: tstr
+    ?sign: tstr
+    ?value: int
+}

data/test-data/mdl-mso.cddl

@@ -0,0 +1,20 @@
+MobileSecurityObject = {
+   "DigestAlgorithm" : tstr,
+   "ValueDigests" : ValueDigests,
+   "DeviceKey" : COSE_Key,
+   "DocType" : tstr
+}
+ValueDigests = {
+    "NameSpaces" : NameSpaces
+}
+NameSpaces = {
+    + NameSpace => DigestIDs
+}
+DigestIDs = {
+    + DigestID => Digest
+}
+NameSpace = tstr
+DigestID = uint
+Digest = bstr
+
+COSE_Key = "COSE_Key"

data/test-data/mdl-request.cddl

@@ -0,0 +1,26 @@
+Request = {
+    "Version" : tstr,
+    "DocRequests" : [+ DocRequest]
+}
+DocRequest = {
+    "ItemsRequest" : ItemsRequest,
+    ? "ReaderAuth" : COSE_Sign1
+}
+ItemsRequest = {
+    ? "DocType" : DocType,
+    "NameSpaces" : NameSpaces,
+    ? "RequestInfo" : {* tstr => any}
+}
+NameSpaces = {
+    + NameSpace => DataItemNames
+}
+DocType = tstr
+NameSpace = tstr
+DataItemNames = [ + tstr ]
+; Additional info the reader wants to provide
+; Requested data elements for each NameSpace
+; See 7.3.2
+; See 7.3.3
+; See Table 2
+
+COSE_Sign1 = "COSE_Sign1"