tanker-core 2.30.1.alpha.1 → 2.30.1.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f965af6640e6603ed8c76ceb3b9af8c02a70ac767e7c4db364df13fca40caf08
-  data.tar.gz: 2cad737772cb42913f419eb7e619082acef770b3477b65dcc7f35293bffcc41d
+  metadata.gz: 176eda680bd6e4a05f0e56fbfb64a7a159a979a69a005e96e9426d4127d13153
+  data.tar.gz: 98f787f9ba98a4967ea87e3f6de15b31a58320b500ddaa445c490b6106482fc6
 SHA512:
-  metadata.gz: 20b15f5fba9ea29c1f94b23be2a8d629e9b965730f9587aa377bdcc81c1631492a5c9821fea634be2938122a05e820dfadec5af0e4097e8152d2359e7989d247
-  data.tar.gz: 7b168937a393fc0a2d300f06454533cb738048b09aba2e04e41a4b5280cce4362f114e6c92b164f9deb637efee4f14118ae4735051ec5e455c1b908a29c5900d
+  metadata.gz: 9a77ea22e2dc88803b03cd5650083a208002efed8cd7b372a9a0c6c368830778eb5493ce1152a95e98afe0bf9fa60f708c9a24e56e6d979fb8670c688b5d7682
+  data.tar.gz: 8af984409782e7319dbe6e180bb43bbe770a954dfdaecb5ed31a16fc3e0ea4d94f2e2a8a40fab61a8f5c651d8f93beb7c60984efa39b033a4db780c83c351857

data/lib/tanker/admin/app.rb

@@ -4,21 +4,21 @@ module Tanker
   class Admin
     # Information from the Admin SDK concerning a Tanker application
     class App
-      attr_reader :url, :id, :auth_token, :private_key
+      attr_reader :admin, :id, :auth_token, :secret
 
-      def initialize(trustchain_url:, id:, auth_token:, private_key:)
-        @trustchain_url = trustchain_url
+      def initialize(admin:, id:, auth_token:, secret:)
+        @admin = admin
         @id = id
         @auth_token = auth_token
-        @private_key = private_key
+        @secret = secret
       end
 
       def get_email_verification_code(email)
-        CAdmin.tanker_get_email_verification_code(@trustchain_url, @id, @auth_token, email).get_string
+        @admin.get_email_verification_code(@id, @auth_token, email)
       end
 
       def get_sms_verification_code(phone_number)
-        CAdmin.tanker_get_sms_verification_code(@trustchain_url, @id, @auth_token, phone_number).get_string
+        @admin.get_sms_verification_code(@id, @auth_token, phone_number)
       end
     end
   end

data/lib/tanker/admin/app_update_options.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Tanker
+  class Admin
+    class AppUpdateOptions
+      attr_accessor :oidc_client_id, :oidc_client_provider, :preverified_verification, :user_enrollment
+
+      def initialize(oidc_client_id: nil, oidc_client_provider: nil,
+                     preverified_verification: nil, user_enrollment: nil)
+        @oidc_client_id = oidc_client_id
+        @oidc_client_provider = oidc_client_provider
+        @preverified_verification = preverified_verification
+        @user_enrollment = user_enrollment
+      end
+
+      def as_json(_options = {})
+        {
+          oidc_client_id: @oidc_client_id,
+          oidc_provider: @oidc_client_provider,
+          preverified_verification_enabled: @preverified_verification,
+          enroll_users_enabled: @user_enrollment
+        }
+      end
+    end
+  end
+end

data/lib/tanker/admin/client.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'faraday'
+require 'faraday_middleware'
+
+require_relative 'app'
+require_relative 'app_update_options'
+
+module Tanker
+  class Admin
+    class Client
+      def self.init_conn(conn)
+        conn.request :json
+        conn.response :raise_error
+        ## in case of verbosity need
+        # require 'logger'
+        # conn.response :logger, ::Logger.new(STDOUT), bodies: true
+        conn.response :json
+        conn.adapter :net_http
+        conn
+      end
+
+      def initialize(app_management_token:, app_management_url:, api_url:, environment_name:, trustchain_url:)
+        @app_management_token = app_management_token
+        @app_management_url = app_management_url
+        @api_url = api_url
+        @environment_name = environment_name
+        @trustchain_url = trustchain_url
+        @conn = Faraday.new(url: "#{@app_management_url}/v1/apps") do |conn|
+          conn.request :authorization, 'Bearer', @app_management_token
+          self.class.init_conn(conn)
+        end
+      end
+
+      def create_app(name)
+        response = @conn.post do |req|
+          req.body = { name: name, environment_name: @environment_name }
+          req.headers['Accept'] = 'application/json'
+        end
+        App.new(
+          admin: self,
+          id: response.body['app']['id'],
+          auth_token: response.body['app']['auth_token'],
+          secret: response.body['app']['secret']
+        )
+      end
+
+      def delete_app(app_id)
+        capp_id = Faraday::Utils.escape(app_id)
+        @conn.delete(capp_id)
+      end
+
+      def app_update(app_id, app_update_options)
+        capp_id = Faraday::Utils.escape(app_id)
+        response = @conn.patch(capp_id) do |req|
+          req.body = app_update_options.as_json
+        end
+        response.body
+      end
+
+      def get_email_verification_code(app_id, auth_token, email)
+        conn = Faraday.new(url: @api_url) do |f|
+          self.class.init_conn(f)
+        end
+        response = conn.post('/verification/email/code', { email: email, app_id: app_id, auth_token: auth_token })
+        response.body['verification_code']
+      end
+
+      def get_sms_verification_code(app_id, auth_token, phone_number)
+        conn = Faraday.new(url: @api_url) do |f|
+          self.class.init_conn(f)
+        end
+        response = conn.post('/verification/sms/code',
+                             { phone_number: phone_number, app_id: app_id, auth_token: auth_token })
+        response.body['verification_code']
+      end
+    end
+  end
+end

data/lib/tanker/admin.rb

@@ -1,59 +1,5 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require_relative 'admin/c_admin'
-require_relative 'admin/c_admin/c_app_descriptor'
-require_relative 'admin/c_admin/c_app_update_options'
+require_relative 'admin/client'
 require_relative 'admin/app'
-
-module Tanker
-  class Admin
-    def initialize(app_management_token:, app_management_url:, api_url:, environment_name:, trustchain_url:)
-      @app_management_token = app_management_token
-      @app_management_url = app_management_url
-      @api_url = api_url
-      @environment_name = environment_name
-      @trustchain_url = trustchain_url
-    end
-
-    # Authenticate to the Tanker admin server API
-    # This must be called before doing any other operation
-    def connect
-      @cadmin = CAdmin.tanker_admin_connect(@app_management_url, @app_management_token, @environment_name).get
-      cadmin_addr = @cadmin.address
-      ObjectSpace.define_finalizer(@cadmin) do |_|
-        CAdmin.tanker_admin_destroy(FFI::Pointer.new(:void, cadmin_addr)).get
-      end
-    end
-
-    def create_app(name)
-      assert_connected
-      descriptor_ptr = CAdmin.tanker_admin_create_app(@cadmin, name).get
-      descriptor = CAdmin::CAppDescriptor.new(descriptor_ptr)
-      App.new(
-        trustchain_url: @trustchain_url,
-        id: descriptor[:id],
-        auth_token: descriptor[:auth_token],
-        private_key: descriptor[:private_key]
-      )
-    end
-
-    def delete_app(app_id)
-      assert_connected
-      CAdmin.tanker_admin_delete_app(@cadmin, app_id).get
-    end
-
-    def app_update(app_id, app_update_options)
-      assert_connected
-      CAdmin.tanker_admin_app_update(@cadmin, app_id, app_update_options).get
-    end
-
-    private
-
-    def assert_connected
-      raise 'You need to connect() before using the admin API!' if @cadmin.nil?
-    end
-  end
-
-  private_constant :Admin
-end
+require_relative 'admin/app_update_options'

data/lib/tanker/c_tanker/c_http.rb

@@ -4,6 +4,8 @@ require 'ffi'
 
 module Tanker
   module CTanker
+    extend FFI::Library
+
     class CHttpRequest < FFI::Struct
       layout :method, :string,
              :url, :string,

data/lib/tanker/c_tanker.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'ffi'
-require_relative 'c_tanker/init'
 require_relative 'core/options'
 require_relative 'sharing_options'
 require_relative 'encryption_options'
@@ -13,8 +12,19 @@ require_relative 'c_tanker/c_verification_method'
 require_relative 'c_tanker/c_log_record'
 require_relative 'c_tanker/c_device_info'
 
+module FFI::Library
+  # Marking a function blocking releases the global Ruby lock.
+  # This is required for every function that could invoke a callback (including log handler) in another thread
+  def blocking_attach_function(func, args, returns = nil)
+    attach_function func, args, returns, blocking: true
+  end
+end
+
 module Tanker
   module CTanker
+    extend FFI::Library
+    ffi_lib get_path('ctanker')
+
     typedef :pointer, :session_pointer
     typedef :pointer, :enc_sess_pointer
     typedef :pointer, :stream_pointer

data/lib/tanker/core/encryption.rb

@@ -28,9 +28,9 @@ module Tanker
       decrypted_size = CTanker.tanker_decrypted_size(inbuf, data.bytesize).get.address
       outbuf = FFI::MemoryPointer.new(:char, decrypted_size)
 
-      CTanker.tanker_decrypt(@ctanker, outbuf, inbuf, data.bytesize).get
+      clear_size = CTanker.tanker_decrypt(@ctanker, outbuf, inbuf, data.bytesize).get.address
 
-      outbuf.read_string decrypted_size
+      outbuf.read_string clear_size
     end
 
     def decrypt_utf8(data)

data/lib/tanker/core/session.rb

@@ -41,7 +41,7 @@ module Tanker
 
       method_base_addr = method_list_ptr.read_pointer
       method_list = count.times.map do |i|
-        method_ptr = method_base_addr + i * CTanker::CVerificationMethod.size
+        method_ptr = method_base_addr + (i * CTanker::CVerificationMethod.size)
         CTanker::CVerificationMethod.new(method_ptr).to_verification_method
       end
       CTanker.tanker_free_verification_method_list method_list_ptr
@@ -58,7 +58,7 @@ module Tanker
 
       method_base_addr = device_list_ptr.read_pointer
       device_info_list = count.times.map do |i|
-        method_ptr = method_base_addr + i * CTanker::CDeviceInfo.size
+        method_ptr = method_base_addr + (i * CTanker::CDeviceInfo.size)
         CTanker::CDeviceInfo.new(method_ptr)
       end
       CTanker.tanker_free_device_list device_list_ptr
@@ -76,7 +76,7 @@ module Tanker
       CTanker.tanker_create_oidc_nonce(@ctanker).get_string
     end
 
-    def _oidc_test_nonce=(nonce)
+    def oidc_test_nonce=(nonce)
       CTanker.tanker_set_oidc_test_nonce(@ctanker, nonce).get
     end
 

data/lib/tanker/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.30.1.alpha.1
+  version: 2.30.1.alpha.2
 platform: ruby
 authors:
 - Tanker team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -136,9 +136,8 @@ files:
 - lib/tanker-core.rb
 - lib/tanker/admin.rb
 - lib/tanker/admin/app.rb
-- lib/tanker/admin/c_admin.rb
-- lib/tanker/admin/c_admin/c_app_descriptor.rb
-- lib/tanker/admin/c_admin/c_app_update_options.rb
+- lib/tanker/admin/app_update_options.rb
+- lib/tanker/admin/client.rb
 - lib/tanker/c_tanker.rb
 - lib/tanker/c_tanker/c_datastore.rb
 - lib/tanker/c_tanker/c_device_info.rb
@@ -150,7 +149,6 @@ files:
 - lib/tanker/c_tanker/c_tanker_error.rb
 - lib/tanker/c_tanker/c_verification.rb
 - lib/tanker/c_tanker/c_verification_method.rb
-- lib/tanker/c_tanker/init.rb
 - lib/tanker/core.rb
 - lib/tanker/core/attach_result.rb
 - lib/tanker/core/encryption.rb
@@ -179,6 +177,7 @@ licenses:
 metadata:
   homepage_uri: https://tanker.io
   source_code_uri: https://github.com/TankerHQ/sdk-ruby
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/tanker/admin/c_admin/c_app_descriptor.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'ffi'
-
-module Tanker
-  class Admin
-    class CAdmin::CAppDescriptor < FFI::ManagedStruct
-      layout :name, :string,
-             :id, :string,
-             :auth_token, :string,
-             :private_key, :string,
-             :public_key, :string
-
-      def get_email_verification_code(email)
-        CTanker.tanker_get_email_verification_code(email).get
-      end
-
-      def get_sms_verification_code(phone_number)
-        CTanker.tanker_get_sms_verification_code(phone_number).get
-      end
-
-      def self.release(ptr)
-        CAdmin.tanker_admin_app_descriptor_free ptr
-      end
-    end
-  end
-end

data/lib/tanker/admin/c_admin/c_app_update_options.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'ffi'
-require 'tanker/c_tanker/c_string'
-
-module Tanker
-  class Admin
-    class AppUpdateOptions < FFI::Struct
-      def initialize(oidc_client_id: nil, oidc_client_provider: nil,
-                     preverified_verification: nil, user_enrollment: nil)
-        super()
-        self[:version] = 4
-        unless oidc_client_id.nil?
-          @oidc_client_id = CTanker.new_cstring oidc_client_id
-          self[:oidc_client_id] = @oidc_client_id
-        end
-        unless oidc_client_provider.nil?
-          @oidc_client_provider = CTanker.new_cstring oidc_client_provider
-          self[:oidc_client_provider] = @oidc_client_provider
-        end
-        unless preverified_verification.nil?
-          boolptr = FFI::MemoryPointer.new(:bool, 1)
-          boolptr.put(:bool, 0, preverified_verification)
-          @preverified_verification = boolptr
-          self[:preverified_verification] = @preverified_verification
-        end
-        unless user_enrollment.nil? # rubocop:disable Style/GuardClause no different than the other parameters
-          boolptr = FFI::MemoryPointer.new(:bool, 1)
-          boolptr.put(:bool, 0, user_enrollment)
-          @user_enrollment = boolptr
-          self[:user_enrollment] = @user_enrollment
-        end
-      end
-
-      layout :version, :uint8,
-             :oidc_client_id, :pointer,
-             :oidc_client_provider, :pointer,
-             :preverified_verification, :pointer,
-             :user_enrollment, :pointer
-    end
-  end
-end

data/lib/tanker/admin/c_admin.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'ffi'
-require 'tanker/c_tanker/c_future'
-require 'tanker/c_tanker/c_lib'
-require_relative 'c_admin/c_app_update_options'
-
-module Tanker
-  class Admin
-    module CAdmin
-      extend FFI::Library
-
-      ffi_lib Tanker::CTanker.get_path('tanker_admin-c')
-      typedef :pointer, :admin_pointer
-
-      # NOTE: We use those CFutures with the tanker_future_* functions exposed by CTanker,
-      # this is safe because we only do simple synchronous blocking calls, without using tanker_future_then.
-
-      attach_function :tanker_admin_connect, [:string, :string, :string], CTanker::CFuture
-      attach_function :tanker_admin_create_app, [:admin_pointer, :string], CTanker::CFuture
-      attach_function :tanker_admin_delete_app, [:admin_pointer, :string], CTanker::CFuture
-      attach_function :tanker_admin_destroy, [:admin_pointer], CTanker::CFuture
-      attach_function :tanker_admin_app_descriptor_free, [:pointer], :void
-      attach_function :tanker_admin_app_update, [:admin_pointer, :string,
-                                                 Tanker::Admin::AppUpdateOptions], CTanker::CFuture
-      attach_function :tanker_get_email_verification_code, [:string, :string, :string, :string], CTanker::CFuture
-      attach_function :tanker_get_sms_verification_code, [:string, :string, :string, :string], CTanker::CFuture
-    end
-
-    private_constant :CAdmin
-  end
-end

data/lib/tanker/c_tanker/init.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'ffi'
-
-module FFI::Library
-  # Marking a function blocking releases the global Ruby lock.
-  # This is required for every function that could invoke a callback (including log handler) in another thread
-  def blocking_attach_function(func, args, returns = nil)
-    attach_function func, args, returns, blocking: true
-  end
-end
-
-module Tanker
-  module CTanker
-    extend FFI::Library
-    ffi_lib get_path('ctanker')
-  end
-
-  private_constant :CTanker
-end