rflow-components-http 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0183b24ca93c01e10195f3a436fd76b44863dfe5
-  data.tar.gz: 7868db2089a6b7e30b58ddf8d6f39a9eb77ae8b9
+  metadata.gz: 79e24768d609cc10c8e73a69b385f0a6adf75796
+  data.tar.gz: 5e4d61fbe3a1d235e2983909fda709765f6f8b0a
 SHA512:
-  metadata.gz: e97d00002ee102a0ea59e5b1123778ed2a3cdb108dada488902d4ce8bef97fb5284c21d1538849892b17f1e45b6d409bcb79844198647271a6092837e67b73d6
-  data.tar.gz: 80d0783989f62e22ecfa28545edac5b75665b84da65b9b4c75c17d036414ff35f523d8f0ebcb30f131cfb3f21d1f5a2e0a7a364d51d85d996d7f49dfeda103f6
+  metadata.gz: cb3f4b7aee8590a9eb80f5307930ffe05466d8a869f3a36efadb58a587795be6ef604355395e6ad976a0ed62102136261bfde0116b56d41826c86bb794e117f8
+  data.tar.gz: 787b9b10ec5eafe8bcf1c9277c1784e1f974fa41c2da72bd207ecf3593c844dfba05cf290f3145bb3769ed6c61487e803602b1371795cd0a92e4b80010ececc2

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
 before_install:
   - sudo apt-get install libtool autoconf automake uuid-dev build-essential
   - wget http://download.zeromq.org/zeromq-3.2.4.tar.gz && tar zxvf zeromq-3.2.4.tar.gz && cd zeromq-3.2.4 && ./configure && make && sudo make install && cd ..
+  - gem update bundler
 # Only has 4.0.4, need 3.2 version due to old em-zeromq
 #  - sudo add-apt-repository -y ppa:chris-lea/zeromq
 #  - sudo apt-get update

data/lib/rflow/components/http/server.rb

@@ -9,19 +9,26 @@ class RFlow
         input_port :response_port
         output_port :request_port
 
-        attr_accessor :port, :listen, :server_signature, :connections
+        attr_accessor :port, :listen, :server_signature, :connections, :closed_connections,
+          :proxy_real_client_ip_header, :proxy_real_client_port_header,
+          :proxy_real_server_ip_header, :proxy_real_server_port_header
 
         def configure!(config)
           @listen = config['listen'] ? config['listen'] : '127.0.0.1'
           @port = config['port'] ? config['port'].to_i : 8000
+          @proxy_real_client_ip_header = config.has_key?('proxy-real-client-ip-header') ? config['proxy-real-client-ip-header'] : 'X-Real-IP'
+          @proxy_real_client_port_header = config.has_key?('proxy-real-client-port-header') ? config['proxy-real-client-port-header'] : 'X-Real-Port'
+          @proxy_real_server_ip_header = config.has_key?('proxy-real-server-ip-header') ? config['proxy-real-server-ip-header'] : 'X-Server-IP'
+          @proxy_real_server_port_header = config.has_key?('proxy-real-server-port-header') ? config['proxy-real-server-port-header'] : 'X-Server-Port'
           @connections = {}
+          @closed_connections = ActiveSupport::Cache::MemoryStore.new(expires_in: 5.minutes)
         end
 
         def run!
           @server_signature = EM.start_server(@listen, @port, Connection) do |conn|
             conn.server = self
             self.connections[conn.signature.to_s] = conn
-            RFlow.logger.debug { "#{name}: Connection from #{conn.client_ip}:#{conn.client_port} to #{conn.server_ip}:#{conn.server_port}" }
+            RFlow.logger.debug { "#{name}: Connection from #{conn.client_details} to #{conn.server_details}" }
           end
         end
 
@@ -37,10 +44,24 @@ class RFlow
             connection_signature_string = processing_event.context.to_s
             if connections[connection_signature_string]
               connections[connection_signature_string].send_http_response message
+            else
+              conn = closed_connections.read(connection_signature_string)
+              if conn
+                RFlow.logger.info "#{name}: Could not send HTTP response to #{conn.client_details}: connection is already closed"
+              else
+                RFlow.logger.info "#{name}: Could not send HTTP response to <client details expired>: connection is already closed"
+              end
             end
           end
         end
 
+        class ClosedConnection
+          attr_accessor :client_details
+          def initialize(client_details)
+            @client_details = client_details
+          end
+        end
+
         class Connection < EventMachine::Connection
           include EventMachine::HttpServer
 
@@ -54,19 +75,35 @@ class RFlow
             no_environment_strings
           end
 
+          def client_details
+            if @real_client_ip
+              "#{client_ip}:#{client_port} (proxied from #{@real_client_ip}:#{@real_client_port})"
+            else
+              "#{client_ip}:#{client_port}"
+            end
+          end
+
+          def server_details
+            if @real_server_ip
+              "#{server_ip}:#{server_port} (proxied as #{@real_server_ip}:#{@real_server_port})"
+            else
+              "#{server_ip}:#{server_port}"
+            end
+          end
+
           def receive_data(data)
-            RFlow.logger.debug { "#{server.name}: Received #{data.bytesize} bytes of data from #{client_ip}:#{client_port} to #{@server_ip}:#{@server_port}" }
+            RFlow.logger.debug { "#{server.name}: Received #{data.bytesize} bytes of data from #{client_details} to #{server_details}" }
             super
           end
 
           def process_http_request
-            RFlow.logger.debug { "#{server.name}: Received HTTP request from #{client_ip}:#{client_port} to #{@server_ip}:#{@server_port} for #{@http_request_uri}" }
+            RFlow.logger.debug { "#{server.name}: Received HTTP request from #{client_details} to #{server_details} for #{@http_request_uri}" }
 
             server.request_port.send_message(RFlow::Message.new('RFlow::Message::Data::HTTP::Request').tap do |m|
-              m.data.client_ip    = @client_ip
-              m.data.client_port  = @client_port
-              m.data.server_ip    = @server_ip
-              m.data.server_port  = @server_port
+              m.data.client_ip    = client_ip
+              m.data.client_port  = client_port
+              m.data.server_ip    = server_ip
+              m.data.server_port  = server_port
 
               m.data.method       = @http_request_method
               m.data.uri          = @http_request_uri
@@ -78,6 +115,15 @@ class RFlow
               @http_headers.split(/\0/).each do |header|
                 name, val = header.split(/:\s*/, 2)
                 m.data.headers[name] = val
+                if server.proxy_real_client_ip_header && (name == server.proxy_real_client_ip_header)
+                  @real_client_ip ||= val
+                elsif server.proxy_real_client_port_header && (name == server.proxy_real_client_port_header)
+                  @real_client_port ||= val
+                elsif server.proxy_real_server_ip_header && (name == server.proxy_real_server_ip_header)
+                  @real_server_ip ||= val
+                elsif server.proxy_real_server_port_header && (name == server.proxy_real_server_port_header)
+                  @real_server_port ||= val
+                end
               end
 
               m.provenance << RFlow::Message::ProcessingEvent.new(server.uuid, Time.now.utc).tap do |e|
@@ -86,7 +132,7 @@ class RFlow
               end
             end)
           rescue Exception => e
-            RFlow.logger.error "#{server.name}: Error processing HTTP request from #{client_ip}:#{client_port} to #{@server_ip}:#{@server_port} for #{@http_request_uri}: #{e.class.name}: #{e.message}, because: #{e.backtrace.inspect}"
+            RFlow.logger.error "#{server.name}: Error processing HTTP request from #{client_details} to #{server_details} for #{@http_request_uri}: #{e.class.name}: #{e.message}, because: #{e.backtrace.inspect}"
           end
 
           def send_http_response(response_message = nil)
@@ -106,7 +152,7 @@ class RFlow
               end
             end
 
-            RFlow.logger.debug { "#{server.name}: Sending an HTTP response #{resp.status} to #{client_ip}:#{client_port}" }
+            RFlow.logger.debug { "#{server.name}: Sending an HTTP response #{resp.status} to #{client_details}" }
 
             resp.send_response
             close_connection_after_writing
@@ -115,8 +161,9 @@ class RFlow
           # Called when a connection is torn down for whatever reason.
           # Remove this connection from the server's list
           def unbind(reason = nil)
-            RFlow.logger.debug { "#{server.name}: Disconnected from HTTP client #{client_ip}:#{client_port}#{reason.nil? ? '' : " due to '#{reason}'"}" }
-            server.connections.delete(self.signature.to_s)
+            RFlow.logger.debug { "#{server.name}: Disconnected from HTTP client #{client_details}#{reason.nil? ? '' : " due to '#{reason}'"}" }
+            server.closed_connections.write(signature.to_s, ClosedConnection.new(client_details))
+            server.connections.delete(signature.to_s)
             super()
           end
         end

data/lib/rflow/components/http/version.rb

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module HTTP
-      VERSION = "1.0.1"
+      VERSION = "1.1.0"
     end
   end
 end

data/rflow-components-http.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rflow', '~> 1.0.0'
+  s.add_dependency 'rflow', '~> 1.0'
   s.add_dependency 'eventmachine_httpserver_update', '~> 0.2.1'
 
   s.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-http
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver_update
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rflow-components-http
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: HTTP client and server components for the RFlow FBP framework