rack-tctp 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ea2b2f083a9a4ceeff131c6409ff5b4cb1fa59
-  data.tar.gz: a21ea24c3c1bea8a375e5e5843baa24b89233642
+  metadata.gz: d05bda4c7f71e6aad8866dc1a895a8c320efa800
+  data.tar.gz: 48ca34e13f8c1fdffcdb947b972b134da2347b41
 SHA512:
-  metadata.gz: 6d752079e52c314f395dffc1a41ae54b505d0c163dd26da793b9f87ffca6d591ff5c9ea5964c5703a171b7ea037f82099b96abb5134c37df607dbd9eaf19b791
-  data.tar.gz: 09ad98dc4f25b5d762c13b9d92d7335e4b613e08a6013e8232d82bdcbf5e73fbccec58cd3498ad9b51067bcce3068278b3088d0c17cbbce2f04183fa14111394
+  metadata.gz: 673ffaddcb9bf4fb3ce6e4ae87cf61bccf7ab7bdff73aec5cc52a918c0cc7827088334b8b8cefbc3e827713628d952436f351bb922afcbf49ddf65609116cd4b
+  data.tar.gz: 504d66aced51670eaafdcd1b264b1c7fa641303c2754863b7ed0d02611f68b7af9d855b01b9ca0c34e2a11a0011066c7a1aa07b1203b92a32a281fdf19ed443e

data/ext/engine/engine.c

@@ -191,6 +191,17 @@ VALUE engine_extract(VALUE self) {
   return Qnil;
 }
 
+VALUE engine_state(VALUE self) {
+  ms_conn* conn;
+  VALUE str;
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  str = rb_str_new(SSL_state_string(conn->ssl), 6);
+
+  return str;
+}
+
 void Init_engine() {
   VALUE mod, eng, rack;
   
@@ -213,4 +224,6 @@ void Init_engine() {
 
   rb_define_method(eng, "write",  engine_write, 1);
   rb_define_method(eng, "extract", engine_extract, 0);
+
+  rb_define_method(eng, "state", engine_state, 0);
 }

data/lib/rack/tctp/halec.rb

@@ -44,6 +44,7 @@ class Rack::TCTP::HALEC
           end
         rescue Exception => e
           #TODO Handle HALEC encryption thread shutdown
+          #TODO Handle OpenSSL error
           puts e
         end
       end

data/lib/rack/tctp.rb

@@ -9,6 +9,7 @@ module Rack
   class TCTP
     DEFAULT_TCTP_DISCOVERY_INFORMATION = '/.*:/halecs'
     TCTP_DISCOVERY_MEDIA_TYPE = 'text/prs.tctp-discovery'
+    TCTP_MEDIA_TYPE = 'binary/prs.tctp'
 
     # The slug URI can contain any HTTP compatible characters
     def self.slug_base
@@ -67,7 +68,11 @@ module Rack
             handshake_response = [halec.engine.extract]
 
             # Set location header and content-length
-            header = {'Location' => halec.url.to_s, 'Content-Length' => handshake_response[0].length.to_s}
+            header = {
+                'Location' => halec.url.to_s,
+                'Content-Length' => handshake_response[0].length.to_s,
+                'Content-Type' => TCTP_MEDIA_TYPE
+            }
 
             # Set the TCTP session cookie header
             Rack::Utils.set_cookie_header!(header, "tctp_session_cookie", {:value => session.session_id, :path => '/', :expires => Time.now+24*60*60})
@@ -89,7 +94,10 @@ module Rack
             handshake_response = halec.engine.extract
 
             # Send back server HALEC response
-            [200, {'Content-Length' => handshake_response.length.to_s}, [handshake_response]]
+            [200, {
+                'Content-Length' => handshake_response.length.to_s,
+                'Content-Type' => TCTP_MEDIA_TYPE
+            }, [handshake_response]]
           else
             # Decrypt TCTP secured bodies
             if is_tctp_encrypted_body?(req) then
@@ -115,7 +123,7 @@ module Rack
 
             status, headers, body = @app.call(env)
 
-            if is_tctp_response_requested?(req)
+            if is_tctp_response_requested?(req) && status >= 200 && ![204, 205, 304].include?(status)
               # Gets the first free server HALEC for encryption
               # TODO Send error if cookie is missing
               session = @sessions[req.cookies['tctp_session_cookie']]
@@ -124,7 +132,7 @@ module Rack
                 return no_usable_halec_error
               end
 
-              halec = session.free_halec
+              halec = session.pop_halec
 
               unless halec
                 return no_usable_halec_error
@@ -148,6 +156,12 @@ module Rack
                 content_body_length += encrypted_fragment.length
               end
 
+              encrypted_body.define_singleton_method :close do
+                session.push_halec halec
+
+                super() if self.class.superclass.respond_to? :close
+              end
+
               # Finding this bug took waaaay too long ...
               body.close if body.respond_to?(:close)
 
@@ -161,6 +175,7 @@ module Rack
             end
         end
       rescue Exception => e
+        # TODO Handle SSL Error
         @logger.fatal e
 
         error "Error in TCTP middleware. #{e} #{e.backtrace.inspect}"
@@ -218,14 +233,29 @@ module Rack
 
     attr_reader :halecs
 
+    attr_reader :halecs_mutex
+
     def initialize(session_id = TCTP::new_slug)
       @session_id = session_id
       @halecs = {}
+      @halecs_mutex = Mutex.new
+    end
+
+    def pop_halec
+      free_halec = nil
+
+      @halecs_mutex.synchronize do
+        free_halec = @halecs.first {|url, halec| halec.engine.state.eql? 'SSLOK '}
+
+        @halecs.delete free_halec[0] if free_halec
+      end
+      return free_halec[1]
     end
 
-    def free_halec
-      # TODO free HALEC handling
-      @halecs.first[1]
+    def push_halec(halec)
+      @halecs_mutex.synchronize do
+        @halecs[halec.url] = halec
+      end
     end
   end
 end

metadata

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