rack-tctp 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f9169ee893ce7ec93d3281ab553dc87d248a13
-  data.tar.gz: 859a75131bf2d42e00dc0e6f7b1782b40cfa8cd5
+  metadata.gz: 17cccfc0313d0b15542c44517be5bd7623f43e15
+  data.tar.gz: eb14d908fbea866b4f6055c5f7765a74ad90f7a0
 SHA512:
-  metadata.gz: c0238554483fb138f7e2e7b2cbbdef0d2fa90530d8a71ba3b233d7922a3e5629f2071cb8eb65910fb451ebf0d667bcd6ae50d4364206bb425baf4fbd7ef7f1ac
-  data.tar.gz: 75184f63c4a40b9728cfa1351c82ffbfdb80d88cd1bbfd8dfc85d538c3a470a98be61d3e701d5b40282691714e0b3e0de64b6a82061e5a592e79d499d457154d
+  metadata.gz: dffa225c693158dfe7074ac791e1217114adbf39d595b81704435708039a77e9013d70e288ec40953015bbd18887be00eb352ef5281152aa13eb8c594bb41fa6
+  data.tar.gz: 318bcf6bb47b818320f70970f2ee27f60fd28d083f7c01b191d826438b69375ff300351177b6a6db19cde6e7515e4a4ea60475ce450247c8d3f7d9c2e983cd17

data/lib/rack/tctp.rb

@@ -1,4 +1,5 @@
 require 'radix'
+require 'logger'
 
 require_relative 'tctp/halec'
 
@@ -23,7 +24,14 @@ module Rack
     attr_reader :sessions
 
     # Initializes TCTP middleware
-    def initialize(app)
+    def initialize(app, logger = nil)
+      unless logger
+        @logger = Kernel::Logger.new(STDOUT)
+        @logger.level = Logger::FATAL
+      else
+        @logger = logger
+      end
+
       @app = app
       @sessions = {}
     end
@@ -35,10 +43,11 @@ module Rack
     # * Decrypting TCTP secured entity-bodies
     # * Encrypting entity-bodies using TCTP
     def call(env)
+      status, headers, body = nil, nil, nil
+
       begin
         req = Rack::Request.new(env)
 
-        # Switch through TCTP use cases
         case
           when is_tctp_discovery?(req)
             # TCTP discovery
@@ -100,7 +109,17 @@ module Rack
             if is_tctp_response_requested?(req)
               # Gets the first free server HALEC for encryption
               # TODO Send error if cookie is missing
-              halec = @sessions[req.cookies['tctp_session_cookie']].free_halec
+              session = @sessions[req.cookies['tctp_session_cookie']]
+
+              unless session
+                return no_usable_halec_error
+              end
+
+              halec = session.free_halec
+
+              unless halec
+                return no_usable_halec_error
+              end
 
               # The length of the content body
               content_body_length = 0
@@ -136,11 +155,25 @@ module Rack
             end
         end
       rescue Exception => e
-        puts e
+        @logger.fatal e
+
+        error "Error in TCTP middleware. #{e} #{e.backtrace.inspect}"
       end
     end
 
     private
+      def log_key
+        'TCTP Middleware'
+      end
+
+      def no_usable_halec_error
+        error 'No useable HALEC for encryption. Please perform Handshake.'
+      end
+
+      def error(message)
+        [500, {'Content-Type' => 'text/plain', 'Content-Length' => message.length.to_s}, [message]]
+      end
+
       def is_tctp_discovery?(req)
         req.options? && !req.env['HTTP_ACCEPT'].nil? && req.env['HTTP_ACCEPT'].eql?(TCTP_DISCOVERY_MEDIA_TYPE)
       end

metadata

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