metasploit-aggregator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9372e340df896a27d4b2f7f78483a985d47a4c3
-  data.tar.gz: 38f3826e72c3e64d52e3221bda925ed6acf3d1cb
+  metadata.gz: aac104842b24e3ca148b53fec7496fdd91f05cbe
+  data.tar.gz: fe6729af2bc28c2a0a3d2d27e41b55501cff5bb6
 SHA512:
-  metadata.gz: 460b198d3544822741d05bf0a9d83a1118dc69776078264bd885c2a283f41f3abe74f3f46a89775ba956103d61592c9931cde027fc84db6e4f8f2a51f5fa5a7e
-  data.tar.gz: 3a86873da6b43255e30ce5c0d7fa5221ee76ea12dbfc78ed59eb443242410fcebcd2b2417367e1533a7dbe6391cfc725eefe2adb54fd1326c15d8f4eb6a5abe5
+  metadata.gz: 7bdd018ad0bdae6925db322e986eced83c1a904f9ba09671b715496271b7d6642a671b9abdcc59626249751579dd94bc966cefac6490a803424f40e21684c822
+  data.tar.gz: 321958012678ee3f900c9f2675bcbe721571d3def92906b136a1cdfea68ec96552a1d7953b2e1f0d7c7985f3f3f45a6cc36c72f7efc7ee2a21471ada2615f8bc

data/bin/msfaggregator

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'msf/aggregator'
-require 'msf/aggregator/cable'
-require 'msf/aggregator/logger'
+require 'metasploit/aggregator'
+require 'metasploit/aggregator/cable'
+require 'metasploit/aggregator/logger'
 
 admin_host = '127.0.0.1'
 admin_port = 2447
@@ -13,8 +13,8 @@ remote_console = '127.0.0.1'
 # cert_string = File.new(cert_file).read
 cert_string = nil
 
-# server = Msf::Aggregator::Server.new('127.0.0.1', 1337)
-server = Msf::Aggregator::MsgPackServer.new(admin_host, admin_port)
+# server = Metasploit::Aggregator::Server.new('127.0.0.1', 1337)
+server = Metasploit::Aggregator::MsgPackServer.new(admin_host, admin_port)
 server.start
 Logger.log "Starting administration service on #{admin_host}:#{admin_port}"
 

data/lib/{msf → metasploit}/aggregator.rb

@@ -3,14 +3,16 @@ require 'openssl'
 require 'thread'
 require 'msgpack'
 require 'msgpack/rpc'
+require 'securerandom'
 
-require 'msf/aggregator/version'
-require 'msf/aggregator/cable'
-require 'msf/aggregator/connection_manager'
-require 'msf/aggregator/https_forwarder'
-require 'msf/aggregator/logger'
+require 'metasploit/aggregator/version'
+require 'metasploit/aggregator/cable'
+require 'metasploit/aggregator/connection_manager'
+require 'metasploit/aggregator/https_forwarder'
+require 'metasploit/aggregator/http'
+require 'metasploit/aggregator/logger'
 
-module Msf
+module Metasploit
   module Aggregator
 
     class Service
@@ -31,7 +33,7 @@ module Msf
       # sets forwarding for a specific session to promote
       # that session for local use, obtained sessions are
       # not reported in getSessions
-      def obtain_session(payload, lhost, lport)
+      def obtain_session(payload, uuid)
         # index for impl
       end
 
@@ -51,7 +53,11 @@ module Msf
         # index for impl
       end
 
-      def register_default(lhost, lport, payload_list)
+      def register_default(uuid, payload_list)
+        # index for impl
+      end
+
+      def default
         # index for impl
       end
 
@@ -60,9 +66,15 @@ module Msf
       def available_addresses
         # index for impl
       end
+
+      # register the object to pass request from cables to
+      def register_response_channel(requester)
+
+      end
     end
 
     class ServerProxy < Service
+      attr_reader :uuid
       @host = @port = @socket = nil
       @response_queue = []
 
@@ -70,6 +82,7 @@ module Msf
         @host = host
         @port = port
         @client = MessagePack::RPC::Client.new(@host, @port)
+        @uuid = SecureRandom.uuid
       end
 
       def available?
@@ -91,8 +104,8 @@ module Msf
       end
 
 
-      def obtain_session(payload, lhost, lport)
-        @client.call(:obtain_session, payload, lhost, lport)
+      def obtain_session(payload, uuid)
+        @client.call(:obtain_session, payload, uuid)
       rescue MessagePack::RPC::TimeoutError => e
         Logger.log(e.to_s)
       end
@@ -115,8 +128,14 @@ module Msf
         Logger.log(e.to_s)
       end
 
-      def register_default(lhost, lport, payload_list)
-        @client.call(:register_default, lhost, lport, payload_list)
+      def register_default(uuid, payload_list)
+        @client.call(:register_default, uuid, payload_list)
+      rescue MessagePack::RPC::TimeoutError => e
+        Logger.log(e.to_s)
+      end
+
+      def default
+        @client.call(:default)
       rescue MessagePack::RPC::TimeoutError => e
         Logger.log(e.to_s)
       end
@@ -129,6 +148,39 @@ module Msf
 
       def stop
         @client.close
+        @client = nil
+        @listening_thread.join if @listening_thread
+      end
+
+      def register_response_channel(requester)
+        unless requester.kind_of? Metasploit::Aggregator::Http::Requester
+          raise ArgumentError("response channel class invalid")
+        end
+        @response_io = requester
+        start_responding
+      end
+
+      def start_responding
+        @listening_thread = Thread.new do
+          @listener_client = MessagePack::RPC::Client.new(@host, @port) unless @listener_client
+          while @client
+            begin
+              sleep 0.1 # polling for now need
+              result, result_obj, session_id, response_obj = nil
+              result = @listener_client.call(:request, @uuid)
+              next unless result # just continue to poll if no request is found
+              result_obj = Metasploit::Aggregator::Http::Request.from_msgpack(result)
+              session_id = Metasploit::Aggregator::Http::Request.parse_uri(result_obj)
+              response_obj = @response_io.process_request(result_obj)
+              @listener_client.call(:respond, session_id, response_obj.to_msgpack)
+            rescue MessagePack::RPC::TimeoutError
+              next
+            rescue
+              Logger.log $!
+            end
+          end
+          @listener_client.close
+        end
       end
     end # ServerProxy
 
@@ -137,10 +189,11 @@ module Msf
 
       def initialize
         @manager = nil
+        @router = Router.instance
       end
 
       def start
-        @manager = Msf::Aggregator::ConnectionManager.new
+        @manager = Metasploit::Aggregator::ConnectionManager.new
         true
       end
 
@@ -156,11 +209,11 @@ module Msf
         @manager.cables
       end
 
-      def obtain_session(payload, rhost, rport)
+      def obtain_session(payload, uuid)
         # return session object details or UUID/uri
         # forwarding will cause new session creation on the console
         # TODO: check and set lock on payload requested see note below in register_default
-        @manager.register_forward(rhost, rport, [ payload ])
+        @manager.register_forward(uuid, [ payload ])
         true # update later to return if lock obtained
       end
 
@@ -190,13 +243,18 @@ module Msf
         end
       end
 
-      def register_default(lhost, lport, payload_list)
+      def register_default(uuid, payload_list)
         # add this payload list to each forwarder for this remote console
         # TODO: consider adding boolean param to ConnectionManager.register_forward to 'lock'
-        @manager.register_forward(lhost, lport, payload_list)
+        @manager.register_forward(uuid, payload_list)
         true
       end
 
+      def default
+        send, recv, console = @router.get_forward('default')
+        console
+      end
+
       def available_addresses
         addr_list = Socket.ip_address_list
         addresses = []
@@ -217,8 +275,64 @@ module Msf
       def release_session(host)
         @manager.park(host)
       end
+
+      def request(uuid)
+        # return requests here
+        result = nil
+        send, recv = @router.reverse_route(uuid)
+        if send.length > 0
+          result = send.pop
+        end
+        result
+      end
+
+      def respond(uuid, data)
+        send, recv = @router.get_forward(uuid)
+        recv << data unless recv.nil?
+        true
+      end
+
+      def register_response_channel(io)
+        # not implemented "client only method"
+        response = "register_response_channel not implemented on server"
+        Logger.log response
+        response
+      end
     end # class Server
 
+    # wrapping class required to avoid MsgPack specific needs to parallel request processing.
+    class AsyncMsgPackServer < Server
+
+      def initialize
+        super
+      end
+
+      # MsgPack specific wrapper for listener due to lack of parallel processing
+      def request(uuid)
+        result = super(uuid)
+        sendMsg = nil
+        if result
+          begin
+            sendMsg = result.to_msgpack
+          rescue Exception => e
+            Logger.log e.backtrace
+            # when an error occurs here we should likely respond with an error of some sort to remove block on response
+          end
+        end
+        sendMsg
+      end
+
+      # MsgPack specific wrapper for listener due to lack of parallel processing
+      def respond(uuid, data)
+        begin
+          result = super(uuid, Metasploit::Aggregator::Http::Request.from_msgpack(data))
+          result
+        rescue Exception => e
+          Logger.log e.backtrace
+        end
+      end
+    end # AsyncMsgPackServer
+
     class MsgPackServer
 
       def initialize(host, port)
@@ -227,12 +341,12 @@ module Msf
 
         # server = TCPServer.new(@host, @port)
         # sslContext = OpenSSL::SSL::SSLContext.new
-        # sslContext.key, sslContext.cert = Msf::Aggregator::ConnectionManager.ssl_generate_certificate
+        # sslContext.key, sslContext.cert = Metasploit::Aggregator::ConnectionManager.ssl_generate_certificate
         # sslServer = OpenSSL::SSL::SSLServer.new(server, sslContext)
         #
         @svr = MessagePack::RPC::Server.new # need to initialize this as ssl server
         # @svr.listen(sslServer, Server.new)
-        @svr.listen(@host, @port, Server.new)
+        @svr.listen(@host, @port, AsyncMsgPackServer.new)
 
         Thread.new { @svr.run }
       end

data/lib/{msf → metasploit}/aggregator/cable.rb

@@ -1,4 +1,4 @@
-module Msf
+module Metasploit
   module Aggregator
     class Cable
       HTTPS = 'https'

data/lib/{msf → metasploit}/aggregator/connection_manager.rb

@@ -1,12 +1,12 @@
 require 'openssl'
 require 'socket'
 
-require 'msf/aggregator/logger'
-require 'msf/aggregator/http_forwarder'
-require 'msf/aggregator/https_forwarder'
-require 'msf/aggregator/cable'
+require 'metasploit/aggregator/logger'
+require 'metasploit/aggregator/http_forwarder'
+require 'metasploit/aggregator/https_forwarder'
+require 'metasploit/aggregator/cable'
 
-module Msf
+module Metasploit
   module Aggregator
 
     class ConnectionManager
@@ -14,7 +14,6 @@ module Msf
       def initialize
         @cables = []
         @manager_mutex = Mutex.new
-        @default_route = []
         @router = Router.instance
       end
 
@@ -61,14 +60,14 @@ module Msf
 
       def add_cable_https(host, port, certificate)
         @manager_mutex.synchronize do
-          forwarder = Msf::Aggregator::HttpsForwarder.new
+          forwarder = Metasploit::Aggregator::HttpsForwarder.new
           forwarder.log_messages = true
           server = TCPServer.new(host, port)
           ssl_context = OpenSSL::SSL::SSLContext.new
           unless certificate.nil?
             ssl_context.key, ssl_context.cert = ssl_parse_certificate(certificate)
           else
-            ssl_context.key, ssl_context.cert = Msf::Aggregator::ConnectionManager.ssl_generate_certificate
+            ssl_context.key, ssl_context.cert = Metasploit::Aggregator::ConnectionManager.ssl_generate_certificate
           end
           ssl_server = OpenSSL::SSL::SSLServer.new(server, ssl_context)
 
@@ -80,7 +79,7 @@ module Msf
 
       def add_cable_http(host, port)
         @manager_mutex.synchronize do
-          forwarder = Msf::Aggregator::HttpForwarder.new
+          forwarder = Metasploit::Aggregator::HttpForwarder.new
           forwarder.log_messages = true
           server = TCPServer.new(host, port)
 
@@ -89,20 +88,12 @@ module Msf
         end
       end
 
-      def register_forward(rhost, rport, payload_list = nil)
-        @cables.each do |cable|
-          addr = cable.server.local_address
-          if addr.ip_address == rhost && addr.ip_port == rport.to_i
-            raise ArgumentError.new("#{rhost}:#{rport} is not a valid forward")
-          end
-        end
+      def register_forward(uuid, payload_list = nil)
         if payload_list.nil?
-          # add the this host and port as the new default route
-          @default_route = [rhost, rport]
-          @router.add_route(rhost, rport, nil)
+          @router.add_route(uuid, nil)
         else
           payload_list.each do |payload|
-            @router.add_route(rhost, rport, payload)
+            @router.add_route(uuid, payload)
           end
         end
       end
@@ -174,7 +165,7 @@ module Msf
       end
 
       def park(payload)
-        @router.add_route(nil, nil, payload)
+        @router.add_route(nil, payload)
         Logger.log "parking #{payload}"
       end
 

data/lib/{msf → metasploit}/aggregator/forwarder.rb

@@ -1,4 +1,4 @@
-module Msf
+module Metasploit
   module Aggregator
     class Forwarder
       CONNECTION_TIMEOUT = 60 # one minute
@@ -9,7 +9,6 @@ module Msf
       def initialize
         @log_messages = false
         @response_queues = {}
-        @responding_threads = {}
         @forwarder_mutex = Mutex.new
         @router = Router.instance
       end
@@ -25,9 +24,9 @@ module Msf
         connections = {}
         @response_queues.each_pair do |connection, queue|
           forward = 'parked'
-          host, port = @router.get_forward(connection)
-          unless host.nil?
-            forward = "#{host}:#{port}"
+          send, recv, console = @router.get_forward(connection)
+          unless console.nil?
+            forward = "#{console}"
           end
           connections[connection] = forward
         end
@@ -43,8 +42,8 @@ module Msf
             end
           end
           stale_sessions.each do |uri|
-            @response_queues[uri].stop_processing
-            @response_queues.delete(uri)
+            stale_queue = @response_queues.delete(uri)
+            stale_queue.stop_processing unless stale_queue.nil?
           end
         end
       end

data/lib/metasploit/aggregator/http.rb

@@ -0,0 +1,13 @@
+require 'metasploit/aggregator/http/request'
+require 'metasploit/aggregator/http/requester'
+require 'metasploit/aggregator/http/responder'
+require 'metasploit/aggregator/http/ssl_requester'
+require 'metasploit/aggregator/http/ssl_responder'
+
+module Metasploit
+  module Aggregator
+    module Http
+
+    end
+  end
+end

data/lib/metasploit/aggregator/http/request.rb

@@ -0,0 +1,53 @@
+module Metasploit
+  module Aggregator
+    module Http
+      class Request
+        attr_reader :headers
+        attr_reader :body
+        attr_reader :socket
+
+        def initialize(request_headers, request_body, socket)
+          @headers = request_headers
+          @body = request_body
+          @socket = socket
+        end
+
+        def self.parse_uri(http_request)
+          req = http_request.headers[0]
+          parts = req.split(/ /)
+          uri = nil
+          if parts.length >= 2
+            uri = req.split(/ /)[1]
+            uri = uri.chomp('/')
+          end
+          uri
+        end
+
+        def to_msgpack
+          MessagePack.dump ({
+              :headers => headers,
+              :body => body
+          })
+        end
+
+        def self.from_msgpack(string)
+          data = MessagePack.load string
+          self.new(data['headers'], data['body'].force_encoding(Encoding::ASCII_8BIT), nil)
+        end
+
+        # provide a default response in Request form
+        def self.parked()
+          parked_message = []
+          parked_message << 'HTTP/1.1 200 OK'
+          parked_message << 'Content-Type: application/octet-stream'
+          parked_message << 'Connection: close'
+          parked_message << 'Server: Apache'
+          parked_message << 'Content-Length: 0'
+          parked_message << ' '
+          parked_message << ' '
+          self.new(parked_message, '', nil)
+        end
+      end
+    end
+  end
+end

data/lib/metasploit/aggregator/http/requester.rb

@@ -0,0 +1,41 @@
+require "metasploit/aggregator/http/request"
+require "metasploit/aggregator/http/responder"
+
+module Metasploit
+  module Aggregator
+    module Http
+      # a Requester takes in Request object and to send to a known port and protocol
+      # and receives a response that it also returns as a Request object
+      class Requester
+        def initialize(host, port)
+          @host = host
+          @port = port
+        end
+
+        def process_request(request)
+          socket = get_connection(@host, @port)
+          write_request(socket, request)
+          response_obj = Metasploit::Aggregator::Http::Responder.get_data(socket, true)
+          close_connection(socket)
+          response_obj
+        end
+
+        def write_request(connection, request)
+          request.headers.each do |header|
+            connection.write(header)
+          end
+          connection.write(request.body) unless request.body.nil?
+        end
+
+        def get_connection(host, port)
+          TCPSocket.new host, port
+        end
+
+        def close_connection(connection)
+          connection.close
+        end
+
+      end
+    end
+  end
+end

data/lib/{msf → metasploit}/aggregator/http/responder.rb

@@ -1,8 +1,11 @@
-require "msf/aggregator/http/request"
+require "metasploit/aggregator/http/request"
 
-module Msf
+module Metasploit
   module Aggregator
     module Http
+      # a Responder acts a a gateway to convert data from a port to into a Request object
+      # used in the aggregator. It also reverses this process as a gateway for sending Request object
+      # back as responses to the original Request.
       class Responder
 
         attr_accessor :queue
@@ -16,6 +19,7 @@ module Msf
           @thread = Thread.new { process_requests }
           @time = Time.now
           @router = Router.instance
+          @pending_requests = nil
         end
 
         def process_requests
@@ -26,53 +30,35 @@ module Msf
               connection = request_task.socket
               request_task.headers
 
-              # peer_addr = connection.io.peeraddr[3]
-
-              host, port = @router.get_forward(@uri)
-              if host.nil?
+              send, recv = @router.get_forward(@uri)
+              if send.nil?
                 # when no forward found park the connection for now
                 # in the future this may get smarter and return a 404 or something
                 send_parked_response(connection)
                 next
               end
 
-              client = nil
-
-              begin
-                client = get_connection(host, port)
-              rescue StandardError => e
-                log 'error on console connect ' + e.to_s
-                send_parked_response(connection)
-                next
-              end
-
-              log 'connected to console'
+              # response from get_forward will be a queue to push messages onto and a response queue to retrieve result from
+              send << request_task
+              @pending_request = connection
 
-              request_task.headers.each do |line|
-                client.write line
-              end
-              unless request_task.body.nil?
-                client.write request_task.body
-              end
-              client.flush
-              # log "From victim: \n" + request_lines.join()
+              log 'queued to console'
 
+              # now get the response once available and send back using this connection
               begin
-                response = ''
-                request_obj = Responder.get_data(client, true)
+                request_obj = recv.pop
+                @pending_request = nil
                 request_obj.headers.each do |line|
                   connection.write line
-                  response += line
                 end
                 unless request_obj.body.nil?
                   connection.write request_obj.body
                 end
                 connection.flush
-                  # log "From console: \n" + response
+                log 'message delivered from console'
               rescue
                 log $!
               end
-              close_connection(client)
               close_connection(connection)
             rescue Exception => e
               log "an error occurred processing request from #{@uri}"
@@ -83,20 +69,16 @@ module Msf
 
         def stop_processing
           @thread.exit
+          if @pending_request
+            send_parked_response(@pending_request)
+            close_connection(@pending_request)
+          end
         end
 
         def send_parked_response(connection)
           address = connection.peeraddr[3]
           log "sending parked response to #{address}"
-          parked_message = []
-          parked_message << 'HTTP/1.1 200 OK'
-          parked_message << 'Content-Type: application/octet-stream'
-          parked_message << 'Connection: close'
-          parked_message << 'Server: Apache'
-          parked_message << 'Content-Length: 0'
-          parked_message << ' '
-          parked_message << ' '
-          parked_message.each do |line|
+          Metasploit::Aggregator::Http::Request.parked.headers.each do |line|
             connection.puts line
           end
           close_connection(connection)

data/lib/metasploit/aggregator/http/ssl_requester.rb

@@ -0,0 +1,27 @@
+require "metasploit/aggregator/http/requester"
+
+module Metasploit
+  module Aggregator
+    module Http
+      class SslRequester < Requester
+        def initialize(host, port)
+          super(host, port)
+        end
+
+        def get_connection(host, port)
+          tcp_client = TCPSocket.new host, port
+          ssl_context = OpenSSL::SSL::SSLContext.new
+          ssl_context.ssl_version = :TLSv1
+          ssl_client = OpenSSL::SSL::SSLSocket.new tcp_client, ssl_context
+          ssl_client.connect
+          ssl_client
+        end
+
+        def close_connection(connection)
+          connection.sync_close = true
+          connection.close
+        end
+      end
+    end
+  end
+end

data/lib/{msf → metasploit}/aggregator/http/ssl_responder.rb

@@ -1,7 +1,7 @@
-require "msf/aggregator/http/request"
-require "msf/aggregator/http/responder"
+require "metasploit/aggregator/http/request"
+require "metasploit/aggregator/http/responder"
 
-module Msf
+module Metasploit
   module Aggregator
     module Http
       class SslResponder < Responder

data/lib/{msf → metasploit}/aggregator/http_forwarder.rb

@@ -1,11 +1,11 @@
 require 'socket'
-require 'msf/aggregator/forwarder'
-require 'msf/aggregator/http/request'
-require 'msf/aggregator/http/responder'
-require 'msf/aggregator/logger'
-require 'msf/aggregator/router'
+require 'metasploit/aggregator/forwarder'
+require 'metasploit/aggregator/http/request'
+require 'metasploit/aggregator/http/responder'
+require 'metasploit/aggregator/logger'
+require 'metasploit/aggregator/router'
 
-module Msf
+module Metasploit
   module Aggregator
     class HttpForwarder < Forwarder
       CONNECTION_TIMEOUT = 60 # one minute
@@ -19,12 +19,12 @@ module Msf
 
       def forward(connection)
         #forward input requests
-        request_obj = Msf::Aggregator::Http::Responder.get_data(connection, false)
-        uri = Msf::Aggregator::Http::Request.parse_uri(request_obj)
+        request_obj = Metasploit::Aggregator::Http::Responder.get_data(connection, false)
+        uri = Metasploit::Aggregator::Http::Request.parse_uri(request_obj)
         @forwarder_mutex.synchronize do
           unless uri.nil?
             unless @response_queues[uri]
-              uri_responder = Msf::Aggregator::Http::Responder.new(uri)
+              uri_responder = Metasploit::Aggregator::Http::Responder.new(uri)
               uri_responder.log_messages = @log_messages
               @response_queues[uri] = uri_responder
             end

data/lib/{msf → metasploit}/aggregator/https_forwarder.rb

@@ -1,12 +1,12 @@
 require 'socket'
 require 'openssl'
-require 'msf/aggregator/forwarder'
-require 'msf/aggregator/http/request'
-require 'msf/aggregator/http/ssl_responder'
-require 'msf/aggregator/logger'
-require 'msf/aggregator/router'
+require 'metasploit/aggregator/forwarder'
+require 'metasploit/aggregator/http/request'
+require 'metasploit/aggregator/http/ssl_responder'
+require 'metasploit/aggregator/logger'
+require 'metasploit/aggregator/router'
 
-module Msf
+module Metasploit
   module Aggregator
 
     class HttpsForwarder < Forwarder
@@ -17,12 +17,12 @@ module Msf
 
       def forward(connection)
         #forward input requests
-        request_obj = Msf::Aggregator::Http::SslResponder.get_data(connection, false)
-        uri = Msf::Aggregator::Http::Request.parse_uri(request_obj)
+        request_obj = Metasploit::Aggregator::Http::SslResponder.get_data(connection, false)
+        uri = Metasploit::Aggregator::Http::Request.parse_uri(request_obj)
         @forwarder_mutex.synchronize do
           unless uri.nil?
             unless @response_queues[uri]
-              uri_responder = Msf::Aggregator::Http::SslResponder.new(uri)
+              uri_responder = Metasploit::Aggregator::Http::SslResponder.new(uri)
               uri_responder.log_messages = @log_messages
               @response_queues[uri] = uri_responder
             end

data/lib/metasploit/aggregator/router.rb

@@ -0,0 +1,68 @@
+require 'singleton'
+
+module Metasploit
+  module Aggregator
+    class Router
+      include Singleton
+
+      def initialize
+        @mutex = Mutex.new
+        @forward_routes = {}
+        @queue_by_uuid = {}
+      end
+
+      def add_route(uuid, payload)
+        # for now always replace in future may check if same route to avoid request loss
+        forward = uuid.nil? ? [] : [Queue.new, Queue.new, uuid]
+        @mutex.synchronize do
+          if payload.nil?
+            @forward_routes['default'] = forward
+            return
+          end
+          @forward_routes[payload] = forward
+        end
+      end
+
+      def remove_route(payload)
+        unless payload.nil?
+          @mutex.synchronize do
+            @forward_routes.delete(payload)
+          end
+        end
+      end
+
+      def get_forward(uri)
+        unless @forward_routes[uri].nil?
+          @forward_routes[uri]
+        else
+          @forward_routes['default']
+        end
+      end
+
+      def reverse_route(uuid)
+        # this method is not ready for prime time yet as will not
+        # support multiple sessions properly, either need unique Queue
+        # for each session which can be identified on reverse or need
+        # pipeline request order to ensure all results are posted in order only
+        # this could create deadlocks while one session waits for a response
+        # if another fails to respond.
+
+        # try returning a uuid queue filled an aggregate of queues for all requests
+        # for a reverse uuid, and refill that on each reverse, this puts logic
+        # here that I do not like but accomplishes the requirement for now
+        unless @queue_by_uuid[uuid]
+          @queue_by_uuid[uuid] = Queue.new
+        end
+        @forward_routes.each_pair do |key, val|
+          request, response, remote_uuid = val
+          next unless remote_uuid == uuid
+          while !request.empty?
+            @queue_by_uuid[uuid] << request.pop
+          end
+        end
+        [] unless @queue_by_uuid[uuid].length > 0
+        [@queue_by_uuid[uuid], nil, uuid]
+      end
+    end
+  end
+end

data/lib/metasploit/aggregator/version.rb

@@ -0,0 +1,5 @@
+module Metasploit
+  module Aggregator
+    VERSION = '0.1.1'
+  end
+end

data/metasploit-aggregator.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'msf/aggregator/version'
+require 'metasploit/aggregator/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "metasploit-aggregator"
-  spec.version       = Msf::Aggregator::VERSION
+  spec.version       = Metasploit::Aggregator::VERSION
   spec.authors       = ['Metasploit Hackers']
   spec.email         = ['metasploit-hackers@lists.sourceforge.net']
   spec.summary       = "metasploit-aggregator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-aggregator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,18 +178,21 @@ files:
 - README.md
 - Rakefile
 - bin/msfaggregator
-- lib/msf/aggregator.rb
-- lib/msf/aggregator/cable.rb
-- lib/msf/aggregator/connection_manager.rb
-- lib/msf/aggregator/forwarder.rb
-- lib/msf/aggregator/http/request.rb
-- lib/msf/aggregator/http/responder.rb
-- lib/msf/aggregator/http/ssl_responder.rb
-- lib/msf/aggregator/http_forwarder.rb
-- lib/msf/aggregator/https_forwarder.rb
-- lib/msf/aggregator/logger.rb
-- lib/msf/aggregator/router.rb
-- lib/msf/aggregator/version.rb
+- lib/metasploit/aggregator.rb
+- lib/metasploit/aggregator/cable.rb
+- lib/metasploit/aggregator/connection_manager.rb
+- lib/metasploit/aggregator/forwarder.rb
+- lib/metasploit/aggregator/http.rb
+- lib/metasploit/aggregator/http/request.rb
+- lib/metasploit/aggregator/http/requester.rb
+- lib/metasploit/aggregator/http/responder.rb
+- lib/metasploit/aggregator/http/ssl_requester.rb
+- lib/metasploit/aggregator/http/ssl_responder.rb
+- lib/metasploit/aggregator/http_forwarder.rb
+- lib/metasploit/aggregator/https_forwarder.rb
+- lib/metasploit/aggregator/logger.rb
+- lib/metasploit/aggregator/router.rb
+- lib/metasploit/aggregator/version.rb
 - metasploit-aggregator.gemspec
 homepage: https://www.msf.com
 licenses:

metadata.gz.sig

@@ -1,2 +1,3 @@
-#j��T�h��k��B�2� �X�v����{[^
ф��+W�R�C�#�G��e۝^9�[��
-��/�ns7�ŴCН]3���f*o�BTD��;4>zEAՌ!]�^A>����XOP�F�X��Q
+�����~jB�{��B6��i�_�*++�|�h綏�q+bD~h���@g��F0�g��딮$��m�r꣓��)FEw�8����(�tk���Z����t�&q�b������0��<a18�8���yO��e0"ΒQ��H,"<C�5O@�åmwՓ�ݽ���RG��6�]h綀
+�D���\����
+��fUH=>'��(xgj~�zX98ʓMW?�y�(��gͬ��$1Н`m

data/lib/msf/aggregator/http/request.rb

@@ -1,28 +0,0 @@
-module Msf
-  module Aggregator
-    module Http
-      class Request
-        attr_reader :headers
-        attr_reader :body
-        attr_reader :socket
-
-        def initialize(request_headers, request_body, socket)
-          @headers = request_headers
-          @body = request_body
-          @socket = socket
-        end
-
-        def self.parse_uri(http_request)
-          req = http_request.headers[0]
-          parts = req.split(/ /)
-          uri = nil
-          if parts.length >= 2
-            uri = req.split(/ /)[1]
-            uri = uri.chomp('/')
-          end
-          uri
-        end
-      end
-    end
-  end
-end

data/lib/msf/aggregator/router.rb

@@ -1,41 +0,0 @@
-require 'singleton'
-
-module Msf
-  module Aggregator
-    class Router
-      include Singleton
-
-      def initialize
-        @mutex = Mutex.new
-        @forward_routes = {}
-      end
-
-      def add_route(rhost, rport, payload)
-        forward = [rhost, rport]
-        @mutex.synchronize do
-          if payload.nil?
-            @forward_routes['default'] = forward
-            return
-          end
-          @forward_routes[payload] = forward
-        end
-      end
-
-      def remove_route(payload)
-        unless payload.nil?
-          @mutex.synchronize do
-            @forward_routes.delete(payload)
-          end
-        end
-      end
-
-      def get_forward(uri)
-        unless @forward_routes[uri].nil?
-          @forward_routes[uri]
-        else
-          @forward_routes['default']
-        end
-      end
-    end
-  end
-end

data/lib/msf/aggregator/version.rb

@@ -1,5 +0,0 @@
-module Msf
-  module Aggregator
-    VERSION = '0.1.0'
-  end
-end