tanker-core 4.1.0 → 4.2.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e927500e7d57facc981b728b3da9f9647bd7bb1a3bbc8a98e9d73b204fad7654
-  data.tar.gz: e338e9d3e311c9fb9b11d4176ac7e98f2a2db4b6438888a86f34a2718483adc3
+  metadata.gz: 7e2f9fa0aba3b29e9ef0345f227c6f42d1bd19a67310ac270907110b8a320ce7
+  data.tar.gz: e605b66a88ac7c7530be1d635ef461cbcbc32219c853f57d9a0c4fbf577c9717
 SHA512:
-  metadata.gz: 1a8db84bfbf7389dc54b5e0e3847a9991af3fa160672ab5e36dd351be67f3f67c74a9ddce76bc0261d3abdcc99c650da90eebf4aaedac4e9d864eda4f6951a8c
-  data.tar.gz: 8b6d077d01257c8c59149a419f086428e48ed2beef169bceea1669f8f90e78afdf8c6aab06b9aef9b421036e0cf9c5c020fd6864c760d59c529415c7f255d4d9
+  metadata.gz: 2a6e9a052713c65f50126eb32094c532a6f065d6f4dc7aaf5e77bda9681e02312f3ef3a6f25d8cbee4bd563f7fb25b49b93c191a005295b4b43613f5e0551954
+  data.tar.gz: 2337e1564ce91d9fbeb304ce44f180ffc9502601bd8c6a0421c162048a416b3ea5f501d5817520b21d73094dca1ef4ce563677b5c8952d858239d6398e5fb0f6

data/lib/tanker/c_tanker/c_future.rb

@@ -12,7 +12,7 @@ module Tanker
     ffi_lib get_path('ctanker')
 
     class CFuture < FFI::AutoPointer
-      def initialize(ptr, proc = nil, &block)
+      def initialize(ptr, proc = nil, &)
         super
         @cfuture = ptr
       end

data/lib/tanker/c_tanker/c_http.rb

@@ -6,44 +6,75 @@ module Tanker
   module CTanker
     extend FFI::Library
 
+    class CHttpRequestHeader < FFI::Struct
+      layout :name, :string,
+             :value, :string
+    end
+
     class CHttpRequest < FFI::Struct
       layout :method, :string,
              :url, :string,
-             :instance_id, :string,
-             :authorization, :string,
+             :headers, :pointer,
+             :num_headers, :int32,
              :body, :pointer,
              :body_size, :int32
     end
 
+    class CHttpResponseHeader < FFI::Struct
+      layout :name, :pointer,
+             :value, :pointer
+
+      def initialize(name, value)
+        super()
+
+        @name = CTanker.new_cstring name
+        @value = CTanker.new_cstring value
+
+        self[:name] = @name
+        self[:value] = @value
+      end
+    end
+
     class CHttpResponse < FFI::Struct
-      def self.new_ok(status_code:, content_type:, body:)
-        new nil, status_code, content_type, body
+      def self.new_ok(status_code:, headers:, body:)
+        new nil, status_code, headers, body
       end
 
       def self.new_error(msg)
         new msg, nil, nil, nil
       end
 
-      def initialize(error_msg, status_code, content_type, body)
+      def initialize(error_msg, status_code, headers, body)
         super()
 
         if error_msg
           @error_msg = CTanker.new_cstring(error_msg)
           self[:error_msg] = @error_msg
         else
-          @content_type = CTanker.new_cstring content_type
+          raise TypeError, 'headers argument is not an Array[HttpHeader]' unless headers.is_a?(Array)
+
           @body = FFI::MemoryPointer.from_string(body)
 
           self[:error_msg] = nil
-          self[:content_type] = @content_type
+          self[:num_headers] = headers.length
           self[:body] = @body
           self[:body_size] = body.bytesize
           self[:status_code] = status_code
+
+          @headers = []
+          self[:headers] = FFI::MemoryPointer.new(CHttpResponseHeader, self[:num_headers])
+          headers.each_with_index do |header, idx|
+            @headers.push(CHttpResponseHeader.new(header.name, header.value))
+            # NOTE: memcopy
+            str = @headers[idx].pointer.read_bytes CHttpResponseHeader.size
+            self[:headers].put_bytes(idx * CHttpResponseHeader.size, str, 0, CHttpResponseHeader.size)
+          end
         end
       end
 
       layout :error_msg, :pointer,
-             :content_type, :pointer,
+             :headers, :pointer,
+             :num_headers, :int32,
              :body, :pointer,
              :body_size, :int64,
              :status_code, :int32

data/lib/tanker/c_tanker/c_verification.rb

@@ -42,6 +42,45 @@ module Tanker
       end
     end
 
+    class COIDCVerification < FFI::Struct
+      layout :version, :uint8,
+             :subject, :pointer,
+             :provider_id, :pointer
+
+      def initialize(subject, provider_id)
+        super()
+
+        # NOTE: Instance variables are required to keep the CStrings alive
+        @subject = CTanker.new_cstring subject
+        @provider_id = CTanker.new_cstring provider_id
+
+        self[:version] = 1
+        self[:subject] = @subject
+        self[:provider_id] = @provider_id
+      end
+    end
+
+    class COIDCAuthorizationCodeVerification < FFI::Struct
+      layout :version, :uint8,
+             :provider_id, :pointer,
+             :authorization_code, :pointer,
+             :state, :pointer
+
+      def initialize(provider_id, authorization_code, state)
+        super()
+
+        # NOTE: Instance variables are required to keep the CStrings alive
+        @provider_id = CTanker.new_cstring provider_id
+        @authorization_code = CTanker.new_cstring authorization_code
+        @state = CTanker.new_cstring state
+
+        self[:version] = 1
+        self[:provider_id] = @provider_id
+        self[:authorization_code] = @authorization_code
+        self[:state] = @state
+      end
+    end
+
     class CVerification < FFI::Struct
       layout :version, :uint8,
              :type, :uint8,
@@ -52,7 +91,9 @@ module Tanker
              :oidc_id_token, :pointer,
              :phone_number_verification, CPhoneNumberVerification,
              :preverified_email, :pointer,
-             :preverified_phone_number, :pointer
+             :preverified_phone_number, :pointer,
+             :preverified_oidc, COIDCVerification,
+             :oidc_authorization_code_verification, COIDCAuthorizationCodeVerification
 
       TYPE_EMAIL = 1
       TYPE_PASSPHRASE = 2
@@ -62,8 +103,10 @@ module Tanker
       TYPE_PREVERIFIED_EMAIL = 6
       TYPE_PREVERIFIED_PHONE_NUMBER = 7
       TYPE_E2E_PASSPHRASE = 8
+      TYPE_PREVERIFIED_OIDC = 9
+      TYPE_OIDC_AUTHORIZATION_CODE = 10
 
-      def initialize(verification) # rubocop:disable Metrics/CyclomaticComplexity Not relevant for a case/when
+      def initialize(verification) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity Not relevant for a case/when
         super()
 
         unless verification.is_a? Tanker::Verification
@@ -103,11 +146,22 @@ module Tanker
           @e2e_passphrase = CTanker.new_cstring verification.e2e_passphrase
           self[:type] = TYPE_E2E_PASSPHRASE
           self[:e2e_passphrase] = @e2e_passphrase
+        when Tanker::PreverifiedOIDCVerification
+          @preverified_oidc = COIDCVerification.new verification.subject, verification.provider_id
+          self[:type] = TYPE_PREVERIFIED_OIDC
+          self[:preverified_oidc] = @preverified_oidc
+        when Tanker::OIDCAuthorizationCodeVerification
+          self[:type] = TYPE_OIDC_AUTHORIZATION_CODE
+          self[:oidc_authorization_code_verification] = COIDCAuthorizationCodeVerification.new(
+            verification.provider_id,
+            verification.authorization_code,
+            verification.state
+          )
         else
           raise ArgumentError, 'Unknown Tanker::Verification type!'
         end
 
-        self[:version] = 6
+        self[:version] = 8
       end
     end
 

data/lib/tanker/c_tanker/c_verification_method.rb

@@ -20,6 +20,8 @@ module Tanker
       TYPE_PREVERIFIED_EMAIL = 6
       TYPE_PREVERIFIED_PHONE_NUMBER = 7
       TYPE_E2E_PASSPHRASE = 8
+      # TYPE_PREVERIFIED_OIDC = 9 # Preverified OIDC is not exposed as a VerificationMethod
+      # TYPE_OIDC_AUTHORIZATION_CODE, = 10 # OIDC authorization code is not exposed as a VerificationMethod
 
       def to_verification_method # rubocop:disable Metrics/CyclomaticComplexity Not relevant for a case/when
         case self[:type]

data/lib/tanker/c_tanker.rb

@@ -42,6 +42,7 @@ module Tanker
     blocking_attach_function :tanker_set_oidc_test_nonce, [:session_pointer, :string], CFuture
 
     blocking_attach_function :tanker_attach_provisional_identity, [:session_pointer, :string], CFuture
+    blocking_attach_function :tanker_free_attach_result, [:pointer], :void
     blocking_attach_function :tanker_verify_provisional_identity, [:session_pointer, CVerification], CFuture
 
     blocking_attach_function :tanker_encrypted_size, [:uint64, :uint32], :uint64
@@ -89,6 +90,9 @@ module Tanker
 
     blocking_attach_function :tanker_prehash_password, [:string], CFuture
 
+    blocking_attach_function :tanker_authenticate_with_idp, [:session_pointer, :string, :string], CFuture
+    blocking_attach_function :tanker_free_authenticate_with_idp_result, [:pointer], :void
+
     blocking_attach_function :tanker_free_buffer, [:pointer], :void
     blocking_attach_function :tanker_free_verification_method_list, [:pointer], :void
   end

data/lib/tanker/core/http.rb

@@ -4,6 +4,15 @@ require 'faraday'
 
 module Tanker
   module Http
+    class HttpHeader
+      attr_reader :name, :value
+
+      def initialize(name, value)
+        @name = name
+        @value = value
+      end
+    end
+
     class HttpRequest
       @@mutex = Mutex.new # rubocop:disable Style/ClassVars I have no idea why you don't like class vars
       @@current_request_id = 0 # rubocop:disable Style/ClassVars
@@ -13,8 +22,7 @@ module Tanker
       attr_reader :id
       attr_reader :method
       attr_reader :url
-      attr_reader :instance_id
-      attr_reader :authorization
+      attr_reader :headers
       attr_reader :body
       attr_reader :crequest
 
@@ -38,10 +46,16 @@ module Tanker
 
         @method = self.class.method_str_to_symbol crequest[:method]
         @url = crequest[:url]
-        @instance_id = crequest[:instance_id]
-        @authorization = crequest[:authorization]
         @body = crequest[:body].read_string_length(crequest[:body_size])
 
+        count = crequest[:num_headers]
+        headers_base_addr = crequest[:headers]
+        @headers = count.times.map do |i|
+          header_ptr = headers_base_addr + (i * CTanker::CHttpRequestHeader.size)
+          c_header = CTanker::CHttpRequestHeader.new header_ptr
+          HttpHeader.new(c_header[:name], c_header[:value])
+        end
+
         # Keep the crequest because we need its address to answer to Tanker
         @crequest = crequest
       end
@@ -123,18 +137,27 @@ module Tanker
       end
 
       def process_request(request)
-        fresponse = Faraday.run_request(request.method, request.url, request.body, {
-          'X-Tanker-SdkType' => @sdk_type,
-          'X-Tanker-SdkVersion' => @sdk_version,
-          'Authorization' => request.authorization,
-          'X-Tanker-Instanceid' => request.instance_id,
-          # net-http really wants a Content-Type
-          'Content-Type' => 'application/data'
-        }.compact)
+        headers = Faraday::Utils::Headers.new
+
+        request.headers.each do |header|
+          # Faraday stores identical headers as a comma separated string
+          headers[header.name] = [headers[header.name], header.value].compact
+        end
+
+        # overwrite sdk-native headers
+        headers['X-Tanker-SdkType'] = @sdk_type
+        headers['X-Tanker-SdkVersion'] = @sdk_version
+
+        fresponse = Faraday.run_request(request.method, request.url, request.body, headers)
 
         request.complete_if_not_canceled do
+          # Faraday stores identical headers as a comma separated string
+          # So we will only see a single header in sdk-native
+          headers = fresponse.headers.map do |name, value|
+            HttpHeader.new name, value
+          end
           cresponse = CTanker::CHttpResponse.new_ok status_code: fresponse.status,
-                                                    content_type: fresponse.headers['content-type'],
+                                                    headers:,
                                                     body: fresponse.body
           CTanker.tanker_http_handle_response(request.crequest, cresponse)
         end
@@ -151,7 +174,7 @@ module Tanker
       end
 
       def send_request(crequest, _cdata)
-        request = HttpRequest.new crequest: crequest
+        request = HttpRequest.new(crequest:)
         ThreadPool.push(proc do
           process_request request
         end)

data/lib/tanker/core/session.rb

@@ -69,6 +69,8 @@ module Tanker
       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 if method_ptr.address != 0)
+
+      CTanker.tanker_free_attach_result(FFI::Pointer.new(:void, attach_ptr.address))
       AttachResult.new attach_status, method
     end
 

data/lib/tanker/core/verification.rb

@@ -70,6 +70,22 @@ module Tanker
     end
   end
 
+  class OIDCAuthorizationCodeVerification < Verification
+    attr_reader :provider_id, :authorization_code, :state
+
+    def initialize(provider_id, authorization_code, state)
+      super()
+
+      ASSERT_UTF8.call(provider_id)
+      ASSERT_UTF8.call(authorization_code)
+      ASSERT_UTF8.call(state)
+
+      @provider_id = provider_id
+      @authorization_code = authorization_code
+      @state = state
+    end
+  end
+
   class PreverifiedEmailVerification < Verification
     attr_reader :preverified_email
 
@@ -94,6 +110,20 @@ module Tanker
     end
   end
 
+  class PreverifiedOIDCVerification < Verification
+    attr_reader :provider_id, :subject
+
+    def initialize(subject, provider_id)
+      super()
+
+      ASSERT_UTF8.call(provider_id)
+      ASSERT_UTF8.call(subject)
+
+      @provider_id = provider_id
+      @subject = subject
+    end
+  end
+
   class E2ePassphraseVerification < Verification
     attr_reader :e2e_passphrase
 

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '4.1.0'
+    VERSION = '4.2.0.alpha.1'
 
     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: 4.1.0
+  version: 4.2.0.alpha.1
 platform: ruby
 authors:
 - Tanker team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -100,12 +100,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: