tanker-core 2.32.0.alpha.1 → 2.32.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5a0c66b4e62fa57f6f1328caf7e90da7a93c546152097298dfeb198e79fac4
-  data.tar.gz: c1b5008343b5d95f0e2186490d7bde0591dad6f1789dfe5928747dece991c2f1
+  metadata.gz: 58ecc5854b8a1df78015933a12b40c24701f7d9d46425939178097ec8861d0e1
+  data.tar.gz: a84443d60fadfe6dd7ab84b47850accd40ffbf0e237b6b72606753d8011f1f77
 SHA512:
-  metadata.gz: 65996653c8d1843bdfaabc351ca0f65660cb97f42dff27421360ed6b44080e53c0f9c3795e998ba3eea1bdc96c59d2527fbaa2da1ecf506ce06c4ce3ed7e6298
-  data.tar.gz: 80b2d2d64871d6b1deb15cd19d9c7d111fa5e0df75a5bcad4836bbd30a838858498dbfab0fb81f7ce8914bf2635076cdf9d245cb078ff6203d89d1d2aef35f4c
+  metadata.gz: cf0f2020ec774886f32b8e3558de12fbeb1b1c712f815c81826f9598d8a88733002054851556f97cb852a62d7b8f81239bddf1e2c572cca976f60a521fbd3663
+  data.tar.gz: 5e7b2549806a0718091223d2ab088e477a926dc57ff712065782ea025b474a258dab52a1f713ecd8b8a29e1aef6bcbe957fc72e462405d126cd430a5cc0d3991

data/lib/tanker/c_tanker/c_verification.rb

@@ -48,6 +48,7 @@ module Tanker
              :verification_key, :pointer,
              :email_verification, CEmailVerification,
              :passphrase, :pointer,
+             :e2e_passphrase, :pointer,
              :oidc_id_token, :pointer,
              :phone_number_verification, CPhoneNumberVerification,
              :preverified_email, :pointer,
@@ -60,6 +61,7 @@ module Tanker
       TYPE_PHONE_NUMBER = 5
       TYPE_PREVERIFIED_EMAIL = 6
       TYPE_PREVERIFIED_PHONE_NUMBER = 7
+      TYPE_E2E_PASSPHRASE = 8
 
       def initialize(verification) # rubocop:disable Metrics/CyclomaticComplexity Not relevant for a case/when
         super()
@@ -97,11 +99,15 @@ module Tanker
           @preverified_phone_number = CTanker.new_cstring verification.preverified_phone_number
           self[:type] = TYPE_PREVERIFIED_PHONE_NUMBER
           self[:preverified_phone_number] = @preverified_phone_number
+        when Tanker::E2ePassphraseVerification
+          @e2e_passphrase = CTanker.new_cstring verification.e2e_passphrase
+          self[:type] = TYPE_E2E_PASSPHRASE
+          self[:e2e_passphrase] = @e2e_passphrase
         else
           raise ArgumentError, 'Unknown Tanker::Verification type!'
         end
 
-        self[:version] = 5
+        self[:version] = 6
       end
     end
 

data/lib/tanker/c_tanker/c_verification_method.rb

@@ -18,6 +18,7 @@ module Tanker
       TYPE_PHONE_NUMBER = 5
       TYPE_PREVERIFIED_EMAIL = 6
       TYPE_PREVERIFIED_PHONE_NUMBER = 7
+      TYPE_E2E_PASSPHRASE = 8
 
       def to_verification_method # rubocop:disable Metrics/CyclomaticComplexity Not relevant for a case/when
         case self[:type]
@@ -35,6 +36,8 @@ module Tanker
           PreverifiedEmailVerificationMethod.new(self[:value].read_string.force_encoding(Encoding::UTF_8))
         when TYPE_PREVERIFIED_PHONE_NUMBER
           PreverifiedPhoneNumberVerificationMethod.new(self[:value].read_string.force_encoding(Encoding::UTF_8))
+        when TYPE_E2E_PASSPHRASE
+          E2ePassphraseVerificationMethod.new
         else
           raise "Unknown VerificationMethod type #{self[:type]}!"
         end

data/lib/tanker/c_tanker.rb

@@ -47,7 +47,7 @@ module Tanker
     blocking_attach_function :tanker_attach_provisional_identity, [:session_pointer, :string], CFuture
     blocking_attach_function :tanker_verify_provisional_identity, [:session_pointer, CVerification], CFuture
 
-    blocking_attach_function :tanker_encrypted_size, [:uint64], :uint64
+    blocking_attach_function :tanker_encrypted_size, [:uint64, :uint32], :uint64
     blocking_attach_function :tanker_decrypted_size, [:pointer, :uint64], CFuture
     blocking_attach_function :tanker_get_resource_id, [:pointer, :uint64], CFuture
 
@@ -68,7 +68,7 @@ module Tanker
 
     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_encrypted_size, [:enc_sess_pointer, :uint64], :uint64
     blocking_attach_function :tanker_encryption_session_get_resource_id, [:enc_sess_pointer], CFuture
     blocking_attach_function :tanker_encryption_session_encrypt, [:enc_sess_pointer, :pointer,
                                                                   :pointer, :uint64], CFuture

data/lib/tanker/core/encryption.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'tanker/c_tanker'
+require 'tanker/encryption_options'
 require_relative 'encryption_session'
 
 module Tanker
@@ -80,17 +81,19 @@ module Tanker
 
     private
 
-    def encrypt_common(data, encryption_options = nil)
-      unless !encryption_options || encryption_options.is_a?(EncryptionOptions)
+    def encrypt_common(data, encryption_options)
+      unless encryption_options.nil? || 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
+      options = encryption_options || EncryptionOptions.new
+
+      encrypted_size = CTanker.tanker_encrypted_size(data.bytesize, options[:padding_step])
       outbuf = FFI::MemoryPointer.new(:char, encrypted_size)
 
-      CTanker.tanker_encrypt(@ctanker, outbuf, inbuf, data.bytesize, encryption_options).get
+      CTanker.tanker_encrypt(@ctanker, outbuf, inbuf, data.bytesize, options).get
 
       outbuf.read_string encrypted_size
     end

data/lib/tanker/core/encryption_session.rb

@@ -33,7 +33,7 @@ module Tanker
     def encrypt_common(data)
       inbuf = FFI::MemoryPointer.from_string(data)
 
-      encrypted_size = CTanker.tanker_encryption_session_encrypted_size data.bytesize
+      encrypted_size = CTanker.tanker_encryption_session_encrypted_size(@csession, data.bytesize)
       outbuf = FFI::MemoryPointer.new(:char, encrypted_size)
 
       CTanker.tanker_encryption_session_encrypt(@csession, outbuf, inbuf, data.bytesize).get

data/lib/tanker/core/verification.rb

@@ -93,4 +93,16 @@ module Tanker
       @preverified_phone_number = preverified_phone_number
     end
   end
+
+  class E2ePassphraseVerification < Verification
+    attr_reader :e2e_passphrase
+
+    def initialize(e2e_passphrase)
+      super()
+
+      ASSERT_UTF8.call(e2e_passphrase)
+
+      @e2e_passphrase = e2e_passphrase
+    end
+  end
 end

data/lib/tanker/core/verification_method.rb

@@ -64,4 +64,6 @@ module Tanker
       super && preverified_phone_number == other.preverified_phone_number
     end
   end
+
+  class E2ePassphraseVerificationMethod < VerificationMethod; end
 end

data/lib/tanker/core/version.rb

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

data/lib/tanker/encryption_options.rb

@@ -6,7 +6,8 @@ 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)
+    def initialize(share_with_users: [], share_with_groups: [], share_with_self: true,
+                   padding_step: Padding::AUTO)
       super()
 
       @users_objs = share_with_users.map { |id| CTanker.new_cstring id }
@@ -17,12 +18,13 @@ module Tanker
       groups = FFI::MemoryPointer.new(:pointer, share_with_groups.length)
       groups.write_array_of_pointer(@groups_objs)
 
-      self[:version] = 3
+      self[:version] = 4
       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
+      self[:padding_step] = padding_step.native_value
     end
 
     layout :version, :uint8,
@@ -30,6 +32,33 @@ module Tanker
            :nb_recipient_public_identities, :uint32,
            :recipient_group_ids, :pointer,
            :nb_recipient_group_ids, :uint32,
-           :share_with_self, :bool
+           :share_with_self, :bool,
+           :padding_step, :uint32
+  end
+
+  class Padding
+    private_class_method :new
+    attr_reader :native_value
+
+    def initialize(native_value)
+      super()
+      @native_value = native_value
+    end
+
+    AUTO = new 0
+    OFF = new 1
+
+    def self.step(value)
+      unless value.is_a?(Integer)
+        raise TypeError,
+              "expected step to be an Integer >= 2, but got a #{value.class}"
+      end
+      unless value >= 2
+        raise ArgumentError,
+              "expected step to be an Integer >= 2, but got #{value}"
+      end
+
+      new(value)
+    end
   end
 end

data/lib/tanker/verification_options.rb

@@ -5,14 +5,16 @@ require 'ffi'
 module Tanker
   # Options that can be given when using a verification method
   class VerificationOptions < FFI::Struct
-    def initialize(with_session_token: false)
+    def initialize(with_session_token: false, allow_e2e_method_switch: false)
       super()
 
-      self[:version] = 1
+      self[:version] = 2
       self[:with_session_token] = with_session_token ? 1 : 0
+      self[:allow_e2e_method_switch] = allow_e2e_method_switch ? 1 : 0
     end
 
     layout :version, :uint8,
-           :with_session_token, :uint8
+           :with_session_token, :uint8,
+           :allow_e2e_method_switch, :uint8
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.32.0.alpha.1
+  version: 2.32.0.beta.2
 platform: ruby
 authors:
 - Tanker team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi