cddl 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2864bab5890244b179dd65b3508fa3138f9e5a1d7fbb8a3843090c60212a66bf
-  data.tar.gz: 5e501ebd3d42e3236a03375586c64a03d3f6db390fa5827cf91f100d6d8a1e4c
+  metadata.gz: 3c83003981d07eae336683b02bebaa0340f56941724ed6f91d89c6b8baf8f234
+  data.tar.gz: bf5e14489fd50c0b14bd27a99f11c3a35c046ed8113764094d8fc6a7ef4ff0d8
 SHA512:
-  metadata.gz: b973bc02bd23664027c8457f18e123e54f53da345381ec5099fc3b5c1f31d9c540ef765c217f237b43e426ab5ff8514f627230c3674f7fff39331f2f541aee54
-  data.tar.gz: ecb4f59bb8bd4c01a947557229c707f8ff47ebb1b7498cfafb0c5a9ced7b46fd7653186bee6d67585758687dcb0dea7e05d0cc1c5e84399b111fa4484e01a9de
+  metadata.gz: 74f3d9b8cb2f1c188aff29fe9e8dcc3496cb978063e67e7a84932cbe7045163529586547836747237f8f5451b2ffaeaf550165df5aea3003ee9a31c882408488
+  data.tar.gz: b021259524e95100b668a5b335adf85c714f73fbf4b22fd2cd7a84dcc9ea35c227401339c8a40a06f8e46e77d77fa19d2d0240fef60f89703eb66cff0f31ebf1

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.8.9'
+  s.version = '0.8.10'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')

data/lib/cddl.rb

@@ -527,7 +527,7 @@ module CDDL
       end
     end
 
-    VALUE_TYPE = {text: String, int: Integer, float: Float}
+    VALUE_TYPE = {text: String, bytes: String, int: Integer, float: Float}
     SIMPLE_VALUE = {
       [:prim, 7, 20] => [true, false, :bool],
       [:prim, 7, 21] => [true, true, :bool],
@@ -556,6 +556,7 @@ module CDDL
         if warn
           warn "CDDL validation failure (#{result.inspect} for #{d.inspect}):"
           PP::pp(validate_diag, STDERR)
+          puts(validate_diag.cbor_diagnostic)
         end
       end
       result
@@ -745,9 +746,12 @@ module CDDL
           idx, ann = validate_forward(d, 0, where)
           ann if validate_result(idx == d.size) { "#{validate_diag.inspect} -- cannot complete (#{idx}, #{d.size}) array #{d} for #{where}" }
         end
-      when :text, :int, :float, :bytes
+      when :int, :float
         _, v = extract_value(where)
         [] if d == v
+      when :text, :bytes
+        _, v = extract_value(where)
+        [] if d == v && ((d.encoding == Encoding::BINARY) == (v.encoding == Encoding::BINARY))
       when :range
         [] if where[2] === d && where[1].include?(d)
       when :anno
@@ -841,6 +845,14 @@ module CDDL
         when 3
           String === d && d.encoding != Encoding::BINARY # cheat
         when 6
+          if Integer === d
+            t = 2               # assuming only 2/3 match an Integer
+            if d < 0
+              d = ~d
+              t = 3
+            end
+            d = CBOR::Tagged.new(t, d == 0 ? "".b : d.digits(256).reverse!.pack("C*"))
+          end
           CBOR::Tagged === d && d.tag == where[2] && validate1a(d.data, where[3])
         when 7
           t, v = extract_value(where)
@@ -963,7 +975,7 @@ module CDDL
          when ""
            parts[1].b
          when "h"
-           parts[1].gsub(/\s/, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
+           parts[1].gsub(/\s/, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join.b
          when "b64"
             Base64.urlsafe_decode64(parts[1])
          else

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/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/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/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"

data/test-data/mdl-response.cddl

@@ -0,0 +1,66 @@
+Response = {
+    "Version" : tstr,
+    ? "Documents" : Documents,
+    ? "Error" : int
+}
+Documents = {
+    + DocType => ResponseData
+}
+; Version of the structure, currently 1.0
+; Returned documents, may be absent if Error is present
+; Error codes according to Table 8
+ResponseData = {
+    "IssuerSigned" : IssuerSigned,  ; Responded data elements signed by the issuer
+    "DeviceSigned" : DeviceSigned,  ; Responded data elements signed by the mDL
+    "Errors" : Errors
+}
+IssuerSigned = {
+    "NameSpaces" : IssuerNameSpaces,
+    "IssuerAuth" : COSE_Sign1       ; The payload is the MobileSecurityObject, see 9.2.1.4
+}
+IssuerNameSpaces = {
+    + NameSpace => [ + IssuerSignedItem ]
+}
+IssuerSignedItem = [
+    uint,
+    bstr,
+    tstr,
+    any
+]
+DeviceSigned = {
+    "NameSpaces" : DeviceNameSpaces,  ; Currently only online token and URL are defined as DeviceSignedItems
+    "DeviceAuth" : DeviceAuth
+}
+DeviceNameSpaces = {
+    * NameSpace => DeviceSignedItems
+}
+DeviceSignedItems = {
+    + DataItemName => DataItemValue
+}
+DeviceAuth = {
+    "Signature" : COSE_Sign1, //
+                                      ; Use a nil value for the payload, the detached content is the DeviceAuthentication structure, see 9.2.2.4
+    "MAC" : COSE_Mac0
+}
+Errors = {
+    * NameSpace => [ + ErrorItem ]
+}
+ErrorItem = {
+    DataItemName => ErrorCode
+}
+DocType = tstr
+NameSpace = tstr
+DataItemName = tstr
+DataItemValue = any
+ErrorCode = int
+; See table 9
+; See 7.3.2
+; See 7.3.3
+; See Table 2
+; See Table 2
+; Error codes according to Table 9
+; Structures used for DeviceAuth signature or MAC generation, see 9.2.2.4
+; Structures used for MobileSecurityObject, see 9.2.1.4
+
+COSE_Sign1 = "COSE_Sign1"
+COSE_Mac0 = "COSE_Mac0"

data/test-data/mdl.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/mon-val.cddl

@@ -0,0 +1 @@
+decimal-monetary-value = text .regexp "-?[0-9]+(\\.[0-9]+)?"

data/test-data/multipart-ct.cddl

@@ -0,0 +1,2 @@
+multipart-core = [* multipart-part]
+multipart-part = (type: uint .size 2, part: bytes / null)

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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -97,7 +97,9 @@ files:
 - test-data/7071-concise-cut.cddl
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
+- test-data/7807.cddl
 - test-data/a.cddl
+- test-data/abignum.cddl
 - test-data/ambig.cddl
 - test-data/b.cddl
 - test-data/badaddr.cddl
@@ -106,6 +108,10 @@ files:
 - test-data/bpv7a.cddl
 - test-data/bpv7b.cddl
 - test-data/cdni-ct.cddl
+- test-data/coral.cddl
+- test-data/coral1.cddl
+- test-data/coral2.cddl
+- test-data/coral3.cddl
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
@@ -123,11 +129,22 @@ files:
 - test-data/ifmap-metadata-2.2v9_fh-cabo.cddl
 - test-data/ifmap2.cddl
 - test-data/jcr-ex.cddl
+- test-data/jim-cut-2.cddl
+- test-data/jim-cut.cddl
 - test-data/jsoniodef.cddl
 - test-data/kevin5.cddl
 - test-data/map-group.cddl
 - test-data/mapkey.cddl
+- test-data/mdl-ble.cddl
+- test-data/mdl-deve.cddl
+- test-data/mdl-dp.cddl
+- test-data/mdl-mso.cddl
+- test-data/mdl-request.cddl
+- test-data/mdl-response.cddl
+- test-data/mdl.cddl
 - test-data/minimal.cddl
+- test-data/mon-val.cddl
+- test-data/multipart-ct.cddl
 - test-data/named-group.cddl
 - test-data/patch1.cddl
 - test-data/reused_named_group.cddl
@@ -160,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: CDDL generator and validator.