rack-tctp 0.9.5 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b91b55890f0a473f132a0e6c2eec7fe5aa3254
-  data.tar.gz: 8ac625d2bb5a6576a5cc164fed0b7a928419d129
+  metadata.gz: 1fb5bcf11c0cacc00595f49b429d6810b646f62a
+  data.tar.gz: 469afac39fcc7dd72568c9c5f0c62c8309e5e7b6
 SHA512:
-  metadata.gz: d93b73d45ac80ad26c8c6f5d1b10964cf6f07d47a7a4a4fde519d96d7206c74613cae47301658d6e2d50ae44ed658666c8eb6bc5323b4c9d3eba15f8543577a8
-  data.tar.gz: b68e836d5e51dd6cfbc10ff89b7b67f98ed3adeee36f34faabab4dc117d7bcdbe61bae9bd4a36f1177f51b80ce40b61335ce60927381d6636de71dbe4375330c
+  metadata.gz: 8a47f449b3ddb7da03987b77624b936c88875a46d9d64ec5b6016d070bf287d1a6b7c868ab0e92f74070c115f5219bb06c79d84bfebb6ef201dadd4677572808
+  data.tar.gz: b8cfe98bbe089fbfa476146de64e8458e7b5e9e478190b8539588bbb5f0c83ecb770966074fc00be291ccddc86ec1b0fdbcaefddcfd36f69541c31b5519ba145

data/lib/rack/tctp/halec.rb

@@ -18,8 +18,37 @@ class Rack::TCTP::HALEC
   # A server or client certificate (if any)
   attr_reader :certificate
 
+  # The thread for encrypting and decrypting data of this HALEC
+  attr_reader :async_thread
+
+  # The queue for encrypting and decrypting data
+  # @return [Queue] The async queue
+  attr_reader :async_queue
+
   def initialize(options = {})
     @url = options[:url] || nil
+
+    @async_queue = Queue.new
+
+    Thread.new do
+      begin
+        while true
+          item = @async_queue.pop
+
+          case item[0]
+            when :encrypt
+              item[2].call encrypt_data(item[1])
+            when :decrypt
+              item[2].call decrypt_data(item[1])
+            when :call
+              item[2].call
+          end
+        end
+      rescue Exception => e
+        #TODO Handle HALEC encryption thread shutdown
+        puts e
+      end
+    end
   end
 
   # Encrypts +plaintext+ data and either returns the encrypted data or calls a block with it.
@@ -28,21 +57,33 @@ class Rack::TCTP::HALEC
   # @yield Gives the encrypted data to the block
   # @yieldparam [String] The encrypted data
   def encrypt_data(plaintext, &encrypted)
-    @engine.write plaintext
+    written = @engine.write plaintext
+
+    if written < plaintext.length
+      exit -1
+    end
+
+    read_data = []
 
     while(read_chunk = @engine.extract)
-      if(block_given?)
-        encrypted.call read_chunk
-      else
-        if read_data
-          read_data.write read_chunk
-        else
-          read_data = StringIO.new(read_chunk)
-        end
+      read_data << read_chunk
+    end
+
+    if block_given?
+      read_data.each do |data|
+        encrypted.call data
       end
+    else
+      read_data.join
     end
+  end
 
-    read_data.string unless block_given?
+  # Encrypts +plaintext+ data asynchronously, yielding data to the block when done.
+  # @param [String] plaintext The plaintext
+  # @yield Gives the encrypted data to the block
+  # @yieldparam [String] The encrypted data
+  def encrypt_data_async(plaintext, &encrypted)
+    async_queue.push [:encrypt, plaintext, encrypted]
   end
 
   # Decrypts +encrypted+ data and either returns the plaintext or calls a block with it.
@@ -51,21 +92,38 @@ class Rack::TCTP::HALEC
   # @yield Gives the plaintext to the block
   # @yieldparam [String] The plaintext
   def decrypt_data(encrypted, &decrypted)
-    @engine.inject encrypted
+    injected = @engine.inject encrypted
+
+    if injected < encrypted.length
+      exit -1
+    end
+
+    read_data = []
 
     while(read_chunk = @engine.read)
-      if(block_given?)
-        decrypted.call read_chunk
-      else
-        if read_data
-          read_data.write read_chunk
-        else
-          read_data = StringIO.new(read_chunk)
-        end
+      read_data << read_chunk
+    end
+
+    if block_given? then
+      read_data.each do |data|
+        decrypted.call data
       end
+    else
+      read_data.join
     end
+  end
+
+  # Decrypts +encrypted+ data asynchronously, yielding data to the block when done.
+  # @param [String] encrypted The encrypted data
+  # @yield Gives the decrypted data to the block
+  # @yieldparam [String] the decrypted data
+  def decrypt_data_async(encrypted, &decrypted)
+    async_queue.push [:decrypt, encrypted, decrypted]
+  end
 
-    read_data.string unless block_given?
+  # Calls a given block asynchronously, considering the order of all calls to async methods.
+  def call_async(&block)
+    async_queue.push [:call, nil, block]
   end
 end
 

data/lib/rack/tctp.rb

@@ -102,7 +102,11 @@ module Rack
 
               read_body = req.body.read
 
-              decrypted_body.write halec.decrypt_data(read_body)
+              begin
+                decrypted_body.write halec.decrypt_data(read_body)
+              rescue Exception => e
+                error(e.message + e.backtrace.join("<br/>\n"))
+              end
 
               req.body.string = decrypted_body.string
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-tctp
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.8
 platform: ruby
 authors:
 - Mathias Slawik