rasn1 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 379d5a61021e3b58ffb46317f72905e9e3972044
-  data.tar.gz: 60bb0d280cccd6c999744045fb45f334863d46f4
+  metadata.gz: 0fc2ee81216604dd99cf1bd78ab08ddd732bf32f
+  data.tar.gz: 66c4bece600e0a18f447f596c467ed76f5e4bbbc
 SHA512:
-  metadata.gz: beb7960cfdef060b22f81dea31d7b93ece7781afad2b0a7db92606b860e8ff00ab1ae7991a86d5594b97b18b53c2888d6d83f11e4fe6e84abb33cfdddb491d75
-  data.tar.gz: 2fe8288bb99e4c21ead959855e3b0611c182abc6f2e23a8a60ff0babe7ebe62ef9a7795ec8f0512d50792f2e02278b192e8d62879c6f7815836ebb3c2c3287a0
+  metadata.gz: 93cc5dabca26821d3d9a44eab7099d9cd4f2011b250beb25ba97d44371db1eaa4b242b0b459a8bc4232fc0a5022bd762bcd1826edb6335688cae437738900601
+  data.tar.gz: dc6a6cb74e5b0bdb84c3fb3f6faff06a979d7221b0f8caa025a06a193c672ca7c1e2732d1a106f1b7f99ca8b60f7790089832fa5fa8ff845283ccb26ffc750f5

data/lib/rasn1/model.rb

@@ -49,6 +49,13 @@ module RASN1
   #  record2[:a_record][:room] = 43
   # or like this:
   #  record2 = Record2.new(rented: true, a_record: { id: 65537, room: 43 })
+  #
+  # == Delegation
+  # {Model} may delegate some methods to its root element. Thus, if root element
+  # is, for example, a {Types::Choice}, model may delegate +#chosen+ and +#chosen_value+.
+  #
+  # All methods defined by root may be delegated by model, unless model also defines
+  # this method.
   # @author Sylvain Daubert
   class Model
 
@@ -128,6 +135,13 @@ module RASN1
         @root = [name, proc]
       end
 
+      # Give type name (aka class name)
+      # @return [String]
+      def type
+        return @type if @type
+        @type = self.to_s.gsub(/.*::/, '')
+      end
+
       # Parse a DER/BER encoded string
       # @param [String] str
       # @param [Boolean] ber accept BER encoding or not
@@ -154,6 +168,15 @@ module RASN1
       @elements[name]
     end
 
+    # Set value of element +name+. Element should be a {Base}.
+    # @param [String,Symbol] name
+    # @param [Object] value
+    # @return [Object] value
+    def []=(name, value)
+      raise Error, "cannot set value for a Model" if @elements[name].is_a? Model
+      @elements[name].value = value
+    end
+
     # Get name frm root type
     # @return [String,Symbol]
     def name
@@ -183,6 +206,12 @@ module RASN1
       @elements[@root]
     end
 
+    # Give type name (aka class name)
+    # @return [String]
+    def type
+      self.class.type
+    end
+
     # Parse a DER/BER encoded string, and modify object in-place.
     # @param [String] str
     # @param [Boolean] ber accept BER encoding or not
@@ -191,6 +220,16 @@ module RASN1
       @elements[@root].parse!(str.dup.force_encoding('BINARY'), ber: ber)
     end
 
+    # Delegate some methods to root element
+    # @param [Symbol] meth
+    def method_missing(meth, *args)
+      if @elements[@root].respond_to? meth
+        @elements[@root].send meth, *args
+      else
+        super
+      end
+    end
+
     private
 
     def is_composed?(el)

data/lib/rasn1/types/base.rb

@@ -194,6 +194,12 @@ module RASN1
         total_length
       end
 
+      # Give size in octets of encoded value
+      # @return [Integer]
+      def value_size
+        value_to_der.size
+      end
+
 
       private
 

data/lib/rasn1/types/choice.rb

@@ -52,7 +52,12 @@ module RASN1
       # @raise [ChoiceError] {#chosen} not set
       def chosen_value
         check_chosen
-        @value[@chosen].value
+        case @value[@chosen]
+        when Base
+          @value[@chosen].value
+        when Model
+          @value[@chosen]
+        end
       end
 
       # @note {#chosen} MUST be set before calling this method
@@ -76,7 +81,7 @@ module RASN1
             @chosen = i
             nb_bytes = element.parse!(der)
             parsed = true
-            break nb_bytes
+            return nb_bytes
           rescue ASN1Error
             @chosen = nil
             next

data/lib/rasn1/types/ia5string.rb

@@ -0,0 +1,27 @@
+module RASN1
+  module Types
+
+    # ASN.1 IA5 String
+    # @author Sylvain Daubert
+    class IA5String < OctetString
+      TAG = 22
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        self.to_s.gsub(/.*::/, '')
+      end
+
+      private
+      
+      def value_to_der
+        @value.to_s.force_encoding('US-ASCII').force_encoding('BINARY')
+      end
+
+      def der_to_value(der, ber:false)
+        super
+        @value.force_encoding('US-ASCII')
+      end
+     end
+  end
+end

data/lib/rasn1/types/numeric_string.rb

@@ -0,0 +1,34 @@
+module RASN1
+  module Types
+
+    # ASN.1 Numeric String
+    # @author Sylvain Daubert
+    class NumericString < OctetString
+      TAG = 18
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'NumericString'
+      end
+
+      private
+      
+      def value_to_der
+        check_characters
+        @value.to_s.force_encoding('BINARY')
+      end
+
+      def der_to_value(der, ber:false)
+        super
+        check_characters
+      end
+
+      def check_characters
+        if @value.to_s =~ /([^0-9 ])/
+          raise ASN1Error, "NUMERIC STRING #@name: invalid character: '#{$1}'"
+        end
+      end
+    end
+  end
+end

data/lib/rasn1/types/printable_string.rb

@@ -0,0 +1,34 @@
+module RASN1
+  module Types
+
+    # ASN.1 Printable String
+    # @author Sylvain Daubert
+    class PrintableString < OctetString
+      TAG = 19
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'PrintableString'
+      end
+
+      private
+      
+      def value_to_der
+        check_characters
+        @value.to_s.force_encoding('BINARY')
+      end
+
+      def der_to_value(der, ber:false)
+        super
+        check_characters
+      end
+
+      def check_characters
+        if @value.to_s =~ /([^a-zA-Z0-9 '=\(\)\+,\-\.\/:\?])/
+          raise ASN1Error, "PRINTABLE STRING #@name: invalid character: '#{$1}'"
+        end
+      end
+    end
+  end
+end

data/lib/rasn1/types/utf8_string.rb

@@ -6,6 +6,12 @@ module RASN1
     class Utf8String < OctetString
       TAG = 12
 
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'UTF8String'
+      end
+
       private
       
       def value_to_der
@@ -13,7 +19,8 @@ module RASN1
       end
 
       def der_to_value(der, ber:false)
-        @value = der.force_encoding('UTF-8')
+        super
+        @value.force_encoding('UTF-8')
       end
     end
   end

data/lib/rasn1/types/visible_string.rb

@@ -0,0 +1,10 @@
+module RASN1
+  module Types
+
+    # ASN.1 Visible String
+    # @author Sylvain Daubert
+    class VisibleString < IA5String
+      TAG = 26
+   end
+  end
+end

data/lib/rasn1/types.rb

@@ -29,6 +29,10 @@ require_relative 'types/null'
 require_relative 'types/object_id'
 require_relative 'types/enumerated'
 require_relative 'types/utf8_string'
+require_relative 'types/numeric_string'
+require_relative 'types/printable_string'
+require_relative 'types/ia5string'
+require_relative 'types/visible_string'
 require_relative 'types/constructed'
 require_relative 'types/sequence'
 require_relative 'types/sequence_of'

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -102,17 +102,21 @@ files:
 - lib/rasn1/types/choice.rb
 - lib/rasn1/types/constructed.rb
 - lib/rasn1/types/enumerated.rb
+- lib/rasn1/types/ia5string.rb
 - lib/rasn1/types/integer.rb
 - lib/rasn1/types/null.rb
+- lib/rasn1/types/numeric_string.rb
 - lib/rasn1/types/object_id.rb
 - lib/rasn1/types/octet_string.rb
 - lib/rasn1/types/primitive.rb
+- lib/rasn1/types/printable_string.rb
 - lib/rasn1/types/sequence.rb
 - lib/rasn1/types/sequence_of.rb
 - lib/rasn1/types/set.rb
 - lib/rasn1/types/set_of.rb
 - lib/rasn1/types/set_spec.rb
 - lib/rasn1/types/utf8_string.rb
+- lib/rasn1/types/visible_string.rb
 - lib/rasn1/version.rb
 - rasn1.gemspec
 homepage: https://github.com/sdaubert/rasn1