tanker-core 2.6.2.alpha.8 → 2.6.2.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae4526cac191b56e3acd2fc0eb6762ae6638f3f41e78ea4010b829036eb73c3a
-  data.tar.gz: 43df75515f59586054e41708394a12c579dac4c3fc91cb2eaa2dac577cc94f62
+  metadata.gz: 69f962904a2700e1eff1d3f7d44a5a7f29be26c0048a89ffffc3ad5e5a856f82
+  data.tar.gz: 040e523c8912592aadec416c027cb925d0c6e2936e0d1364c6e6cd75cae9164c
 SHA512:
-  metadata.gz: 10eb4a1603d79a8163119a9411b2f2318a8f3255bb5c6e065df33f9eb59078a7677f50dcfad1409b3a8dac830073c96f4d618ecdffc29f0ae271275dc7f76061
-  data.tar.gz: 525ca18eb0d5bf5d3bf48154a3bbbf77311aabf7eef861a4bc28e39d1196e404630ce7bb9950ec7b4232b97a7a58fbf8d34718f467973b9136b959c36aa4e1ad
+  metadata.gz: e515de3523845ec392141a9ed06baf9c936a863cb0d905384398232c705cf182377c97cf12efedebf83055b09df8ea6d8d02dabe6620b251489790cc22a54520
+  data.tar.gz: a60601421d1c3402ebf73d4e35cdc6127c367769523697b7495635ae0a56d2d84c8acba65e5e126f4de4164f2fddb0eede58a88acc45646b7fdcaa28baeb2f10

data/lib/tanker/c_tanker/c_lib.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-require 'ffi/platform'
-
 module Tanker::CTanker
   def self.get_path(name)
-    File.expand_path "../../../vendor/tanker/#{FFI::Platform::OS}-#{FFI::Platform::ARCH}/"\
-      "#{FFI::Platform::LIBPREFIX}#{name}.#{FFI::Platform::LIBSUFFIX}", __dir__
+    if /darwin/ =~ RUBY_PLATFORM
+      ext = '.dylib'
+      subdir = 'mac64'
+    else
+      ext = '.so'
+      subdir = 'linux64'
+    end
+
+    File.expand_path "../../../vendor/libctanker/#{subdir}/tanker/lib/lib#{name}#{ext}", __dir__
   end
 end

data/lib/tanker/core/stream.rb

@@ -3,29 +3,6 @@
 require 'English'
 require 'tanker/c_tanker'
 
-# Because Ruby only has synchronous streams, we can't read them on Tanker's
-# thread (in the read callback). To work around that, we start a new Thread for
-# each read operation. This is not that bad because Ruby uses a thread pool
-# behind the scenes and creating a Thread is usually just a work pushed on a
-# queue.
-#
-# Also, there doesn't seem to easily create an IO object. The simplest way is to
-# create a pipe. A pipe is a stream where you read everything you write into it.
-# Tanker streams however are pull streams, so there must be something that pulls
-# from the Tanker stream and pushes onto the IO stream. We start a long-running
-# thread for that which just loops.
-#
-# Because so much is happening in parallel, synchronization is not trivial.
-# There's one mutex per stream, and we lock that same mutex for every critical
-# section. Here are some important constraints that must be held:
-# - Do not copy data to the Tanker buffer if tanker_stream_close has been
-# called
-# - Do not call tanker_stream_read_operation_finish if tanker_stream_close has
-# been called
-# - On the output stream, do not call tanker_stream_read on a closed/closing
-# stream. Though it is ok to close the stream after the call, but before the
-# future is resolved.
-
 module Tanker
   class Core
     def encrypt_stream(stream, encryption_options = nil)
@@ -118,6 +95,21 @@ module Tanker
     end
   end
 
+  # IMPORTANT: about synchronization
+  # Because of a design flaw in the Tanker C streaming API, it is difficult to
+  # handle cancelation. When canceling a read (closing the stream), Tanker
+  # doesn't forward the cancelation request to the input stream (there's no
+  # callback for that), which means that the callback maybe writing to a buffer
+  # that's being freed. We worked around that by adding a mutex and locking it
+  # in both the output stream and the input stream.
+  # Things to be careful about:
+  # - Do not copy data to the Tanker buffer if tanker_stream_close has been
+  # called
+  # - Do not call tanker_stream_read_operation_finish if tanker_stream_close has
+  # been called
+  # - On the output stream, do not call tanker_stream_read on a closed/closing
+  # stream. Though it is ok to close the stream after the call, but before the
+  # future is resolved.
   class IoToTankerStreamWrapper
     attr_reader :error
     attr_reader :read_method

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '2.6.2.alpha.8'
+    VERSION = '2.6.2.beta.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.6.2.alpha.8
+  version: 2.6.2.beta.2
 platform: ruby
 authors:
 - Tanker team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -165,7 +165,8 @@ files:
 - lib/tanker/encryption_options.rb
 - lib/tanker/error.rb
 - lib/tanker/sharing_options.rb
-- vendor/tanker/linux-x86_64/libctanker.so
+- vendor/libctanker/linux64/tanker/lib/libctanker.so
+- vendor/libctanker/mac64/tanker/lib/libctanker.dylib
 homepage: https://tanker.io
 licenses:
 - Apache-2.0