cddl 0.10.7 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd34ee2aa2fc9a5d0d504d0dc48222f4e94722b4e19086d4932b8bcc82980e92
-  data.tar.gz: b397db50185a9f899c6b3d4bc9ce63946a1f57c6989cb7cf55215eb1d6da9868
+  metadata.gz: 652f1e63847fbed19fceeca1ed0b695b25b5f8aa6d312b2bd17f21c0ac7c6549
+  data.tar.gz: d55f4a0bff69a37b1c6101b11eb003eb93c00df24ede1dded8d7be9844b4afb1
 SHA512:
-  metadata.gz: 96be7107033f0e3ef5da1ee747738bcd712eeb5af8230e11f128d64d0649920c8d15f5f4a13c5ccfb0ececad19dac7da1a145337f6e1a322ffe3573d7af4c689
-  data.tar.gz: d3edd46ef0698fde296cb18509101f98700568c942652e77e6d36abdd7a9a79e27d2fb920a3a5efc46160466feff0ecaa0ae0fda45411a94d234ed4ace037deb
+  metadata.gz: 6622daf044d0f5a6d0ce4fe90ac57341526f7723aef0ce49e228edd2284711a44302ab0c3a1a28e3e156676db61afb4477a9b97b27269e1509034c41796ca8b9
+  data.tar.gz: 966fd633edc283925e0e4bbb5ca04cb40de60470044bbbd94e7df41fb05c185f59ff09ae4767d5dea2899491d3f82db50d3feb01a585fe03891d60f073e50557

data/bin/cddl

@@ -7,10 +7,13 @@ require 'json'
 
 Encoding.default_external = "UTF-8" # wake up, smell the coffee
 
+CDDL_VERSION = Gem.loaded_specs["cddl"].version rescue "unknown-version"
+
 EX_USAGE = 64
 EX_DATAERR = 65
 
 def usage
+  warn "cddl tool version #{CDDL_VERSION}"
   warn "Usage:"
   warn "#$0 spec.cddl generate [n]"
   warn "#$0 spec.cddl json-generate [n]"

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -13,7 +13,8 @@ genericarg = "<" S type1 S *("," S type1 S ) ">"
 type = type1 S *("/" S type1 S)
 
 type1 = type2 [S (rangeop / annotator) S type2]
-     / "#" "6" ["." tagnumber] "(" S type S ")" ; note no space!
+     / "#" "6" ["." headnumber] "(" S type S ")" ; note no space!
+     / "#" "7" ["." headnumber]             ; note no space!
      / "#" DIGIT ["." uint]                ; major/ai
      / "#"                                 ; any
      / "~" S typename [genericarg]
@@ -22,7 +23,7 @@ type1 = type2 [S (rangeop / annotator) S type2]
      / "&" S "(" S group S ")"
      / "&" S groupname [genericarg]
 
-tagnumber = uint / ("<" type ">")
+headnumber = uint / ("<" type ">")
 
 type2 = value
       / typename [genericarg]

data/lib/cddl.rb

@@ -2,6 +2,7 @@ require 'abnc'
 require 'pp'
 require 'pathname'
 require 'cbor-pure' unless defined?(CBOR::Tagged)
+require 'half'
 require 'cbor-deterministic'
 require 'regexp-examples'
 require 'abnftt'
@@ -429,7 +430,11 @@ module CDDL
           end
           CBOR::Tagged.new(tn, generate1(where[3]))
         when 7
-          case where[2]
+          w2 = where[2]
+          if Array === w2
+            w2 = generate1(w2)
+          end
+          case w2
           when nil
             Math::PI
           when 20
@@ -439,9 +444,21 @@ module CDDL
           when 22
             nil
           when 0..19, 23, 32..255
-            CBOR::Simple.new(where[2])
-          when 25, 26, 27
-            rand()
+            CBOR::Simple.new(w2)
+          when 25
+            while !(hs = Half.encode_from_single_bytes([rand()].pack("g")))
+            end
+            Half.decode(hs)
+          when 26
+            while (a = [rand()].pack("g").unpack("g").first).to_cbor.size != 5
+            end
+            a
+          when 27
+            while (a = rand()).to_cbor.size != 9
+            end
+            a
+          else
+            fail "Can't generate prim #7.#{where[2].inspect}" # XXX retry array generate
           end
         else
           fail "Can't generate prim #{where[1]}"
@@ -710,20 +727,27 @@ module CDDL
       [:prim, 7, 22] => [true, nil, :nil],
     }
     SIMPLE_VALUE_SIMPLE = Set[23] + (0..19) + (32..255)
-    SIMPLE_VALUE.default_proc = proc { |hash, t|
-      if t[0] == :prim && t[1] == 7 && SIMPLE_VALUE_SIMPLE.include?(t[2])
-        [true, CBOR::Simple.new(t[2]), :simple]
-      end
-    }
 
     def extract_value(t)        # []
       if vt = VALUE_TYPE[t[0]]
         [true, t[1], vt]
-      elsif v = SIMPLE_VALUE[t]
-        v
+      elsif t[0] == :prim && t[1] == 7
+        case t2 = t[2]
+        when Integer
+        when Array
+          a, b, c = extract_value(t2)
+          if a && c == Integer
+            t2 = b
+          end
+        end
+        if v = SIMPLE_VALUE[[:prim, 7, t2]]
+          v
+        elsif SIMPLE_VALUE_SIMPLE === t2
+          [true, CBOR::Simple.new(t2), :simple]
+        end
       elsif t[0] == :anno
         _, conop, target, control = t
-        # warn ["EXV0", conop, target, control].inspect
+        warn ["EXV0", conop, target, control].inspect   if ENV["CDDL_TRACE"]
         if conop == :cat || conop == :plus || conop == :det
           ok1, v1, vt1 = extract_value(target)
           ok2, v2, vt2 = extract_value(control)
@@ -956,6 +980,19 @@ module CDDL
       }
     end
 
+    def validate1a_ignore_encoding(d, where)
+      if String === d
+        validate1a(d.force_encoding(Encoding::BINARY), where) or (
+          text = d.force_encoding(Encoding::UTF_8).scrub {
+            fail "can't use bytes as text"
+          } rescue :NOT_A_TEXT_STRING
+          validate1a(text, where)
+        )
+      else
+        validate1a(d, where)
+      end
+    end
+
     def validate1a(d, where)
       if ann = validate1(d, where)
         here = [d, where]
@@ -968,6 +1005,7 @@ module CDDL
     end
 
     OPERATORS = {lt: :<, le: :<=, gt: :>, ge: :>=, eq: :==, ne: :!=}
+    FLOAT_AI_FROM_SIZE = {3 => 25, 5 => 26, 9 => 27}
 
     def validate1(d, where)
       if ENV["CDDL_TRACE"]
@@ -1014,7 +1052,7 @@ module CDDL
         if conop == :cat || conop == :plus || conop == :det
           ok1, v1, vt1 = extract_value(target)
           ok2, v2, vt2 = extract_value(control)
-          # warn ["ANNO0", ok1, v1, vt1, ok2, v2, vt2, d].inspect
+          warn ["ANNO0", ok1, v1, vt1, ok2, v2, vt2, d].inspect  if ENV["CDDL_TRACE"]
           if ok1 && ok2
             v2 = Integer(v2) if vt1 == Integer
             if conop == :det
@@ -1023,6 +1061,30 @@ module CDDL
             end
             # warn ["ANNO", ok1, v1, vt1, ok2, v2, vt2, d].inspect
             [] if d == v1 + v2  # XXX Focus ArgumentError
+          elsif conop == :cat && String === d
+            warn ["CAT-L", ok1, v1, vt1, ok2, v2, vt2, d].inspect  if ENV["CDDL_TRACE"]
+            if ok1 && vt1 == String
+              # d and lhs (v1) need to agree in encoding
+              if d.encoding == v1.encoding
+                if d[0...v1.length] == v1
+                  d2 = d[v1.length..-1]
+                  warn ["CAT-L1", d2, d2.encoding, control].inspect  if ENV["CDDL_TRACE"]
+                  validate1a_ignore_encoding(d2, control)
+                end
+              end
+            elsif ok2 && vt2 == String
+            warn ["CAT-R", ok1, v1, vt1, ok2, v2, vt2, d].inspect  if ENV["CDDL_TRACE"]
+              if d[-v2.length..-1] == v2
+                d1 = d[0...-v2.length]
+                validate1a(d1, control)
+              end
+            end
+          elsif conop == :plus && Integer === d
+            if ok1 && vt1 == Integer
+              validate1a(d - Integer(v1), control)
+            elsif ok2 && vt2 == Integer
+              validate1a(d - Integer(v2), target)
+            end
           end
         elsif ann = validate1a(d, target)
           case conop
@@ -1132,14 +1194,75 @@ module CDDL
                 end
               )
           when :join
-            ok, *v = extract_array(control)
-            # warn "@@@JJJ@@@ #{ok.inspect} #{v.inspect}"
-            if ok
-              expected = v.map {|ve|
-                fail "Not a string in #{where}" unless String === ve[0]
-                ve[0]
-              }.join
-              ann if d == expected
+            t = control
+            v = if t[0] == :array
+                  t[1..-1].map { |el|
+                    if el[0..2] == [:member, 1, 1]
+                      ok, v, vt = extract_value(el[4])
+                      if ok
+                        [true, v, vt]
+                      else
+                        [false, el[4]]
+                      end
+                    end
+                  }
+                end
+            warn "@@@JOIN@@@ #{v.inspect}" if ENV["CDDL_TRACE"]
+            ok = true
+            if v
+              ix = 0
+              rest = d.dup
+              while ix < v.length
+                if left = v[ix]
+                  if left[0]    # match constant value first
+                    fail "Not a string for #{left.inspect} in #{where}" unless String == left[2]
+                    want = left[1]
+                    have = rest[0...left[1].length]
+                    if want == have
+                      rest[0...left[1].length] = ''
+                      ix += 1
+                      next
+                    else
+                      fail ".join: want #{want.inspect}, have #{have.inspect}"
+                    end
+                  else
+                    ix += 1
+                    if ix == v.length # match remaining
+                      warn "@@@JOIN ok in #{ok.inspect} rest #{rest.inspect}"  if ENV["CDDL_TRACE"]
+                      ok &&= validate1(rest, left[1])
+                      warn "@@@JOIN ok out #{ok.inspect}"  if ENV["CDDL_TRACE"]
+                      # more diag
+                      rest = ''
+                      next
+                    else
+                      if mid = v[ix]
+                        if mid[0] # have constant value to split over
+                          fail "Not a string for #{mid} in #{where}" unless String == mid[2]
+                          rest1, rest2 = rest.split(mid[1], 2)
+                          if rest2
+                            warn "@@@JOIN ok in #{ok.inspect} rest1 #{rest1.inspect}"   if ENV["CDDL_TRACE"]
+                            ok &&= validate1(rest1, left[1])
+                            warn "@@@JOIN ok out #{ok.inspect}"   if ENV["CDDL_TRACE"]
+                            rest = rest2
+                            ix += 1
+                            next
+                          else
+                            fail "Can't find #{mid[1].inspect} in #{rest.inspect}"
+                          end
+                        else
+                          fail "Cannot validate consecutive non-constant members of .join in #{where}"
+                        end
+                      else
+                        fail "Cannot handle .join over #{t[ix+1]} in #{where}"
+                      end
+                    end
+                  end
+                else
+                  fail "Cannot handle .join over #{t[ix+1]} in #{where}"
+                end
+              end
+              fail "Can't match #{rest.inspect} for .join in #{where}" if rest != ''
+              ann if ok
             else
               fail "Don't know yet how to validate against #{where}"
             end
@@ -1148,7 +1271,7 @@ module CDDL
                 String === d && (
                 decoded = case conop
                     when :b64u
-                      /=/ !~ d &&
+                      /[+\/=]/ !~ d &&
                       Base64.urlsafe_decode64(d)
                     when :"b64u-sloppy"
                       /[-_=]/ !~ d &&
@@ -1235,12 +1358,25 @@ module CDDL
           if t
             v.eql? d
           else
-            case where[2]
+            case w2 = where[2]
             when nil
-              # XXX
-              fail [:valnil, d, where].inspect
+              Float === d || CBOR::Simple === d || [false, true, nil].include?(d)
+            when Array
+              headnum = case d
+                        when Float
+                          FLOAT_AI_FROM_SIZE[d.to_cbor.size]
+                        when false
+                          20
+                        when true
+                          21
+                        when nil
+                          22
+                        when CBOR::Simple
+                          d.value
+                        end
+              validate1a(headnum, w2)
             when 25, 26, 27
-              Float === d
+              Float === d && FLOAT_AI_FROM_SIZE[d.to_cbor.size] == w2
             else
               fail [:val7, d, where].inspect
             end
@@ -1589,7 +1725,7 @@ module CDDL
         when /\A#(\d+)/
           maj = $1.to_i
           s = [:prim, maj, *n.children(:uint).map(&:to_s).map(&:to_i)]
-          if tn = n.tagnumber
+          if tn = n.headnumber
             if ui = tn.uint
               s << ui.to_s.to_i
             elsif tt = tn.type

data/test-data/b64u-strict.cddl

@@ -0,0 +1,10 @@
+a = text .b64u bytes
+
+;;gp 10
+
+;;vp "AAAA"
+;;vp "AAA-"
+;;vp "AAA_"
+;;vp "AAA+"
+;;vp "AAA/"
+;;vp "AAA="

data/test-data/cat-re.cddl

@@ -1,2 +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/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/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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.11.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -163,6 +163,7 @@ files:
 - test-data/b.cddl
 - test-data/b64c-sloppy.cddl
 - test-data/b64c.cddl
+- test-data/b64u-strict.cddl
 - test-data/b64u.cddl
 - test-data/badaddr.cddl
 - test-data/base32.cddl
@@ -173,6 +174,7 @@ files:
 - test-data/bpv7a.cddl
 - test-data/bpv7b.cddl
 - test-data/cat-re.cddl
+- test-data/catb64.cddl
 - test-data/cdni-ct.cddl
 - test-data/complex-occ.cddl
 - test-data/coral.cddl
@@ -185,7 +187,13 @@ files:
 - test-data/decimal.cddl
 - test-data/decimal2.cddl
 - test-data/det1.cddl
+- test-data/dotplus1.cddl
+- test-data/dotplus2.cddl
+- test-data/dotplus3.cddl
+- test-data/dotplus4.cddl
 - test-data/dotsize.cddl
+- test-data/enum.cddl
+- test-data/enum1.cddl
 - test-data/extractor-demo.cddl
 - test-data/feat1.cddl
 - test-data/feature-controller.cddl
@@ -213,8 +221,10 @@ files:
 - test-data/joini.cddl
 - test-data/joinx.cddl
 - test-data/json.cddl
+- test-data/json1.cddl
 - test-data/json2.cddl
 - test-data/jsoniodef.cddl
+- test-data/jwt.cddl
 - test-data/kevin5.cddl
 - test-data/lint1.cddl
 - test-data/map-group.cddl
@@ -280,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.