tanker-core 2.32.0.beta.2 → 2.32.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ecc5854b8a1df78015933a12b40c24701f7d9d46425939178097ec8861d0e1
-  data.tar.gz: a84443d60fadfe6dd7ab84b47850accd40ffbf0e237b6b72606753d8011f1f77
+  metadata.gz: 042b0f9b9fe8964bf0d3da88e1bffb4646f260304627d6a6813bb429838dc255
+  data.tar.gz: 498a8a4ba6fe003dcc23f255f7263d33d8d9d63f028e53e36872e416a859e5ff
 SHA512:
-  metadata.gz: cf0f2020ec774886f32b8e3558de12fbeb1b1c712f815c81826f9598d8a88733002054851556f97cb852a62d7b8f81239bddf1e2c572cca976f60a521fbd3663
-  data.tar.gz: 5e7b2549806a0718091223d2ab088e477a926dc57ff712065782ea025b474a258dab52a1f713ecd8b8a29e1aef6bcbe957fc72e462405d126cd430a5cc0d3991
+  metadata.gz: e5e64eac1254d2850fad38e28cbc2837703e589bf876ef9ae25693f0967a1b200800e0b363fd404beb7614e387eced8051c142b3e43fb820302f2c504fbe2124
+  data.tar.gz: 90b6995a2b1c1b22a7e5a68d1011806d60872633314e70ee1f184ea889bb42ff9da2f44fc6219d44d1a519889ca743014ef27a1af8a5808c44e294fb1ac986ea

data/lib/tanker/c_tanker/c_lib.rb

@@ -14,7 +14,7 @@ end
 module Tanker
   module CTanker
     def self.get_path(name)
-      File.expand_path "../../../vendor/tanker/#{FFI::Platform::OS}-#{FFI::Platform::ARCH}/"\
+      File.expand_path "../../../vendor/tanker/#{FFI::Platform::OS}-#{FFI::Platform::ARCH}/" \
                        "#{FFI::Platform::LIBPREFIX}#{name}.#{FFI::Platform::LIBSUFFIX}", __dir__
     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, :uint32], :uint64
+    blocking_attach_function :tanker_encrypted_size, [:uint64], :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, [:enc_sess_pointer, :uint64], :uint64
+    blocking_attach_function :tanker_encryption_session_encrypted_size, [: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,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'tanker/c_tanker'
-require 'tanker/encryption_options'
 require_relative 'encryption_session'
 
 module Tanker
@@ -81,19 +80,17 @@ module Tanker
 
     private
 
-    def encrypt_common(data, encryption_options)
-      unless encryption_options.nil? || encryption_options.is_a?(EncryptionOptions)
+    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)
 
-      options = encryption_options || EncryptionOptions.new
-
-      encrypted_size = CTanker.tanker_encrypted_size(data.bytesize, options[:padding_step])
+      encrypted_size = CTanker.tanker_encrypted_size data.bytesize
       outbuf = FFI::MemoryPointer.new(:char, encrypted_size)
 
-      CTanker.tanker_encrypt(@ctanker, outbuf, inbuf, data.bytesize, options).get
+      CTanker.tanker_encrypt(@ctanker, outbuf, inbuf, data.bytesize, encryption_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(@csession, data.bytesize)
+      encrypted_size = CTanker.tanker_encryption_session_encrypted_size data.bytesize
       outbuf = FFI::MemoryPointer.new(:char, encrypted_size)
 
       CTanker.tanker_encryption_session_encrypt(@csession, outbuf, inbuf, data.bytesize).get

data/lib/tanker/core/http.rb

@@ -138,6 +138,11 @@ module Tanker
                                                     body: fresponse.body
           CTanker.tanker_http_handle_response(request.crequest, cresponse)
         end
+      rescue Faraday::ConnectionFailed => e
+        # This can happen if Faraday is using a proxy, and it rejects the request
+        # If we get a 500 from the proxy, we want to differentiate this from a real server error
+        cresponse = CTanker::CHttpResponse.new_error "#{e.class}: #{e.message}"
+        CTanker.tanker_http_handle_response(request.crequest, cresponse)
       rescue Exception => e # rubocop:disable Lint/RescueException I do want to rescue all exceptions
         # NOTE: when debugging, you might want to uncomment this to print a full backtrace
         # puts "HTTP request error:\n#{e.full_message}"

data/lib/tanker/core/init.rb

@@ -14,7 +14,7 @@ module Tanker
       end
     end
 
-    def self.set_log_handler(&block) # rubocop:disable Naming/AccessorMethodName
+    def self.set_log_handler(&block)
       @log_handler_set = 1
       @log_handler = lambda do |clog|
         block.call LogRecord.new clog[:category], clog[:level], clog[:file], clog[:line], clog[:message]

data/lib/tanker/core/version.rb

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

data/lib/tanker/encryption_options.rb

@@ -6,8 +6,7 @@ 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,
-                   padding_step: Padding::AUTO)
+    def initialize(share_with_users: [], share_with_groups: [], share_with_self: true)
       super()
 
       @users_objs = share_with_users.map { |id| CTanker.new_cstring id }
@@ -18,13 +17,12 @@ module Tanker
       groups = FFI::MemoryPointer.new(:pointer, share_with_groups.length)
       groups.write_array_of_pointer(@groups_objs)
 
-      self[:version] = 4
+      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
-      self[:padding_step] = padding_step.native_value
     end
 
     layout :version, :uint8,
@@ -32,33 +30,6 @@ module Tanker
            :nb_recipient_public_identities, :uint32,
            :recipient_group_ids, :pointer,
            :nb_recipient_group_ids, :uint32,
-           :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
+           :share_with_self, :bool
   end
 end

metadata

@@ -1,127 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.32.0.beta.2
+  version: 2.32.0.beta.7
 platform: ruby
 authors:
 - Tanker team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 0.17.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.17.5
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-- !ruby/object:Gem::Dependency
-  name: tanker-identity
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description: |
   Ruby bindings for the Tanker SDK.
   Tanker is a platform as a service that allows you to easily protect your users' data with end-to-end encryption through a SDK
@@ -172,8 +88,8 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://tanker.io
-  source_code_uri: https://github.com/TankerHQ/sdk-ruby
   rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/TankerHQ/sdk-ruby
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -182,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"