selfsdk 0.0.128 → 0.0.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125110bf24194be23beb2ef32eaffc67cdd4fb0f0124c8b6bc2da283fc7cf999
-  data.tar.gz: f058e20f529c0c71480b673cb78d511bee67056a2c8aa215663552443311be4d
+  metadata.gz: b0b0d98353e921f104b67c05456975e12135f7c9ce67b285f962cffd11b30c5e
+  data.tar.gz: 82d0dac60ed6ec6bd31f0ea7ef9d01ab8dda4a3bdd3f9d4912073953c53676b0
 SHA512:
-  metadata.gz: 1748a529d80ef342b18d4a8a8e9b2ab14191d478ce7d431c5ce192ac6052e05a20b62cc27851cc3f890eacbef65fe2f4850a934d99a50f3879f90698b6abbd86
-  data.tar.gz: 1648159549fa5474b98a141a7df7fe2901a50f0472e9e0cc03da0e65ab923ed52c8589344b34aff25b9dd9c32e1ad9e9abe65ed6b52c11364520139dde1aae61
+  metadata.gz: a30410ab97a325f40ee84f465eac9a15972a188916b3633c08a2d02ef4f07ef528be69446a8189c06e037a90a12b8085e4c4b9de3e686fc0f6eba8335005ad91
+  data.tar.gz: 70091f9d604789568e96d36c86a094093bfbf872dcec0c768e674bf6b01f8f480822e18ddc09027380187337767b55d798919cc823172d829df24a38e3f53fcb

data/lib/acl.rb

@@ -14,11 +14,7 @@ module SelfSDK
     # Lists allowed connections.
     def list
       SelfSDK.logger.info "Listing allowed connections"
-      rules = {}
-      @messaging.list_acl_rules.each do |c|
-        rules[c['acl_source']] = DateTime.parse(c['acl_exp'])
-      end
-      rules
+      @messaging.list_acl_rules
     end
 
     # Allows incomming messages from the given identity.

data/lib/client.rb

@@ -59,6 +59,7 @@ module SelfSDK
     # Lists all public keys stored on self for the given ID
     #
     # @param id [string] identity id
+    # DEPRECATED
     def public_keys(id)
       i = entity(id)
       i[:public_keys]

data/lib/jwt_service.rb

@@ -71,7 +71,9 @@ module SelfSDK
       if verify_key.verify(decode(payload[:signature]), "#{payload[:protected]}.#{payload[:payload]}")
         return true
       end
-    rescue StandardError
+      false
+    rescue StandardError => e
+      SelfSDK.logger.info e
       false
     end
 

data/lib/messages/attestation.rb

@@ -15,7 +15,8 @@ module SelfSDK
         @to = payload[:sub]
         @audience = payload[:aud]
         @source = payload[:source]
-        @verified = valid_signature?(attestation)
+        header = JSON.parse(@messaging.jwt.decode(attestation[:protected]), symbolize_names: true)
+        @verified = valid_signature?(attestation, header[:kid])
         @expected_value = payload[:expected_value]
         @operator = payload[:operator]
         @fact_name = name.to_s
@@ -24,8 +25,8 @@ module SelfSDK
         end
       end
 
-      def valid_signature?(body)
-        k = @messaging.client.public_keys(@origin).first[:key]
+      def valid_signature?(body, kid)
+        k = @messaging.client.public_key(@origin, kid).raw_public_key
         raise ::StandardError.new("invalid signature") unless @messaging.jwt.verify(body, k)
 
         true

data/lib/messages/base.rb

@@ -72,14 +72,15 @@ module SelfSDK
 
         jwt = JSON.parse(body, symbolize_names: true)
         payload = JSON.parse(@jwt.decode(jwt[:payload]), symbolize_names: true)
+        header = JSON.parse(@jwt.decode(jwt[:protected]), symbolize_names: true)
         @from = payload[:iss]
-        verify! jwt
+        verify! jwt, header[:kid]
         payload
       end
 
-      def verify!(jwt)
-        k = @client.public_keys(@from).first[:key]
-        return if @jwt.verify(jwt, k)
+      def verify!(input, kid)
+        k = @client.public_key(@from, kid).raw_public_key
+        return if @jwt.verify(input, k)
 
         SelfSDK.logger.info "skipping message, invalid signature"
         raise ::StandardError.new("invalid signature on incoming message")

data/lib/messaging.rb

@@ -44,7 +44,7 @@ module SelfSDK
       @offset_file = "#{@storage_dir}/#{@jwt.id}:#{@device_id}.offset"
       @offset = read_offset
 
-      FileUtils.mkdir_p @storage_dir unless File.exists? @storage_dir
+      FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
 
       if options.include? :ws
         @ws = options[:ws]

data/lib/services/auth.rb

@@ -82,11 +82,11 @@ module SelfSDK
         body = @client.jwt.encode(request(selfid, opts))
 
         if @client.env.empty?
-          return "https://selfid.page.link/?link=#{callback}%3Fqr=#{body}&apn=net.selfid.app"
+          return "https://joinself.page.link/?link=#{callback}%3Fqr=#{body}&apn=com.joinself.app"
         elsif @client.env == 'development'
-          return "https://selfid.page.link/?link=#{callback}%3Fqr=#{body}&apn=net.selfid.app.dev"
+          return "https://joinself.page.link/?link=#{callback}%3Fqr=#{body}&apn=com.joinself.app.dev"
         end
-        "https://selfid.page.link/?link=#{callback}%3Fqr=#{body}&apn=net.selfid.app.#{@client.env}"
+        "https://selfid.page.link/?link=#{callback}%3Fqr=#{body}&apn=com.joinself.app.#{@client.env}"
       end
 
       # Adds an observer for an authentication response
@@ -115,6 +115,7 @@ module SelfSDK
       def valid_payload(response)
         parse_payload(response)
       rescue StandardError => e
+        SelfSDK.logger.error e
         uuid = ""
         uuid = response[:cid] unless response.nil?
         SelfSDK.logger.error "error checking authentication for #{uuid} : #{e.message}"
@@ -153,10 +154,7 @@ module SelfSDK
         identity = @client.entity(payload[:sub])
         return if identity.nil?
 
-        identity[:public_keys].each do |key|
-          return payload if @client.jwt.verify(jws, key[:key])
-        end
-        nil
+        return payload
       end
     end
   end

data/lib/services/identity.rb

@@ -27,9 +27,10 @@ module SelfSDK
       # Gets an identity public keys
       #
       # @param [String] selfid gets the identity details (app/user)
+      # @param [String] kid the public key id.
       # @return [Array] with the identity public keys
-      def public_keys(selfid)
-        @client.public_keys(selfid)
+      def public_key(selfid, kid)
+        @client.public_key(selfid, kid).public_key
       end
 
       # Gets an app/identity details

data/lib/signature_graph.rb

@@ -9,7 +9,7 @@ module SelfSDK
   ACTION_REVOKE = "key.revoke"
   KEY_TYPE_DEVICE = "device.key"
   KEY_TYPE_RECOVERY = "recovery.key"
-  
+
   class Operation
 
     attr_reader :sequence, :previous, :timestamp, :actions, :signing_key, :jws
@@ -46,7 +46,7 @@ module SelfSDK
     def revokes(kid)
       @actions.each do |action|
         if action[:kid] == kid && action[:action] == ACTION_REVOKE
-          return true 
+          return true
         end
       end
       return false
@@ -64,8 +64,8 @@ module SelfSDK
       @created = action[:from]
       @revoked = 0
 
-      @raw_public_key = Base64.urlsafe_decode64(action[:key])
-      @public_key = Ed25519::VerifyKey.new(@raw_public_key)
+      @raw_public_key = action[:key]
+      @public_key = Ed25519::VerifyKey.new(Base64.urlsafe_decode64(@raw_public_key))
 
       @incoming = Array.new
       @outgoing = Array.new
@@ -104,7 +104,7 @@ module SelfSDK
       @recovery_key = nil
 
       history.each do |operation|
-        execute(operation)        
+        execute(operation)
       end
     end
 
@@ -124,10 +124,10 @@ module SelfSDK
       op = Operation.new(operation)
 
       raise "operation sequence is out of order" if op.sequence != @operations.length
-        
-      if op.sequence > 0 
+
+      if op.sequence > 0
         if @signatures[op.previous] != op.sequence - 1
-          raise "operation previous signature does not match" 
+          raise "operation previous signature does not match"
         end
 
         if @operations[op.sequence - 1].timestamp >= op.timestamp
@@ -135,7 +135,7 @@ module SelfSDK
         end
 
         sk = @keys[op.signing_key]
- 
+
         raise "operation specifies a signing key that does not exist" if sk.nil?
 
         if sk.revoked? && op.timestamp > sk.revoked
@@ -144,7 +144,7 @@ module SelfSDK
 
         if sk.type == KEY_TYPE_RECOVERY && op.revokes(op.signing_key) != true
           raise "account recovery operation does not revoke the current active recovery key"
-        end        
+        end
       end
 
       execute_actions(op)
@@ -154,7 +154,7 @@ module SelfSDK
       raise "operation specifies a signing key that does not exist" if sk.nil?
 
       if op.timestamp < sk.created || sk.revoked? && op.timestamp > sk.revoked
-        raise "operation was signed with a key that was revoked"  
+        raise "operation was signed with a key that was revoked"
       end
 
       sig = Base64.urlsafe_decode64(op.jws[:signature])
@@ -198,9 +198,9 @@ module SelfSDK
         end
 
         if action[:from] < 0
-          raise "operation action does not provide a valid timestamp for the action to take effect from" 
+          raise "operation action does not provide a valid timestamp for the action to take effect from"
         end
-        
+
         case action[:action]
         when ACTION_ADD
           action[:from] = op.timestamp
@@ -213,7 +213,7 @@ module SelfSDK
 
     def add(operation, action)
       if @keys[action[:kid]].nil? != true
-        raise "operation contains a key with a duplicate identifier" 
+        raise "operation contains a key with a duplicate identifier"
       end
 
       k = Key.new(action)
@@ -226,7 +226,7 @@ module SelfSDK
         end
       when KEY_TYPE_RECOVERY
         unless @recovery_key.nil?
-          raise "operation contains more than one active recovery key" unless @recovery_key.revoked? 
+          raise "operation contains more than one active recovery key" unless @recovery_key.revoked?
         end
 
         @recovery_key = k
@@ -239,7 +239,7 @@ module SelfSDK
         @root = k
         return
       end
-      
+
       parent = @keys[operation.signing_key]
 
       raise "operation specifies a signing key that does not exist" if parent.nil?
@@ -271,7 +271,7 @@ module SelfSDK
 
         return
       end
-      
+
       k.child_keys.each do |ck|
         ck.revoke(action[:from]) unless ck.created < action[:from]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.128
+  version: 0.0.133
 platform: ruby
 authors:
 - Aldgate Ventures
@@ -328,7 +328,8 @@ files:
 - lib/signature_graph.rb
 - lib/sources.rb
 homepage: https://www.joinself.com/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []