metasploit-aggregator 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48eefd932eb682e73ba56af27ee94c5c3d963306
-  data.tar.gz: 37d7f536cf5ba43319a45906847277891253e314
+  metadata.gz: 6c24ff901cb886de3f7096625742249f2874803b
+  data.tar.gz: 5fb0ea51cc770c8cb7c5a6775c7c02f4418f7464
 SHA512:
-  metadata.gz: 918a239903e13c853a15f6a8089d1f944f4f965ad0b9f796e7858031c28a009f50302f5a6f7670410c67f760d1c5df0ef6a92f913e5f122dbd6b7c210ffa6bbb
-  data.tar.gz: 383e666fbfc963fab11c77f3f389fb0ea7ab5bc13fe3a27f47a00bbb5a311fcb48c139dcd3f3382f6e6f574b0f887ebb171d49154249e2f5b62b3b8365a05cf5
+  metadata.gz: ebb542338918a8489423ce6055db118c80750ebebb0239e5ed0680ce7b4ffd60f299c9bb6ce11aa9c710ae92be40d2996b7dec6f307f4dff4b9f21a8636a2767
+  data.tar.gz: c20ba09eb3c27047cfeda64e4aac3c03c7569d43df56f48773e943f0bd321cb5b38f4ec6ed1af8a5cc458b9b62182778bcc234727b712c0f2a95e16107bc2a78

checksums.yaml.gz.sig

@@ -1 +1 @@
-k:6���.�f����]�]��';_Yx��Y��n=�e���R7u�m�����4�����b_�E�������~q+.X�j(+)�'�9�a�m9ۋ�0��
+k�Z
,�Q:RK��[�5������uK{�G5�
�5�*����[��><&�.�dC(��"2$���x�b��뜙���||P$"�b���~��~�a���`~��o�E3�>����Cߕ��1��@�lE�W=~�����(�J%Ľe�i�Iy��������R�#8՜!p:�,,��;־�,2��_ �v<!U ���?:�S�h̋�Xx��%�~|�t�Y�e�y��
g�@=�5�I�al��|%�

data.tar.gz.sig

@@ -1,2 +1,3 @@
-�I
-��?+C��@[},rS�7a����t�Y�ˆhȮ��6[e%�K�	�ޙ��}�L
_?� Ƙ��iv�8A����ޠ&�ؘH��_'�Mq۩2����_�u7���Żղ�7囟Y<S��G�/((㙦"h��+=��D��2*ާ5��w�h�O�9%&�	h��������a��<��SJ��vZ�>�BVkn�&�>�t><�m��7C���֫��������qU�2u��
+"..S~s?
϶6��֧fOL�JG|p�E��H��~3��c�+Ѳ��=榃D������m���;�
+q00؏�ϐ��TbUҔ�X�A�}��R���ء�
+���{�߼�&�e�����>��F�m!�Poఠw&&�V68H��(�.�
��[Ȱ�=K�M:�֔6ݴf�����TDC�HܶBlM
 ډ��n�7÷p�T�c@�� w4�T��W��v��'��D��3Y

data/lib/metasploit/aggregator.rb

@@ -240,13 +240,17 @@ module Metasploit
         @response_queue.push(initial_response)
 
         @listening_thread = Thread.new do
-          requests.each do |pb_request|
-            request = Metasploit::Aggregator::Http::Request.new(pb_to_array(pb_request.headers), pb_request.body, nil)
-            response = @response_io.process_request(request)
-            session_id = Metasploit::Aggregator::Http::Request.parse_uri(request)
-            pb_request = Metasploit::Aggregator::Message::Request.new( headers: response.headers, body: response.body )
-            pb_response = Metasploit::Aggregator::Message::Response.new( uuid: session_id, response: pb_request)
-            @response_queue.push(pb_response)
+          begin
+            requests.each do |pb_request|
+              request = Metasploit::Aggregator::Http::Request.new(pb_to_array(pb_request.headers), pb_request.body, nil)
+              response = @response_io.process_request(request)
+              session_id = Metasploit::Aggregator::Http::Request.parse_uri(request)
+              pb_request = Metasploit::Aggregator::Message::Request.new( headers: response.headers, body: response.body )
+              pb_response = Metasploit::Aggregator::Message::Response.new( uuid: session_id, response: pb_request)
+              @response_queue.push(pb_response)
+            end
+          rescue GRPC::Unavailable
+            false # The remote connection has ended stop this processing thread.
           end
         end
         ServerProxy.register_for_cleanup self
@@ -357,6 +361,7 @@ module Metasploit
           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
+            sleep 0.1
             unless request.nil?
               body = ""
               body = request.body unless request.body.nil?

data/lib/metasploit/aggregator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-aggregator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler