cddl 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e68a03fc0896c89695a52e04ab35f75b4db08bc04f59d02a07868872512c5d0
-  data.tar.gz: 3a590d814827221b6b66ed7ea3297592bb25c65f8a309aba51dd34544de1ae85
+  metadata.gz: 2b496a36874447ba9821e185ef347fd7360ec404f7b1fc3fb33f5d2d94c33443
+  data.tar.gz: be328f5d7b8fe8426bb7b60b11be9d378d6f26f0e3c5598578c75efb5696663a
 SHA512:
-  metadata.gz: da7623036a6b440ff006bec0e3bc1bbac363a776194692339d9a869b561bc80bb576ac76315d902c1c4a95b0bbd52ce5e16b1fa4b53cc4bbaded48de0b3248b8
-  data.tar.gz: 743bae03497658a1e13e8da74f5bed3c5e1be6a9ff5e742f6724611d2b2efeac53fe45e8923e61f14d2c9c5ce6ca3af7f1178aa43490b5d343ea6b37dc655e5a
+  metadata.gz: f8ec72cbdeeb7eb1ecb2b7cd4173af652b06efe76c1ddbb0e8017248f1c9edbec499c7bb6c82099b52fa963f1ac7dd7062ed8e11b0142bcf8197c62166999fb4
+  data.tar.gz: 59cdd71d13a5d9232f5244a644f42f908cd26de059c20f4787ad3e1cae09454145ebff8aa16e69d1efb52bb9387e06940983543b7a3626e76e72188d3f54b13a

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -747,7 +747,7 @@ module CDDL
         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)
@@ -980,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]
@@ -1039,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
@@ -1048,6 +1061,24 @@ 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)
@@ -1163,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

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/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.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -173,6 +173,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
@@ -217,8 +218,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