selfsdk 0.0.198 → 0.0.201

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07875d6dd8a8786b62dbb757976d48e6254e553f1baba1f6e804ac75c20984a3'
-  data.tar.gz: f21a0a69b9342b7f8b68b4c288337413183f57ca662e8bf8bd7ea4f2230e9c28
+  metadata.gz: 8cb8631899d2a3a9bcd9d3dc58171fcdd6714de37995efe2984eaa1aa823e091
+  data.tar.gz: f0aa18f9e3eb660e1e644b261e271e36381a67a815fea054bc1a61a5826b63d0
 SHA512:
-  metadata.gz: ce37ab428a4e072f413f635114051c5d8b4fb31b96d27f019a8315d09adaec78f3a1a254bdb9511d4feca73c71287f7eb94bdbc521925ec818f51c948fc1de37
-  data.tar.gz: 6140b82f58d59acf6a087f8560d182f82f8e925deb6067688c05133807447ece403871fbd62bf045263e70dcda945731440b5c53ed82e68f6f0d6ebcc7d25f46
+  metadata.gz: 1f05d3278b9c176e19af9ee0a08e162091e67a4ea452b700f894bab0fb33c81c29748733ce0fc7052516c75eadcfd45c77dcf653ee455f7258ced4d60ed8a415
+  data.tar.gz: 30e56bd392849869232b1997a09d1c98fa8d2a0b825ac30f166b32c97813437d2aefc1613a1c9701ff356814dee21d8cff9668cdae7ba6baeadbbb5db41708e0

data/lib/messages/base.rb

@@ -4,6 +4,10 @@
 
 module SelfSDK
   module Messages
+
+    PRIORITY_VISIBLE   = 1
+    PRIORITY_INVISIBLE = 2
+
     class Base
       attr_accessor :from, :from_device, :to, :to_device, :expires, :id,
                     :fields, :typ, :payload, :status, :input, :intermediary,

data/lib/messages/connection_request.rb

@@ -57,6 +57,8 @@ module SelfSDK
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = recipient
         m.ciphertext = ciphertext
+        m.message_type = MSG_TYPE
+        m.priority = SelfSDK::Messages::PRIORITY_VISIBLE
         m
       end
     end

data/lib/messages/fact_issue.rb

@@ -57,6 +57,8 @@ module SelfSDK
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = recipient
         m.ciphertext = ciphertext
+        m.message_type = MSG_TYPE
+        m.priority = SelfSDK::Messages::PRIORITY_VISIBLE
         m
       end
 
@@ -84,6 +86,7 @@ module SelfSDK
                  sub: @to,
                  iss: @from,
                  iat: SelfSDK::Time.now.strftime('%FT%TZ'),
+                 exp: (SelfSDK::Time.now + @exp_timeout).strftime('%FT%TZ'),
                  source: source,
                  verified: true,
                  facts: [ facts ] }

data/lib/messages/fact_request.rb

@@ -87,7 +87,7 @@ module SelfSDK
         b = {
           typ: MSG_TYPE,
           iss: @jwt.id,
-          aud: @to,
+          aud: @intermediary ? @intermediary : @to,
           sub: @to,
           iat: SelfSDK::Time.now.strftime('%FT%TZ'),
           exp: (SelfSDK::Time.now + @exp_timeout).strftime('%FT%TZ'),
@@ -119,6 +119,8 @@ module SelfSDK
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = recipient
         m.ciphertext = ciphertext
+        m.message_type = MSG_TYPE
+        m.priority = SelfSDK::Messages::PRIORITY_VISIBLE
         m
       end
     end

data/lib/messages/fact_response.rb

@@ -92,19 +92,6 @@ module SelfSDK
       def auth_response?
         @auth == true
       end
-
-      protected
-
-      def proto(to_device)
-        @to_device = to_device
-        Msgproto::Message.new(
-          type: Msgproto::MsgType::MSG,
-          id: SecureRandom.uuid,
-          sender: "#{@jwt.id}:#{@messaging.device_id}",
-          recipient: "#{@to}:#{@to_device}",
-          ciphertext: encrypt_message(@jwt.prepare(body), [{id: @to, device_id: @to_device}])
-        )
-      end
     end
   end
 end

data/lib/messaging.rb

@@ -17,6 +17,23 @@ module SelfSDK
     DEFAULT_STORAGE_DIR="./.self_storage"
     ON_DEMAND_CLOSE_CODE=3999
 
+    PRIORITIES = {
+      "chat.invite":                 SelfSDK::Messages::PRIORITY_VISIBLE,
+      "chat.join":                   SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message":                SelfSDK::Messages::PRIORITY_VISIBLE,
+      "chat.message.delete":         SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message.delivered":      SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message.edit":           SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message.read":           SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.remove":                 SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "document.sign.req":           SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.authenticate.req": SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.connections.req":  SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.facts.query.req":  SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.facts.issue":      SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.notify":           SelfSDK::Messages::PRIORITY_VISIBLE
+    }
+
     attr_accessor :client, :jwt, :device_id, :ack_timeout, :timeout, :type_observer, :uuid_observer, :encryption_client, :source
 
     # RestClient initializer
@@ -87,7 +104,8 @@ module SelfSDK
       m.id = SecureRandom.uuid 
       m.sender = "#{@jwt.id}:#{@device_id}"
       m.recipient = "#{recipient}:#{recipient_device}"
-      # TODO: this is unencrypted!!!
+      m.message_type = "identities.facts.query.resp"
+      m.priority = select_priority(m.message_type)
       m.ciphertext = @jwt.prepare(request)
 
       send_message m
@@ -133,6 +151,8 @@ module SelfSDK
         m.sender = current_device
         m.recipient = "#{r[:id]}:#{r[:device_id]}"
         m.ciphertext = ciphertext
+        m.message_type = r[:typ]
+        m.priority = select_priority(r[:typ])
 
         SelfSDK.logger.info " -> to #{m.recipient}"
         send_message m
@@ -514,5 +534,9 @@ module SelfSDK
       end
         
     end
+
+    def select_priority(mtype)
+      PRIORITIES[mtype] || SelfSDK::Messages::PRIORITY_VISIBLE
+    end
   end
 end

data/lib/services/requester.rb

@@ -166,17 +166,18 @@ module SelfSDK
       def validate_fact!(f)
         errInvalidFactToSource = 'provided source does not support given fact'
         errInvalidSource = 'provided fact does not specify a valid source'
+        fact_name = f[:fact].to_s
 
-        raise 'provided fact does not specify a name' if f[:fact].empty?
+        raise 'provided fact does not specify a name' if fact_name.empty?
         return unless f.has_key? :sources
         return if f.has_key? :issuers # skip the validation if is a custom fact
 
-        raise "invalid fact '#{f[:fact]}'" unless @messaging.facts.include?(f[:fact])
+        raise "invalid fact '#{fact_name}'" unless @messaging.source.core_fact?(fact_name)
 
-        spec = @messaging.sources
+        spec = @messaging.source.sources
         f[:sources].each do |s|
-          raise errInvalidSource unless spec.key?(s)
-          raise errInvalidFactToSource unless spec[s].include? f[:fact]
+          raise errInvalidSource unless spec.key?(s.to_s)
+          raise errInvalidFactToSource unless spec[s.to_s].include? fact_name.to_s
         end
       end
     end

data/lib/sources.rb

@@ -6,8 +6,9 @@ require "json"
 require_relative "source_definition.rb"
 
 module SelfSDK
-  attr_reader :sources, :facts
   class Sources
+    attr_reader :sources, :facts
+
     def initialize(sources_file)
       @sources = SOURCE_DATA["sources"]
       @facts = []
@@ -40,6 +41,10 @@ module SelfSDK
       get(operators, input, "operator")
     end
 
+    def core_fact?(fact)
+      @facts.include? fact.to_s
+    end
+
     def message_type(s)
       types = { fact_request: SelfSDK::Messages::FactRequest::MSG_TYPE,
                 fact_response: SelfSDK::Messages::FactResponse::MSG_TYPE,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.198
+  version: 0.0.201
 platform: ruby
 authors:
 - Aldgate Ventures
@@ -184,14 +184,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.13
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +324,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 description: 
 email: 
 executables: []
@@ -384,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: joinself sdk