rex-core 0.1.16 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17110a74336ae634771add814eed9e60a711005641b6424a482d057bbb7314bd
-  data.tar.gz: 788d7cb8332f1cd817fbbf6de0da93ef7dbc92906f4c31706ca38de433812ef8
+  metadata.gz: cacc2616718c8056c7ff5ecf2626562f71ac9efd0a6ae69c80cd21565824b666
+  data.tar.gz: e6ed793586462b6cc826be77b533030e45a7bce1ae4fd0bdb2cbaf62ed6e17dd
 SHA512:
-  metadata.gz: 6873be6d3d89644c9285d06e6966aa05f0604b09564b865ebf9fd70339c99d9b3fb0320e92ebedc3e378983956faed6cb5089c69d1bb0fe6d751252d0bfc45ab
-  data.tar.gz: 678096caf324f23b4937f4607ed336c66ac7916fd7417197288b6c07ef70d18cc870b8780f5d119d74b2a1eb9d2d0274fe9df38b8033bcfa989b7c0d3be9bb0c
+  metadata.gz: a7367cb540a9638f4f64e5756f3c9761e3ebe05f15444ee2d4ae8e6f6af94888f50e2813cc89e7ef3bc7492335f20c31ccc98c8c3ba4b2a55e61995b174c8497
+  data.tar.gz: 4dbd3f07ec237c23ca088bbbdc2f67e2a59bcf5167bcebe841550877fc99f1e81ef3a9c763ddb9c7d8478844676e08ee3f706188c721049be00fbe2b3350ef89

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.16"
+    VERSION = "0.1.20"
   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/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,23 @@
+module Rex::Stopwatch
+
+  # 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/
+  # @see https://ruby-doc.org/core-2.7.1/Process.html#method-c-clock_gettime
+  #
+  # @param [Symbol] unit The unit of time in which to measure the duration. The
+  #   argument is passed to Process.clock_gettime which defines the acceptable
+  #   values.
+  #
+  # @yield [] The block whose operation should be timed.
+  #
+  # @return Returns the result of the block and the elapsed time in the specified unit.
+  def self.elapsed_time(unit: :float_second)
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC, unit)
+    ret = yield
+    elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC, unit) - 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.16
+  version: 0.1.20
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-11-16 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