rex-core 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0378775512fe632afba68913d5d3eed8fc39ff2eeaf5a849b4101dbbab49026
-  data.tar.gz: 8d2cde8487dcb4c9d2c7102eddd0f5777f9ba6bd67ea58649a8fe8ff03203a4c
+  metadata.gz: 879343c39c0c1769143a3d0b5c61ce102e26ac898a50e5eec9581bc2bee47c91
+  data.tar.gz: fca03a370a59dc3d03369fb29f47a0fb5e42dcb66db9d6e7b4f3b0824e9620f7
 SHA512:
-  metadata.gz: 7f88261f6d1982c3b2903224776481a21c16b3336e0c448a934f0daf3b073ae7ebe76f7a6f2e6b5c7aacbd3639a184c559b99c2e8f14091c15a68a3790ba0399
-  data.tar.gz: 42de568303940c9a7a28ccaa19954d21e05e85b204cb0f4febd761dc150d682fbf6f3a76da5bca9804b082dbc2989e3bcb2013aa65294db6271ee7add0e157cd
+  metadata.gz: fda24ae80de4cfda9e66f3bfe45b93bee23e4b35b57bb55f1fca0784721fa333154c8d6972a01594794a3b479e3a07c7809c0911a573b79315dfa8d01148faea
+  data.tar.gz: a6c8d8c2783a611b50f240e664ab2011da5e6ec5d46b3d7353e12cae0e56140f0ec33973fa7d25c0e10226a12b53815bc76fa3de6363678eb6b8e72cc2e7a569

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-oUc�)��w>�AǸ��EaĚ%�&�
M9�����g�A�fw�Q$�y�\
-�yI!����)
-�M^������`�t�R��?�)���b��5�D�Y�������������{���
a��{j���P4�������ݘL�����#��P
+hC�|����%�
��of�m�����y�A�����1��H�	�>\g�u�ٿ %q�V�}x+���U�!��ȃ�0�(g�%>,6[�.œC���`s<e��i$�ss��ʣ������

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.23"
+    VERSION = "0.1.24"
   end
 end

data/lib/rex/io/stream_server.rb

@@ -1,228 +1,208 @@
 # -*- coding: binary -*-
-require 'thread'
 
 module Rex
-module IO
-
-###
-#
-# This mixin provides the framework and interface for implementing a streaming
-# server that can listen for and accept stream client connections.  Stream
-# servers extend this class and are required to implement the following
-# methods:
-#
-#   accept
-#   fd
-#
-###
-module StreamServer
-
-  ##
-  #
-  # Abstract methods
-  #
-  ##
-
-  ##
-  #
-  # Default server monitoring and client management implementation follows
-  # below.
-  #
-  ##
-
-  #
-  # This callback is notified when a client connects.
-  #
-  def on_client_connect(client)
-    if (on_client_connect_proc)
-      on_client_connect_proc.call(client)
-    end
-  end
-
-  #
-  # This callback is notified when a client connection has data that needs to
-  # be processed.
-  #
-  def on_client_data(client)
-    if (on_client_data_proc)
-      on_client_data_proc.call(client)
-    end
-  end
-
-  #
-  # This callback is notified when a client connection has closed.
-  #
-  def on_client_close(client)
-    if (on_client_close_proc)
-      on_client_close_proc.call(client)
-    end
-  end
-
-  #
-  # Start monitoring the listener socket for connections and keep track of
-  # all client connections.
-  #
-  def start
-    self.clients = []
-    self.client_waiter = ::Queue.new
-
-    self.listener_thread = Rex::ThreadFactory.spawn("StreamServerListener", false) {
-      monitor_listener
-    }
-    self.clients_thread = Rex::ThreadFactory.spawn("StreamServerClientMonitor", false) {
-      monitor_clients
-    }
-  end
-
-  #
-  # Terminates the listener monitoring threads and closes all active clients.
-  #
-  def stop
-    self.listener_thread.kill
-    self.clients_thread.kill
-
-    self.clients.each { |cli|
-      close_client(cli)
-    }
-  end
+  module IO
+    ###
+    #
+    # This mixin provides the framework and interface for implementing a streaming
+    # server that can listen for and accept stream client connections.  Stream
+    # servers extend this class and are required to implement the following
+    # methods:
+    #
+    #   accept
+    #   fd
+    #
+    ###
+    module StreamServer
+      ##
+      #
+      # Abstract methods
+      #
+      ##
+
+      ##
+      #
+      # Default server monitoring and client management implementation follows
+      # below.
+      #
+      ##
+
+      #
+      # This callback is notified when a client connects.
+      #
+      def on_client_connect(client)
+        on_client_connect_proc.call(client) if on_client_connect_proc
+      end
 
-  #
-  # This method closes a client connection and cleans up the resources
-  # associated with it.
-  #
-  def close_client(client)
-    if (client)
-      detach_client(client)
-
-      begin
-        client.close
-      rescue IOError
+      #
+      # This callback is notified when a client connection has data that needs to
+      # be processed.
+      #
+      def on_client_data(client)
+        on_client_data_proc.call(client) if on_client_data_proc
       end
-    end
-  end
 
-  #
-  # Detach a client. You are now responsible for it, not us
-  #
-  def detach_client(client)
-    self.clients.delete(client)
-  end
+      #
+      # This callback is notified when a client connection has closed.
+      #
+      def on_client_close(client)
+        on_client_close_proc.call(client) if on_client_close_proc
+      end
 
-  #
-  # This method waits on the server listener thread
-  #
-  def wait
-    self.listener_thread.join if self.listener_thread
-  end
+      #
+      # Start monitoring the listener socket for connections and keep track of
+      # all client connections.
+      #
+      def start
+        self.clients = []
+        self.client_waiter = ::Queue.new
 
-  ##
-  #
-  # Callback procedures.
-  #
-  ##
-
-  #
-  # This callback procedure can be set and will be called when new clients
-  # connect.
-  #
-  attr_accessor :on_client_connect_proc
-  #
-  # This callback procedure can be set and will be called when clients
-  # have data to be processed.
-  #
-  attr_accessor :on_client_data_proc
-  #
-  # This callback procedure can be set and will be called when a client
-  # disconnects from the server.
-  #
-  attr_accessor :on_client_close_proc
-
-  attr_accessor :clients # :nodoc:
-  attr_accessor :listener_thread, :clients_thread # :nodoc:
-  attr_accessor :client_waiter
-
-protected
-
-  #
-  # This method monitors the listener socket for new connections and calls
-  # the +on_client_connect+ callback routine.
-  #
-  def monitor_listener
-
-    while true
-      begin
-        cli = accept
-        if not cli
-          elog("The accept() returned nil in stream server listener monitor:  #{fd.inspect}")
-          ::IO.select(nil, nil, nil, 0.10)
-          next
+        self.listener_thread = Rex::ThreadFactory.spawn('StreamServerListener', false) do
+          monitor_listener
         end
+        self.clients_thread = Rex::ThreadFactory.spawn('StreamServerClientMonitor', false) do
+          monitor_clients
+        end
+      end
 
-        # Append to the list of clients
-        self.clients << cli
+      #
+      # Terminates the listener monitoring threads and closes all active clients.
+      #
+      def stop
+        listener_thread.kill
+        clients_thread.kill
 
-        # Initialize the connection processing
-        on_client_connect(cli)
+        clients.each do |cli|
+          close_client(cli)
+        end
+      end
 
-        # Notify the client monitor
-        self.client_waiter.push(cli)
+      #
+      # This method closes a client connection and cleans up the resources
+      # associated with it.
+      #
+      def close_client(client)
+        if client
+          detach_client(client)
+
+          begin
+            client.close
+          rescue IOError
+          end
+        end
+      end
 
-      # Skip exceptions caused by accept() [ SSL ]
-      rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
-      rescue ::Interrupt
-        raise $!
-      rescue ::Exception
-        elog("Error in stream server server monitor: #{$!}")
-        rlog(ExceptionCallStack)
-        break
+      #
+      # Detach a client. You are now responsible for it, not us
+      #
+      def detach_client(client)
+        clients.delete(client)
       end
-    end
-  end
 
-  #
-  # This method monitors client connections for data and calls the
-  # +on_client_data+ routine when new data arrives.
-  #
-  def monitor_clients
-    begin
-
-      # Wait for a notify if our client list is empty
-      if (clients.length == 0)
-        self.client_waiter.pop
-        next
+      #
+      # This method waits on the server listener thread
+      #
+      def wait
+        listener_thread.join if listener_thread
       end
 
-      sd = Rex::ThreadSafe.select(clients, nil, nil, nil)
+      ##
+      #
+      # Callback procedures.
+      #
+      ##
+
+      #
+      # This callback procedure can be set and will be called when new clients
+      # connect.
+      #
+      attr_accessor :on_client_connect_proc
+      #
+      # This callback procedure can be set and will be called when clients
+      # have data to be processed.
+      #
+      attr_accessor :on_client_data_proc
+      #
+      # This callback procedure can be set and will be called when a client
+      # disconnects from the server.
+      #
+      attr_accessor :on_client_close_proc
+
+      attr_accessor :clients, :listener_thread, :clients_thread, :client_waiter # :nodoc: # :nodoc:
+
+      protected
+
+      #
+      # This method monitors the listener socket for new connections and calls
+      # the +on_client_connect+ callback routine.
+      #
+      def monitor_listener
+        while true
+          begin
+            cli = accept
+            unless cli
+              elog("The accept() returned nil in stream server listener monitor:  #{fd.inspect}")
+              ::IO.select(nil, nil, nil, 0.10)
+              next
+            end
+
+            # Append to the list of clients
+            clients << cli
+
+            # Initialize the connection processing
+            on_client_connect(cli)
+
+            # Notify the client monitor
+            client_waiter.push(cli)
+
+          # Skip exceptions caused by accept() [ SSL ]
+          rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
+          rescue ::Interrupt
+            raise $!
+          rescue ::Exception
+            elog("Error in stream server server monitor: #{$!}")
+            rlog(ExceptionCallStack)
+            break
+          end
+        end
+      end
 
-      sd[0].each { |cfd|
+      #
+      # This method monitors client connections for data and calls the
+      # +on_client_data+ routine when new data arrives.
+      #
+      def monitor_clients
         begin
-          on_client_data(cfd) if clients.include? cfd
-        rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
-          on_client_close(cfd)
-          close_client(cfd)
+          # Wait for a notify if our client list is empty
+          if clients.length == 0
+            client_waiter.pop
+            next
+          end
+
+          sd = Rex::ThreadSafe.select(clients, nil, nil, nil)
+
+          sd[0].each do |cfd|
+            on_client_data(cfd) if clients.include? cfd
+          rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
+            on_client_close(cfd)
+            close_client(cfd)
+          rescue ::Interrupt
+            raise $!
+          rescue ::Exception
+            close_client(cfd)
+            elog("Error in stream server client monitor: #{$!}")
+            rlog(ExceptionCallStack)
+          end
+        rescue ::Rex::StreamClosedError => e
+          # Remove the closed stream from the list
+          detach_client(e.stream)
         rescue ::Interrupt
           raise $!
         rescue ::Exception
-          close_client(cfd)
           elog("Error in stream server client monitor: #{$!}")
           rlog(ExceptionCallStack)
-
-        end
-      }
-
-    rescue ::Rex::StreamClosedError => e
-      # Remove the closed stream from the list
-      detach_client(e.stream)
-    rescue ::Interrupt
-      raise $!
-    rescue ::Exception
-      elog("Error in stream server client monitor: #{$!}")
-      rlog(ExceptionCallStack)
-    end while true
+        end while true
+      end
+    end
   end
-
 end
-
-end
-end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Metasploit Hackers