cddl 0.8.8 → 0.10.3

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.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/bpv7.cddl

@@ -0,0 +1,136 @@
+   start = bundle
+
+   dtn-time = uint
+
+   creation-timestamp = [dtn-time, sequence: uint]
+
+   eid-generic = [uri-code, SSP: any]
+
+   uri-code = uint
+
+   eid = eid-choice .within eid-generic
+
+   eid-choice /= [dtn-code, SSP: (text / 0)]
+
+   dtn-code = 1 ; TBD
+
+   eid-choice /= [ipn-code, SSP: [nodenum: uint, servicenum: uint]]
+
+   ipn-code = 2 ; TBD
+
+   bundle-control-flags = uint .bits bundleflagbits
+
+   bundleflagbits = &(
+
+     reserved: 15
+
+     reserved: 14
+
+     reserved: 13
+
+     bundle-deletion-status-reports-are-requested: 12
+
+     bundle-delivery-status-reports-are-requested: 11
+
+     bundle-forwarding-status-reports-are-requested: 10
+
+     reserved: 9
+
+     bundle-reception-status-reports-are-requested: 8
+
+     bundle-contains-a-Manifest-block: 7
+
+     status-time-is-requested-in-all-status-reports: 6
+
+     user-application-acknowledgement-is-requested: 5
+
+     reserved: 4
+
+     reserved: 3
+
+     bundle-must-not-be-fragmented: 2
+
+     payload-is-an-administrative-record: 1
+
+     bundle-is-a-fragment: 0
+
+   )
+
+   crc = bytes
+
+   block-control-flags = uint .bits blockflagbits
+
+   blockflagbits = &(
+
+     reserved: 7
+
+     reserved: 6
+
+     reserved: 5
+
+     reserved: 4
+
+     bundle-must-be-deleted-if-block-cannot-be-processed: 3
+
+     status-report-must-be-transmitted-if-block-cannot-be-processed: 2
+
+     block-must-be-removed-from-bundle-if-it-cannot-be-processed: 1
+
+     block-must-be-replicated-in-every-fragment: 0
+
+   )
+
+   bundle = [primary-block, *extension-block, payload-block]
+
+   primary-block = [
+
+                 version: 7,
+
+                 bundle-control-flags,
+
+                 crc-type: uint,
+
+                 destination: eid,
+
+                 source-node: eid,
+
+                 report-to: eid,
+
+                 creation-timestamp,
+
+                 lifetime: uint,
+
+                 ? fragment-offset: uint,
+
+                 ? total-application-data-length: uint,
+
+                 ? crc,
+
+   ]
+
+   canonical-block = [
+
+                           block-type-code: uint,
+
+                           canonical-block-common,
+
+                           ? crc
+
+   ]
+
+   canonical-block-common = (
+
+                          block-number: uint,
+
+                          block-control-flags,
+
+                          crc-type: uint,
+
+                          block-type-specific-data: bytes
+
+   )
+
+
+payload-block = ([block-type-code: 1, canonical-block-common, ?crc]) .within canonical-block
+
+extension-block = ([block-type-code: (uint .ne 1), canonical-block-common, ?crc]) .within canonical-block

data/test-data/bpv7a.cddl

@@ -0,0 +1,181 @@
+start = bundle / #6.55799(bundle)
+
+; Times before 2000 are invalid
+dtn-time = uint
+
+; CRC enumerated type
+crc-type = 0 / 1 / 2
+; Either 16-bit or 32-bit
+crc-value = (bstr .size 2) / (bstr .size 4)
+
+creation-timestamp = [dtn-time, sequence: uint]
+
+eid = $eid-choice .within eid-structure
+eid-structure = [
+ uri-code: uint,
+ SSP: any
+]
+$eid-choice /= [
+ uri-code: 1,
+ SSP: (tstr / 0)
+]
+$eid-choice /= [
+ uri-code: 2,
+ SSP: [
+   nodenum: uint,
+   servicenum: uint
+ ]
+]
+
+bundle-control-flags = uint .bits bundleflagbits
+bundleflagbits = &(
+ reserved: 15
+ reserved: 14
+ reserved: 13
+ bundle-deletion-status-reports-are-requested: 12
+ bundle-delivery-status-reports-are-requested: 11
+ bundle-forwarding-status-reports-are-requested: 10
+ reserved: 9
+ bundle-reception-status-reports-are-requested: 8
+ bundle-contains-a-Manifest-block: 7
+ status-time-is-requested-in-all-status-reports: 6
+ user-application-acknowledgement-is-requested: 5
+ reserved: 4
+ reserved: 3
+ bundle-must-not-be-fragmented: 2
+ payload-is-an-administrative-record: 1
+ bundle-is-a-fragment: 0
+)
+
+block-control-flags = uint .bits blockflagbits
+blockflagbits = &(
+ reserved: 7
+ reserved: 6
+ reserved: 5
+ reserved: 4
+ bundle-must-be-deleted-if-block-cannot-be-processed: 3
+ status-report-must-be-transmitted-if-block-cannot-be-processed: 2
+ block-must-be-removed-from-bundle-if-it-cannot-be-processed: 1
+ block-must-be-replicated-in-every-fragment: 0
+)
+
+bundle = [primary-block, *extension-block, payload-block]
+
+primary-block = [
+ version: 7,
+ bundle-control-flags,
+ crc-type,
+ destination: eid,
+ source-node: eid,
+ report-to: eid,
+ creation-timestamp,
+ lifetime: uint,
+ ? (
+   fragment-offset: uint,
+;    total-application-data-length: uint,
+ )
+ ? crc-value,
+]
+
+; Abstract shared structure of all non-primary blocks
+canonical-block-structure = [
+ block-type-code: uint,
+ block-number: uint,
+ block-control-flags,
+ crc-type,
+ ; Each block type defines the content within the bytestring
+ block-type-specific-data,
+ ? crc-value
+]
+block-type-specific-data = bstr / #6.24(bstr)
+; Extension block type, which does not specialize any more than the code/number
+extension-block = $extension-block-structure .within canonical-block-structure
+$extension-block-structure = [
+ block-type-code: (uint .gt 1),
+ extension-block-number,
+ block-control-flags,
+ crc-type,
+ ($extension-block-data .within block-type-specific-data)
+ ? crc-value
+]
+extension-block-number = (uint .ne 0)
+; Payload block type
+payload-block = payload-block-structure .within canonical-block-structure
+payload-block-structure = [
+ block-type-code: 1,
+ block-number: 0,
+ block-control-flags,
+ crc-type,
+ ($payload-block-data .within block-type-specific-data)
+ ? crc-value
+]
+
+; Arbitrary payload data
+$payload-block-data /= bstr
+
+
+; Administrative record as a payload data specialization
+$payload-block-data /= block-type-specific-data .cbor admin-record
+admin-record = $admin-record .within admin-record-structure
+admin-record-structure = [
+ record-type-code: uint,
+ record-content: any
+]
+; Only one defined record type
+$admin-record /= [1, status-record-content]
+status-record-content = [
+ bundle-status-information,
+ status-report-reason-code: uint,
+ source-node-eid: eid,
+ subject-creation-timestamp: creation-timestamp,
+ ? (
+   subject-payload-offset: uint,
+   subject-payload-length: uint
+ )
+]
+bundle-status-information = [
+ reporting-node-received-bundle: status-info-content,
+ reporting-node-forwarded-bundle: status-info-content,
+ reporting-node-delivered-bundle: status-info-content,
+ reporting-node-deleted-bundle: status-info-content
+]
+status-info-content = [
+ status-indicator: bool,
+ ? timestamp: dtn-time
+]
+
+; Previous Node extension block
+$extension-block-structure /= [
+ block-type-code: 7,
+ extension-block-number,
+ block-control-flags,
+ crc-type,
+ (block-type-specific-data .cbor ext-data-previous-node)
+ ? crc-value
+]
+ext-data-previous-node = eid
+
+; Bundle Age extension block
+$extension-block-structure /= [
+ block-type-code: 8,
+ extension-block-number,
+ block-control-flags,
+ crc-type,
+ (block-type-specific-data .cbor ext-data-bundle-age)
+ ? crc-value
+]
+ext-data-bundle-age = uint
+
+; Hop Count extension block
+$extension-block-structure /= [
+ block-type-code: 9,
+ extension-block-number,
+ block-control-flags,
+ crc-type,
+ (block-type-specific-data .cbor ext-data-hop-count)
+ ? crc-value
+]
+ext-data-hop-count = [
+ hop-limit: uint,
+ hop-count: uint
+]

data/test-data/bpv7b.cddl

@@ -0,0 +1,167 @@
+start = bundle / #6.55799(bundle)
+
+; Times before 2000 are invalid
+dtn-time = uint
+
+; CRC enumerated type
+crc-type = 0 / 1 / 2
+; Either 16-bit or 32-bit
+crc-value = (bstr .size 2) / (bstr .size 4)
+
+creation-timestamp = [dtn-time, sequence: uint]
+
+eid = $eid-choice .within eid-structure
+eid-structure = [
+  uri-code: uint,
+  SSP: any
+]
+$eid-choice /= [
+  uri-code: 1,
+  SSP: (tstr / 0)
+]
+$eid-choice /= [
+  uri-code: 2,
+  SSP: [
+    nodenum: uint,
+    servicenum: uint
+  ]
+]
+
+; The root bundle array
+bundle = [primary-block, *extension-block, payload-block]
+
+primary-block = [
+  version: 7,
+  bundle-control-flags,
+  crc-type,
+  destination: eid,
+  source-node: eid,
+  report-to: eid,
+  creation-timestamp,
+  lifetime: uint,
+  ? (
+    fragment-offset: uint,
+    total-application-data-length: uint,
+  )
+  ? crc-value,
+]
+bundle-control-flags = uint .bits bundleflagbits
+bundleflagbits = &(
+  reserved: 15,
+  reserved: 14,
+  reserved: 13,
+  bundle-deletion-status-reports-are-requested: 12,
+  bundle-delivery-status-reports-are-requested: 11,
+  bundle-forwarding-status-reports-are-requested: 10,
+  reserved: 9,
+  bundle-reception-status-reports-are-requested: 8,
+  bundle-contains-a-Manifest-block: 7,
+  status-time-is-requested-in-all-status-reports: 6,
+  user-application-acknowledgement-is-requested: 5,
+  reserved: 4,
+  reserved: 3,
+  bundle-must-not-be-fragmented: 2,
+  payload-is-an-administrative-record: 1,
+  bundle-is-a-fragment: 0
+)
+
+; Abstract shared structure of all non-primary blocks
+canonical-block-structure = [
+  block-type-code: uint,
+  block-number: uint,
+  block-control-flags,
+  crc-type,
+  ; Each block type defines the content within the bytestring
+  block-type-specific-data,
+  ? crc-value
+]
+block-control-flags = uint .bits blockflagbits
+blockflagbits = &(
+  reserved: 7,
+  reserved: 6,
+  reserved: 5,
+  reserved: 4,
+  bundle-must-be-deleted-if-block-cannot-be-processed: 3,
+  status-report-must-be-transmitted-if-block-cannot-be-processed: 2,
+  block-must-be-removed-from-bundle-if-it-cannot-be-processed: 1,
+  block-must-be-replicated-in-every-fragment: 0
+)
+block-type-specific-data = bstr / #6.24(bstr)
+; Actual CBOR data embedded in a bytestring, with optional tag to indicate so
+embedded-cbor<Item> = (bstr .cbor Item) / #6.24(bstr .cbor Item)
+
+; Extension block type, which does not specialize other than the code/number
+extension-block = $extension-block-structure .within canonical-block-structure
+; Generic shared structure of all non-primary blocks
+extension-block-use<CodeValue, BlockData> = [
+  block-type-code: CodeValue,
+  block-number: (uint .ne 0),
+  block-control-flags,
+  crc-type,
+  BlockData,
+  ? crc-value
+]
+
+; Payload block type
+payload-block = payload-block-structure .within canonical-block-structure
+payload-block-structure = [
+  block-type-code: 1,
+  block-number: 0,
+  block-control-flags,
+  crc-type,
+  $payload-block-data,
+  ? crc-value
+]
+
+; Arbitrary payload data, including non-CBOR bytestring
+$payload-block-data /= block-type-specific-data
+
+
+; Administrative record as a payload data specialization
+$payload-block-data /= embedded-cbor<admin-record>
+admin-record = $admin-record .within admin-record-structure
+admin-record-structure = [
+  record-type-code: uint,
+  record-content: any
+]
+; Only one defined record type
+$admin-record /= [1, status-record-content]
+status-record-content = [
+  bundle-status-information,
+  status-report-reason-code: uint,
+  source-node-eid: eid,
+  subject-creation-timestamp: creation-timestamp,
+  ? (
+    subject-payload-offset: uint,
+    subject-payload-length: uint
+  )
+]
+bundle-status-information = [
+  reporting-node-received-bundle: status-info-content,
+  reporting-node-forwarded-bundle: status-info-content,
+  reporting-node-delivered-bundle: status-info-content,
+  reporting-node-deleted-bundle: status-info-content
+]
+status-info-content = [
+  status-indicator: bool,
+  ? timestamp: dtn-time
+]
+
+
+; Previous Node extension block
+$extension-block-structure /=
+  extension-block-use<7, embedded-cbor<ext-data-previous-node>>
+ext-data-previous-node = eid
+
+; Bundle Age extension block
+$extension-block-structure /= 
+  extension-block-use<8, embedded-cbor<ext-data-bundle-age>>
+ext-data-bundle-age = uint
+
+; Hop Count extension block
+$extension-block-structure /=
+  extension-block-use<9, embedded-cbor<ext-data-hop-count>>
+ext-data-hop-count = [
+  hop-limit: uint,
+  hop-count: uint
+]

data/test-data/cat-re.cddl

@@ -0,0 +1,2 @@
+foo = text .regexp myregexp
+myregexp = "A" .cat "B"

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 -