tanker-core 2.4.0.alpha.9 → 2.4.1.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92eb192362e683db868e217ba8d09e0459d53c07510004d62912ad938b6b6fe5
-  data.tar.gz: 53f4fcbf35bdfd79856a0100c1abe0365e25c9105a7026807bde9eeb6b4a3104
+  metadata.gz: 6ec342fffdeb5faac6b5bc784d7f82f8c311b2ca9e1faf55f831586e5675bf52
+  data.tar.gz: 40ec73b66868071510d2214d6f180a24b09f070ab8d9021145a8d3113bba6714
 SHA512:
-  metadata.gz: 43ace1a65ed037af80b04cedbc40e525e4ef969a2c3b17573241d434a8678e7fa18847392762416cb9092bd0520ee4d42c8b9776a2679f07a79ec15a5d11bf6a
-  data.tar.gz: 62edb1bb369f852b4ad7e72deb212a1bf4530b98b3c1951013c60554023b69a0caed06885581f300f824516a75ef2822cdade99ef1d5bf0bdcda444763d8fe65
+  metadata.gz: 2067b7f162039243d78d7a9f6a5db65c28ff270a589ead52f8a4e251ba38a080250f97fc899f5e046ce1957883395e3f39fbabdc2792020541e151ea43514598
+  data.tar.gz: da876bb3d3c23edbf4d6b6d09f74c95e9d73c98cb3e9cb63a70e19df6e33329be83b478abf11203694e10584db79467b864078dd7ed35ecce7ed5a45a690dffa

data/lib/tanker/c_tanker.rb

@@ -3,6 +3,7 @@
 require 'ffi'
 require_relative 'core/options'
 require_relative 'sharing_options'
+require_relative 'encryption_options'
 require_relative 'c_tanker/c_future'
 require_relative 'c_tanker/c_verification'
 require_relative 'c_tanker/c_verification_method'
@@ -59,8 +60,7 @@ module Tanker
     blocking_attach_function :tanker_encrypt, [:session_pointer, :pointer, :pointer, :uint64,
                                                Tanker::EncryptionOptions], CFuture
     blocking_attach_function :tanker_decrypt, [:session_pointer, :pointer, :pointer, :uint64], CFuture
-    blocking_attach_function :tanker_share, [:session_pointer, :pointer, :uint64, :pointer, :uint64,
-                                             :pointer, :uint64], CFuture
+    blocking_attach_function :tanker_share, [:session_pointer, :pointer, :uint32, Tanker::SharingOptions], CFuture
 
     blocking_attach_function :tanker_future_wait, [CFuture], :void
     blocking_attach_function :tanker_future_has_error, [CFuture], :bool
@@ -72,8 +72,7 @@ module Tanker
     blocking_attach_function :tanker_update_group_members, [:session_pointer, :string,
                                                             :pointer, :uint64], CFuture
 
-    blocking_attach_function :tanker_encryption_session_open, [:session_pointer, :pointer, :uint64,
-                                                               :pointer, :uint64], CFuture
+    blocking_attach_function :tanker_encryption_session_open, [:session_pointer, Tanker::EncryptionOptions], CFuture
     blocking_attach_function :tanker_encryption_session_close, [:enc_sess_pointer], CFuture
     blocking_attach_function :tanker_encryption_session_encrypted_size, [:uint64], :uint64
     blocking_attach_function :tanker_encryption_session_get_resource_id, [:enc_sess_pointer], CFuture

data/lib/tanker/c_tanker/c_string.rb

@@ -17,7 +17,11 @@ module Tanker::CTanker
 
   def self.new_cstring_array(strings)
     cstrings = FFI::MemoryPointer.new(:pointer, strings.length)
-    cstrings.write_array_of_pointer(strings.map { |id| new_cstring id })
+    ruby_strings = strings.map { |id| new_cstring id }
+    # keep alive the ruby objects to prevent GC
+    # I could not find any other place to store these
+    cstrings.instance_variable_set(:@ruby_strings, ruby_strings)
+    cstrings.write_array_of_pointer(ruby_strings)
     cstrings
   end
 

data/lib/tanker/core/encryption.rb

@@ -59,31 +59,16 @@ module Tanker
       end
 
       cresource_ids = CTanker.new_cstring_array resource_ids
-      cusers = sharing_options[:recipient_public_identities]
-      nb_cusers = sharing_options[:nb_recipient_public_identities]
-      cgroups = sharing_options[:recipient_group_ids]
-      nb_cgroups = sharing_options[:nb_recipient_group_ids]
-
-      CTanker.tanker_share(@ctanker, cusers, nb_cusers,
-                           cgroups, nb_cgroups,
-                           cresource_ids, resource_ids.length).get
+
+      CTanker.tanker_share(@ctanker, cresource_ids, resource_ids.length, sharing_options).get
     end
 
-    def create_encryption_session(sharing_options = nil)
-      if sharing_options.nil?
-        cusers = nil
-        nb_cusers = 0
-        cgroups = nil
-        nb_cgroups = 0
-      else
-        cusers = sharing_options[:recipient_public_identities]
-        nb_cusers = sharing_options[:nb_recipient_public_identities]
-        cgroups = sharing_options[:recipient_group_ids]
-        nb_cgroups = sharing_options[:nb_recipient_group_ids]
+    def create_encryption_session(encryption_options = nil)
+      unless !encryption_options || encryption_options.is_a?(EncryptionOptions)
+        raise TypeError, "expected encryption_options to be a EncryptionOptions, but got a #{encryption_options.class}"
       end
 
-      csession = CTanker.tanker_encryption_session_open(@ctanker, cusers, nb_cusers,
-                                                        cgroups, nb_cgroups).get
+      csession = CTanker.tanker_encryption_session_open(@ctanker, encryption_options).get
       EncryptionSession.new(csession)
     end
 
@@ -96,6 +81,10 @@ module Tanker
     private
 
     def encrypt_common(data, encryption_options = nil)
+      unless !encryption_options || encryption_options.is_a?(EncryptionOptions)
+        raise TypeError, "expected encryption_options to be a EncryptionOptions, but got a #{encryption_options.class}"
+      end
+
       inbuf = FFI::MemoryPointer.from_string(data)
 
       encrypted_size = CTanker.tanker_encrypted_size data.bytesize

data/lib/tanker/core/session.rb

@@ -74,7 +74,7 @@ module Tanker
       attach_ptr = CTanker.tanker_attach_provisional_identity(@ctanker, provisional_identity).get
       attach_status = attach_ptr.get(:uint8, 1)
       method_ptr = attach_ptr.get_pointer(FFI::Pointer.size)
-      method = CTanker::CVerificationMethod.new(method_ptr).to_verification_method
+      method = (CTanker::CVerificationMethod.new(method_ptr).to_verification_method if method_ptr.address != 0)
       AttachResult.new attach_status, method
     end
 

data/lib/tanker/core/stream.rb

@@ -6,7 +6,7 @@ require 'tanker/c_tanker'
 module Tanker
   class Core
     def encrypt_stream(stream, encryption_options = nil)
-      Stream.do_stream_action(stream) { |cb| CTanker.tanker_stream_encrypt(@ctanker, cb, encryption_options, nil) }
+      Stream.do_stream_action(stream) { |cb| CTanker.tanker_stream_encrypt(@ctanker, cb, nil, encryption_options) }
     end
 
     def decrypt_stream(stream)

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '2.4.0.alpha.9'
+    VERSION = '2.4.1.alpha.1'
 
     def self.native_version
       CTanker.tanker_version_string

data/lib/tanker/encryption_options.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'ffi'
+require 'tanker/c_tanker/c_string'
+
+module Tanker
+  # Options that can be given when encrypting data
+  class EncryptionOptions < FFI::Struct
+    def initialize(share_with_users: [], share_with_groups: [], share_with_self: true)
+      @users_objs = share_with_users.map { |id| CTanker.new_cstring id }
+      users = FFI::MemoryPointer.new(:pointer, share_with_users.length)
+      users.write_array_of_pointer(@users_objs)
+
+      @groups_objs = share_with_groups.map { |id| CTanker.new_cstring id }
+      groups = FFI::MemoryPointer.new(:pointer, share_with_groups.length)
+      groups.write_array_of_pointer(@groups_objs)
+
+      self[:version] = 3
+      self[:recipient_public_identities] = users
+      self[:nb_recipient_public_identities] = share_with_users.length
+      self[:recipient_group_ids] = groups
+      self[:nb_recipient_group_ids] = share_with_groups.length
+      self[:share_with_self] = share_with_self
+    end
+
+    layout :version, :uint8,
+           :recipient_public_identities, :pointer,
+           :nb_recipient_public_identities, :uint32,
+           :recipient_group_ids, :pointer,
+           :nb_recipient_group_ids, :uint32,
+           :share_with_self, :bool
+  end
+end

data/lib/tanker/sharing_options.rb

@@ -4,39 +4,28 @@ require 'ffi'
 require 'tanker/c_tanker/c_string'
 
 module Tanker
-  module CommonSharingOptions
+  # Options that can be given when sharing data
+  class SharingOptions < FFI::Struct
     def initialize(share_with_users: [], share_with_groups: [])
-      @recipients = FFI::MemoryPointer.new(:pointer, share_with_users.length)
-      @recipients.write_array_of_pointer(share_with_users.map { |id| CTanker.new_cstring id })
+      @users_objs = share_with_users.map { |id| CTanker.new_cstring id }
+      users = FFI::MemoryPointer.new(:pointer, share_with_users.length)
+      users.write_array_of_pointer(@users_objs)
 
-      @groups = FFI::MemoryPointer.new(:pointer, share_with_groups.length)
-      @groups.write_array_of_pointer(share_with_groups.map { |id| CTanker.new_cstring id })
+      @groups_objs = share_with_groups.map { |id| CTanker.new_cstring id }
+      groups = FFI::MemoryPointer.new(:pointer, share_with_groups.length)
+      groups.write_array_of_pointer(@groups_objs)
 
-      self[:version] = 2
-      self[:recipient_public_identities] = @recipients
+      self[:version] = 1
+      self[:recipient_public_identities] = users
       self[:nb_recipient_public_identities] = share_with_users.length
-      self[:recipient_group_ids] = @groups
+      self[:recipient_group_ids] = groups
       self[:nb_recipient_group_ids] = share_with_groups.length
     end
 
-    def self.included(base)
-      base.layout :version, :uint8,
-                  :recipient_public_identities, :pointer,
-                  :nb_recipient_public_identities, :uint32,
-                  :recipient_group_ids, :pointer,
-                  :nb_recipient_group_ids, :uint32
-    end
-  end
-
-  # Options that can be given when sharing data
-  class SharingOptions < FFI::Struct
-    include CommonSharingOptions
+    layout :version, :uint8,
+           :recipient_public_identities, :pointer,
+           :nb_recipient_public_identities, :uint32,
+           :recipient_group_ids, :pointer,
+           :nb_recipient_group_ids, :uint32
   end
-
-  # Options that can be given when encrypting data
-  class EncryptionOptions < FFI::Struct
-    include CommonSharingOptions
-  end
-
-  private_constant :CommonSharingOptions
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.4.0.alpha.9
+  version: 2.4.1.alpha.1
 platform: ruby
 authors:
 - Tanker team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -161,6 +161,7 @@ files:
 - lib/tanker/core/verification.rb
 - lib/tanker/core/verification_method.rb
 - lib/tanker/core/version.rb
+- lib/tanker/encryption_options.rb
 - lib/tanker/error.rb
 - lib/tanker/sharing_options.rb
 - vendor/libctanker/linux64/tanker/lib/libctanker.so