rex-core 0.1.15 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d6d74b1603e11dd926c24e867db559a88c9294fc1b4dc88559d66366928044
-  data.tar.gz: 7484592c2f3429b4481700937395ae6f0457b61fdddaf4abd9b780ebfff1de85
+  metadata.gz: 4b2bbdcc1a0301230c6fdd17df19375ba3ee885852b14b7096736294539d566b
+  data.tar.gz: f474c211aa36c95dc0dbdf5b05b591d2fd1cc98bd1cec5c877deea37fe2986e2
 SHA512:
-  metadata.gz: '0698ecc78c85cb0497065dc82521be98a264784e4e76951d24ac36d82ab7f3a3e7ade7c6993127e1db1513157826edfd137dfe33d4ca71fa139088235f5694c6'
-  data.tar.gz: 1b819f79ced4a1656120ceeca644d4a634b5e54923bc3c2887edf76b9e28ed1e4de85c917ffeeef4cce5c239913b398492ba4b3f20f058700ad2b5fc9304427c
+  metadata.gz: 247e60760168cfaeebce318e982939b6100f7ea2fe278914a11261b9eaf9933db6f5754b1b4afd859ec4aa2d7fb4379065a7505a1d5bae0565b5c10f56d56b4f
+  data.tar.gz: 234380d838b2687ea3b80575f406430daebed9cfd3292be43db94b3ebb6c948a909d309cb6a20901d27daef423179f8ee92c548cd78ed078dcd2a5815d6969cf

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.15"
+    VERSION = "0.1.19"
   end
 end

data/lib/rex/exceptions.rb

@@ -145,9 +145,10 @@ end
 #
 ###
 module HostCommunicationError
-  def initialize(addr = nil, port = nil)
-    self.host = addr
-    self.port = port
+  def initialize(addr = nil, port = nil, reason: nil)
+    @host = addr
+    @port = port
+    @reason = reason
   end
 
   #
@@ -156,7 +157,7 @@ module HostCommunicationError
   #
   def addr_to_s
     if host and port
-      "(#{host}:#{port})"
+      host.include?(':') ? "([#{host}]:#{port})" : "(#{host}:#{port})"
     elsif host
       "(#{host})"
     else
@@ -164,7 +165,13 @@ module HostCommunicationError
     end
   end
 
-  attr_accessor :host, :port
+  def to_s
+    str = super
+    str << " #{@reason}" if @reason
+    str
+  end
+
+  attr_accessor :host, :port, :reason
 end
 
 
@@ -186,7 +193,9 @@ end
 ###
 class ConnectionRefused < ConnectionError
   def to_s
-    "The connection was refused by the remote host #{addr_to_s}."
+    str = "The connection was refused by the remote host #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -198,7 +207,9 @@ end
 ###
 class HostUnreachable < ConnectionError
   def to_s
-    "The host #{addr_to_s} was unreachable."
+    str = "The host #{addr_to_s} was unreachable."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -209,7 +220,9 @@ end
 ###
 class ConnectionTimeout < ConnectionError
   def to_s
-    "The connection timed out #{addr_to_s}."
+    str = "The connection with #{addr_to_s} timed out."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -220,18 +233,17 @@ end
 #
 ###
 class InvalidDestination < ConnectionError
-  include SocketError
-  include HostCommunicationError
-
   def to_s
-    "The destination is invalid: #{addr_to_s}."
+    str = "The destination is invalid: #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
 ###
 #
 # This exception is raised when an attempt to use an address or port that is
-# already in use or onot available occurs. such as binding to a host on a
+# already in use or not available occurs. such as binding to a host on a
 # given port that is already in use, or when a bind address is specified that
 # is not available to the host.
 #
@@ -241,7 +253,9 @@ class BindFailed < ::ArgumentError
   include HostCommunicationError
 
   def to_s
-    "The address is already in use or unavailable: #{addr_to_s}."
+    str = "The address is already in use or unavailable: #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -255,11 +269,10 @@ end
 #
 ##
 class AddressInUse < ConnectionError
-  include SocketError
-  include HostCommunicationError
-
   def to_s
-    "The address is already in use or unavailable: #{addr_to_s}."
+    str = "The address is already in use or unavailable: #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 

data/lib/rex/file.rb

@@ -130,7 +130,7 @@ module Find
     paths.collect!{|d| d.dup}
     while file = paths.shift
       catch(:prune) do
-        yield file.dup.taint
+        yield file.dup
         next unless File.exist? file
         begin
           if File.stat(file).directory? then
@@ -145,7 +145,7 @@ module Find
                 else
                   f = File.join(file, f)
                 end
-                paths.unshift f.untaint
+                paths.unshift f
               end
             ensure
               d.close

data/lib/rex/io/stream.rb

@@ -325,21 +325,6 @@ module Stream
     16384
   end
 
-protected
-
-  #
-  # The read-write lock used to synchronize access to the stream. This is only
-  # set when synchronization has been initialized as performed by
-  # #initialize_synchronization.
-  #
-  attr_accessor :stream_lock
-
-  #
-  # A boolean flag indicating that the resource is to be closed. Blocking
-  # operations that are synchronized (such as #read and #write) should evaluate
-  # this flag and exit appropriately when there is no data to be processed.
-  attr_accessor :close_resource
-
   #
   # Synchronize non-state changing access to the stream such as read and write
   # operations. If synchronization has not been initialized, this doesn't do
@@ -366,6 +351,21 @@ protected
       self.stream_lock.unlock_write unless self.stream_lock.nil?
     end
   end
+
+protected
+
+  #
+  # The read-write lock used to synchronize access to the stream. This is only
+  # set when synchronization has been initialized as performed by
+  # #initialize_synchronization.
+  #
+  attr_accessor :stream_lock
+
+  #
+  # A boolean flag indicating that the resource is to be closed. Blocking
+  # operations that are synchronized (such as #read and #write) should evaluate
+  # this flag and exit appropriately when there is no data to be processed.
+  attr_accessor :close_resource
 end
 
 end end

data/lib/rex/stopwatch.rb

@@ -0,0 +1,18 @@
+module Rex
+
+  # This provides a correct way to time an operation provided within a block.
+  #
+  # @see https://blog.dnsimple.com/2018/03/elapsed-time-with-ruby-the-right-way/
+  #
+  # @yield [] The block whose operation should be timed.
+  #
+  # @return Returns the result of the block and the elapsed time in seconds.
+  def self.stopwatch
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    ret = yield
+    elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+
+    [ret, elapsed]
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.19
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,6 +151,7 @@ files:
 - lib/rex/io/stream.rb
 - lib/rex/io/stream_abstraction.rb
 - lib/rex/io/stream_server.rb
+- lib/rex/stopwatch.rb
 - lib/rex/sync.rb
 - lib/rex/sync/event.rb
 - lib/rex/sync/read_write_lock.rb

metadata.gz.sig

@@ -1 +1,2 @@
-
�
]��q���Oc���|����`_����� ���u�n�΃w�&?���;󢜒��q�
+G��G�ϐan�p0ः�W�)�� R�p�
+��LK��-�~�sR�ԅ<��-,��Qkk�1e+&U�?�����=p��M�5�)@,�&��|������C��OIVsb��,�&�{�%�?bb��4��