metasploit-aggregator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743aaed0f6621901652a6ac90e16bb1fe49d2127
-  data.tar.gz: e73a838cea07915a5b71a3e89c5cacbc15e1cc1d
+  metadata.gz: 48eefd932eb682e73ba56af27ee94c5c3d963306
+  data.tar.gz: 37d7f536cf5ba43319a45906847277891253e314
 SHA512:
-  metadata.gz: 584bafe1df424db3495a7c85065c9554f3ee7849c5f52c817956512f43aef1e25fcb825df0a378a74d25de4a9e50d3d2a24f5abfcad92afbb29dbaaa5df08d96
-  data.tar.gz: b9bcfa8091f5ee411fffe8f871ebb67a041e7c73771af184457bef731dc5adfcdcfbcd1ad83a8110e1a0c44273c70062a5a0c5146bf2e2f0de9c6bbdf5c95e34
+  metadata.gz: 918a239903e13c853a15f6a8089d1f944f4f965ad0b9f796e7858031c28a009f50302f5a6f7670410c67f760d1c5df0ef6a92f913e5f122dbd6b7c210ffa6bbb
+  data.tar.gz: 383e666fbfc963fab11c77f3f389fb0ea7ab5bc13fe3a27f47a00bbb5a311fcb48c139dcd3f3382f6e6f574b0f887ebb171d49154249e2f5b62b3b8365a05cf5

data/bin/metasploit-aggregator

@@ -27,7 +27,7 @@ loop do
   elsif command.chomp == 'details'
     client = Metasploit::Aggregator::ServerProxy.new(admin_host, admin_port)
     sessions = client.sessions
-    sessions.each_pair do |payload, console|
+    sessions.each_pair do |payload, _console|
       details = client.session_details(payload)
       $stdout.puts payload
       details.each_pair do |key, attr|

data/lib/metasploit/aggregator.rb

@@ -105,7 +105,11 @@ module Metasploit
       end
 
       def available?
-        @client.available(@no_params).answer
+        begin
+          @client.available(@no_params).answer
+        rescue GRPC::Unavailable
+          false # unavailable if client throws exception.
+        end
       end
 
       def sessions
@@ -348,7 +352,9 @@ module Metasploit
         requestingThread = Thread.new do
           loop do
             sleep 0.1 # outer loop only occurs until uuid is set
-            next if uuid.nil?
+            break unless uuid.nil?
+          end
+          while true
             request = @local_server.request(uuid)
             # TODO: with this in place we can just get the request queue and pop each item to process and forward
             unless request.nil?

data/lib/metasploit/aggregator/connection_manager.rb

@@ -18,6 +18,7 @@ module Metasploit
         @manager_mutex = Mutex.new
         @router = Router.instance
         @details_cache = SessionDetailService.instance
+        @connection_cleaner = Thread.new { flush_connections }
       end
 
       def self.ssl_generate_certificate
@@ -182,6 +183,7 @@ module Metasploit
             listener.thread.exit
           end
         end
+        @connection_cleaner.exit
       end
 
       def park(payload)
@@ -189,6 +191,16 @@ module Metasploit
         Logger.log "parking #{payload}"
       end
 
+      def flush_connections
+        while true
+          @cables.each do |cable|
+            # this relies on a side effect that accessing clears stale connections
+            cable.forwarder.connections.length
+          end
+          sleep 10
+        end
+      end
+
       private :ssl_parse_certificate
     end
   end

data/lib/metasploit/aggregator/forwarder.rb

@@ -22,9 +22,9 @@ module Metasploit
         # TODO: for now before reporting connections flush stale ones
         flush_stale_sessions
         connections = {}
-        @response_queues.each_pair do |connection, queue|
+        @response_queues.each_pair do |connection, _queue|
           forward = 'parked'
-          send, recv, console = @router.get_forward(connection)
+          _send, _recv, console = @router.get_forward(connection)
           unless console.nil?
             forward = "#{console}"
           end

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

@@ -23,18 +23,6 @@ module Metasploit
           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 = []

data/lib/metasploit/aggregator/router.rb

@@ -53,8 +53,8 @@ module Metasploit
         unless @queue_by_uuid[uuid]
           @queue_by_uuid[uuid] = Queue.new
         end
-        @forward_routes.each_pair do |key, val|
-          request, response, remote_uuid = val
+        @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

data/lib/metasploit/aggregator/version.rb

@@ -1,5 +1,5 @@
 module Metasploit
   module Aggregator
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-aggregator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: metasploit-aggregator

metadata.gz.sig

@@ -1 +1,3 @@
-	c:����p�l�o�N_��-�Y.�'��V�c��M8L�K<1�֗Xm�]���i��go�c8t� �M>���XI_[{����/�a@ g��\�-���R=v�|��Z3��>���X���kJ>��o,����ĩm�����>>v�G��6�����{]�[,�8���&�����묙�7�޹"v��p���j���	]��&E�/��>�:}A��8/�o�5R�_���^(���g�!��L�󠈮�v뢣�P�Sc
+v��;��	It� {�0�)G�`�z]>��HO;���2�(�(+K��#y�f�q��[b,���
+c�����A�4ް�h*}�������u�p_E����!�/�6\f`V	v{�iw��ִ2^X=u��
+ޚ�]$���2�g�]���茕0�[���S�P�qTՐ�'2"u��g