virgil-sdk 4.2.4 → 4.2.5

data/lib/virgil/sdk/client/card.rb

@@ -40,9 +40,8 @@ module Virgil
       Card = Struct.new(:id, :snapshot, :identity,
                         :identity_type, :public_key, :scope,
                         :data, :device, :device_name, :version,
-                        :signatures, :validation_token) do
+                        :signatures, :validation_token, :relations) do
 
-        extend SignaturesBase64
 
         def initialize(options)
           self.id = options[:id]
@@ -56,6 +55,7 @@ module Virgil
           self.device_name = options[:device_name]
           self.version = options[:version]
           self.signatures = options[:signatures] || {}
+          self.relations = options[:relations] || {}
         end
 
         # Create new Card from response containing json-encoded snapshot.
@@ -81,7 +81,8 @@ module Virgil
               data: snapshot_model.fetch("data", {}),
               scope: snapshot_model["scope"],
               version: response["meta"]["card_version"],
-              signatures: response["meta"]["signs"]
+              signatures: response["meta"]["signs"],
+              relations: response["meta"]["relations"]
           )
         end
 
@@ -90,7 +91,7 @@ module Virgil
 
         def to_request
           request = Virgil::SDK::Client::Requests::CreateCardRequest.new({})
-          request.restore(Crypto::Bytes.from_string(self.snapshot), self.signatures, validation_token)
+          request.restore(Crypto::Bytes.from_string(snapshot), signatures, validation_token, relations)
           request
         end
 
@@ -119,7 +120,8 @@ module Virgil
               device_name: info["device_name"],
               data: snapshot_model.fetch("data", {}),
               scope: snapshot_model["scope"],
-              signatures: meta[:signs]
+              signatures: meta[:signs],
+              relations: meta[:relations]
           )
         end
 
@@ -132,9 +134,9 @@ module Virgil
 
 
 
-      Card::SERVICE_URL = ENV["VIRGIL_SERVICE_URL"] || "https://ra.virgilsecurity.com"
+      Card::SERVICE_URL = ENV["VIRGIL_SERVICE_URL"] || "https://cards.virgilsecurity.com"
       Card::READ_ONLY_SERVICE_URL = ENV["VIRGIL_READ_ONLY_SERVICE_URL"] || "https://cards-ro.virgilsecurity.com"
-
+      Card::RA_SERVICE_URL = ENV["VIRGIL_RA_SERVICE_URL"] || "https://ra.virgilsecurity.com"
       Card::VRA_VERSION = "v1" # version of service, which creates and deletes local and global cards
       Card::VC_VERSION = "v4" # version of service, which gets, searchs card
     end

data/lib/virgil/sdk/client/http/cards_service_connection.rb

@@ -83,6 +83,12 @@ module Virgil
               30141 => "SCR one of signers Virgil Cards is not found",
               30142 => "SCR sign item is invalid or missing for the Client",
               30143 => "SCR sign item is invalid or missing for the Virgil Registration Authority service",
+              30200 => "Virgil Card relation sign is invalid",
+              30201 => "Virgil Card relation sign by the source Virgil Card was not found",
+              30202 => "Related Virgil content snapshot parameter was not found",
+              30203 => "The relation with this Virgil Card exists already",
+              30204 => "The related Virgil Card was not found for the provided CSR",
+              30205 => "The Virgil Card relation doesn't exist",
               30300 => "Development Portal sign was not found inside the meta.signs property",
               30301 => "Development Portal sign is invalid",
               30302 => "VirgilIdentity Validation Token is invalid or has expired",

data/lib/virgil/sdk/client/requests.rb

@@ -44,6 +44,10 @@ module Virgil
                  'virgil/sdk/client/requests/verify_identity_request'
         autoload :ConfirmIdentityRequest,
                   'virgil/sdk/client/requests/confirm_identity_request'
+        autoload :AddRelationRequest,
+                 'virgil/sdk/client/requests/add_relation_request'
+        autoload :DeleteRelationRequest,
+                 'virgil/sdk/client/requests/delete_relation_request'
       end
     end
   end

data/lib/virgil/sdk/client/requests/add_relation_request.rb

@@ -0,0 +1,52 @@
+# Copyright (C) 2016 Virgil Security Inc.
+#
+# Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#   (1) Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+#   (2) Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in
+#   the documentation and/or other materials provided with the
+#   distribution.
+#
+#   (3) Neither the name of the copyright holder nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+module Virgil
+  module SDK
+    module Client
+      module Requests
+        # Create request using trusted card's snapshot
+        class AddRelationRequest < SignableRequest
+
+          def initialize(relation_card)
+            super()
+            @snapshot = relation_card.to_request.snapshot
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/virgil/sdk/client/requests/create_card_request.rb

@@ -78,7 +78,8 @@ module Virgil
             end
             request.restore(Virgil::Crypto::Bytes.from_base64(request_model['content_snapshot']),
                             request_model['meta']['signs'],
-                            validation_token
+                            validation_token,
+                            request_model['meta']['relations']
             )
             request
           end

data/lib/virgil/sdk/client/requests/delete_relation_request.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2016 Virgil Security Inc.
+#
+# Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#   (1) Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+#   (2) Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in
+#   the documentation and/or other materials provided with the
+#   distribution.
+#
+#   (3) Neither the name of the copyright holder nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+module Virgil
+  module SDK
+    module Client
+      module Requests
+        # Delete trusted card
+        class DeleteRelationRequest < RevokeCardRequest
+
+          def initialize(attributes)
+            super(attributes)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/virgil/sdk/client/requests/signable_request.rb

@@ -39,13 +39,10 @@ module Virgil
   module SDK
     module Client
       module Requests
-        # Base class for all API requests.
+        # Base class for all cards API requests.
         class SignableRequest
-          extend SignaturesBase64
-          attr_reader :signatures, :snapshot, :validation_token
+          attr_reader :signatures, :snapshot, :validation_token, :relations
 
-          # protected :signatures=, :snapshot=
-          # attr_writer :snapshot
 
           # Constructs new SignableRequest object
           def initialize
@@ -81,10 +78,13 @@ module Virgil
           #  Args:
           #    snapshot: Json-encoded snapshot request will be restored from.
           #    signatures: Request signatures.
-          def restore(snapshot, signatures, validation_token = nil)
+          #    validation_token: validation token gotten from Virgil Identity Service
+          #    relations: relations
+          def restore(snapshot, signatures, validation_token = nil, relations = nil)
             @snapshot = snapshot
             @signatures = signatures
             @validation_token = validation_token
+            @relations = relations
             model = JSON.parse(Crypto::Bytes.new(snapshot).to_s)
             restore_from_snapshot_model(model)
           end
@@ -132,6 +132,9 @@ module Virgil
             if validation_token
               model[:meta][:validation] = {'token': validation_token.value}
             end
+            if relations
+              model[:meta][:relations] = relations
+            end
 
             return model
           end

data/lib/virgil/sdk/client/virgil_client.rb

@@ -53,19 +53,21 @@ module Virgil
         end
 
         attr_accessor :access_token, :cards_service_url, :identity_service_url,
-                      :cards_read_only_service_url, :card_validator
+                      :cards_read_only_service_url, :ra_service_url, :card_validator
 
         # Constructs new VirgilClient object
         def initialize(
             access_token=nil,
             cards_service_url=Card::SERVICE_URL,
             cards_read_only_service_url=Card::READ_ONLY_SERVICE_URL,
-            identity_service_url=Virgil::SDK::VirgilIdentity::IDENTITY_SERVICE_URL
+            identity_service_url=Virgil::SDK::VirgilIdentity::IDENTITY_SERVICE_URL,
+            ra_service_url=Card::RA_SERVICE_URL
         )
           self.access_token = access_token
           self.cards_service_url = cards_service_url
           self.cards_read_only_service_url = cards_read_only_service_url
           self.identity_service_url = identity_service_url
+          self.ra_service_url = ra_service_url
         end
 
         # Create published new card from given attributes.
@@ -192,7 +194,7 @@ module Virgil
               endpoint: "/#{Card::VRA_VERSION}/card",
               body: create_request.request_model
           )
-          raw_response = self.cards_connection.send_request(http_request)
+          raw_response = self.ra_connection.send_request(http_request)
           card = Card.from_response(raw_response)
           self.validate_cards([card]) if self.card_validator
           card
@@ -208,6 +210,38 @@ module Virgil
         end
 
 
+        def add_relation(request)
+          unless (request.is_a?(Requests::AddRelationRequest) && !request.snapshot.nil? && request.signatures.count == 1)
+            raise ArgumentError.new("Request is not valid. Request must have snapshot and exactly 1 relation signature.")
+          end
+          http_request = Virgil::SDK::Client::HTTP::Request.new(
+              method: Virgil::SDK::Client::HTTP::Request::POST,
+              endpoint: "/#{Card::VC_VERSION}/card/#{request.signatures.keys.first}/collections/relations",
+              body: request.request_model
+          )
+          raw_response = self.cards_connection.send_request(http_request)
+          card = Card.from_response(raw_response)
+          self.validate_cards([card]) if self.card_validator
+          card
+        end
+
+
+        def delete_relation(request)
+          unless (request.is_a?(Requests::DeleteRelationRequest) && !request.snapshot.nil? && request.signatures.count == 1)
+            raise ArgumentError.new("Request is not valid. Request must have snapshot and exactly 1 relation signature.")
+          end
+          http_request = Virgil::SDK::Client::HTTP::Request.new(
+              method: Virgil::SDK::Client::HTTP::Request::DELETE,
+              endpoint: "/#{Card::VC_VERSION}/card/#{request.signatures.keys.first}/collections/relations",
+              body: request.request_model
+          )
+          raw_response = self.cards_connection.send_request(http_request)
+          card = Card.from_response(raw_response)
+          self.validate_cards([card]) if self.card_validator
+          card
+        end
+
+
         # Revoke card by id.
         #
         # Args:
@@ -258,7 +292,7 @@ module Virgil
               endpoint: "/#{Card::VRA_VERSION}/card/#{revocation_request.card_id}",
               body: revocation_request.request_model
           )
-          self.cards_connection.send_request(http_request)
+          self.ra_connection.send_request(http_request)
         end
 
         def verify_identity(identity, identity_type)
@@ -372,6 +406,7 @@ module Virgil
           return cards
         end
 
+
         # Validate cards signatures.
         # Args:
         #   cards: list of cards to validate.
@@ -393,6 +428,12 @@ module Virgil
           )
         end
 
+        def ra_connection
+          @_ra_connection ||= HTTP::CardsServiceConnection.new(
+              self.access_token,
+              self.ra_service_url
+          )
+        end
         # Cards service connection used for getting and searching cards.
         def read_cards_connection
           @_read_cards_connection = HTTP::CardsServiceConnection.new(

data/lib/virgil/sdk/cryptography/virgil_crypto.rb

@@ -42,6 +42,12 @@ module Virgil
       class VirgilCrypto
         include Virgil::Crypto
 
+        attr_accessor :key_pair_type
+
+        def initialize(key_pair_type=Keys::KeyPairType::Default)
+          @key_pair_type = key_pair_type
+        end
+
         # Exception raised when Signature is not valid
         class SignatureIsNotValid < StandardError
           def to_s
@@ -59,8 +65,8 @@ module Virgil
         #     The possible values can be found in KeyPairType enum.
         # Returns:
         #   Generated key pair.
-        def generate_keys(key_pair_type=Keys::KeyPairType::Default)
-          native_type = Keys::KeyPairType.convert_to_native(key_pair_type)
+        def generate_keys(keys_type=@key_pair_type)
+          native_type = Keys::KeyPairType.convert_to_native(keys_type)
           native_key_pair = Crypto::Native::VirgilKeyPair.generate(native_type)
           key_pair_id = self.compute_public_key_hash(native_key_pair.public_key)
           private_key = Keys::PrivateKey.new(

data/lib/virgil/sdk/high_level.rb

@@ -3,18 +3,18 @@ module Virgil
     module HighLevel
     autoload :VirgilApi, 'virgil/sdk/high_level/virgil_api'
     autoload :VirgilIdentity, 'virgil/sdk/high_level/virgil_identity'
-    autoload :Card, 'virgil/sdk/client/card'
     autoload :VirgilCard, 'virgil/sdk/high_level/virgil_card'
     autoload :VirgilKey, 'virgil/sdk/high_level/virgil_key'
     autoload :VirgilContext, 'virgil/sdk/high_level/virgil_context'
     autoload :VirgilKeyManager, 'virgil/sdk/high_level/virgil_key_manager'
     autoload :VirgilCardManager, 'virgil/sdk/high_level/virgil_card_manager'
     autoload :VirgilAppCredentials, 'virgil/sdk/high_level/virgil_app_credentials'
-    autoload :IdentityAttempt, 'virgil/sdk/high_level/identity_attempt'
     autoload :VirgilBuffer, 'virgil/sdk/high_level/virgil_buffer'
     autoload :VirgilStringEncoding, 'virgil/sdk/high_level/virgil_buffer'
     autoload :VirgilCardVerifierInfo, 'virgil/sdk/high_level/virgil_card_verifier_info'
 
+    VirgilCrypto = Virgil::SDK::Cryptography::VirgilCrypto
+    KeyPairType = Virgil::SDK::Cryptography::Keys::KeyPairType
     end
   end
 end

data/lib/virgil/sdk/high_level/virgil_buffer.rb

@@ -47,8 +47,9 @@ module Virgil
 
           super
         end
+        
 
-
+        # Initializes a new buffer from array of bytes
         def self.from_bytes(bytes)
 
           self.validate_bytes_param(bytes)
@@ -68,7 +69,7 @@ module Virgil
             when VirgilStringEncoding::UTF8
               return self.from_utf8(str)
             else
-              ArgumentError.new("encoding is undefined")
+              raise ArgumentError.new("encoding is undefined")
           end
 
         end
@@ -83,7 +84,7 @@ module Virgil
             when VirgilStringEncoding::UTF8
               return to_s
             else
-              ArgumentError.new("encoding is undefined")
+              raise ArgumentError.new("encoding is undefined")
           end
         end
 
@@ -94,7 +95,7 @@ module Virgil
 
         # Initializes a new buffer from file.
         def self.from_file(key_file_path)
-          ArgumentError.new("file_path is not valide") unless (File.exist?(key_file_path) && File.readable?(key_file_path))
+          raise ArgumentError.new("file_path is not valide") unless (File.exist?(key_file_path) && File.readable?(key_file_path))
           str = File.read(key_file_path)
           from_string(str)
         end
@@ -137,15 +138,12 @@ module Virgil
           to_s.each_byte.map { |b| b.to_s(16) }.join
         end
 
-
-        def self.validate_buffer_param(param, param_name="buffer")
-          raise ArgumentError.new("#{param_name} is not valid") unless (param.is_a?(VirgilBuffer) || param.is_a?(String))
-        end
-
         private
 
         def self.validate_bytes_param(param)
-          raise ArgumentError.new("bytes is not valid") if (!param.is_a?(Array) || param.empty?)
+          unless (!param.nil? && param.is_a?(Array) && !param.empty? && param.all? { |el| el.is_a? Integer })
+            raise ArgumentError.new("Bytes is not valid")
+          end
         end
 
       end

data/lib/virgil/sdk/high_level/virgil_card.rb

@@ -138,18 +138,28 @@ module Virgil
         # Encrypts the specified data for current Virgil card recipient
         #
         # Args:
-        #   buffer: The data to be encrypted.
+        #   buffer: The data to be encrypted. It can be VirgilBuffer, utf8-String or Array of bytes
         #
         # Returns:
         #   Encrypted data for current Virgil card recipient
         #
         # Raises:
-        #   ArgumentError: buffer is not valid if buffer doesn't have type VirgilBuffer or String
+        #   ArgumentError: Buffer has unsupported type if buffer doesn't have type VirgilBuffer, String or Array of bytes
         def encrypt(buffer)
 
-          VirgilBuffer.validate_buffer_param(buffer)
+          buffer_to_encrypt = case buffer.class.name.split("::").last
+                                when 'VirgilBuffer'
+                                  buffer
+                                when 'String'
+                                  VirgilBuffer.from_string(buffer)
+                                when 'Array'
+                                  VirgilBuffer.from_bytes(buffer)
+                                else
+                                  raise ArgumentError.new("Buffer has unsupported type")
+                              end
 
-          VirgilBuffer.new(context.crypto.encrypt(buffer.bytes, public_key))
+
+          VirgilBuffer.new(context.crypto.encrypt(buffer_to_encrypt.bytes, public_key))
         end
 
 
@@ -173,19 +183,39 @@ module Virgil
         #  Verifies the specified buffer and signature with current VirgilCard recipient
         #
         # Args:
-        #   buffer: The data to be verified.
-        #   signature: The signature used to verify the data integrity.
+        #   buffer: The data to be verified. It can be VirgilBuffer, utf8-encoded String or Array of bytes
+        #   signature: The signature used to verify the data integrity. It can be VirgilBuffer, base64-encoded String or Array of bytes
         #
         # Returns:
         #    true if signature is valid, false otherwise.
         #
         # Raises:
-        #   ArgumentError: buffer is not valid if buffer doesn't have type VirgilBuffer or String
-        #   ArgumentError: buffer is not valid if signature doesn't have type VirgilBuffer or String
+        #   ArgumentError: Buffer has unsupported type if buffer doesn't have type VirgilBuffer, Array of bytes or utf8-encoded String
+        #   ArgumentError: Signature has unsupported type if signature doesn't have type VirgilBuffer, base64-encoded String or Array of bytes
         def verify(buffer, signature)
-          VirgilBuffer.validate_buffer_param(buffer)
-          VirgilBuffer.validate_buffer_param(signature, "signature")
-          context.crypto.verify(buffer.bytes, signature.bytes, public_key)
+
+          buffer_to_verify = case buffer.class.name.split("::").last
+                               when 'VirgilBuffer'
+                                 buffer
+                               when 'String'
+                                 VirgilBuffer.from_string(buffer)
+                               when 'Array'
+                                 VirgilBuffer.from_bytes(buffer)
+                               else
+                                 raise ArgumentError.new("Buffer has unsupported type")
+                             end
+
+          signature_to_verify = case signature.class.name.split("::").last
+                                  when 'VirgilBuffer'
+                                    signature
+                                  when 'String'
+                                    VirgilBuffer.from_base64(signature)
+                                  when 'Array'
+                                    VirgilBuffer.from_bytes(signature)
+                                  else
+                                    raise ArgumentError.new("Signature has unsupported type")
+                                end
+          context.crypto.verify(buffer_to_verify.bytes, signature_to_verify.bytes, public_key)
         end
 
         private