rex-core 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17110a74336ae634771add814eed9e60a711005641b6424a482d057bbb7314bd
-  data.tar.gz: 788d7cb8332f1cd817fbbf6de0da93ef7dbc92906f4c31706ca38de433812ef8
+  metadata.gz: cc3a037b0e2014526adcb218da1f7519b84c59ed81457e63d3d4bfe8632b7d32
+  data.tar.gz: ac2a430d2978df81f3671123d1c192430098ab4f2b3833a26489bcbe2f6e7db9
 SHA512:
-  metadata.gz: 6873be6d3d89644c9285d06e6966aa05f0604b09564b865ebf9fd70339c99d9b3fb0320e92ebedc3e378983956faed6cb5089c69d1bb0fe6d751252d0bfc45ab
-  data.tar.gz: 678096caf324f23b4937f4607ed336c66ac7916fd7417197288b6c07ef70d18cc870b8780f5d119d74b2a1eb9d2d0274fe9df38b8033bcfa989b7c0d3be9bb0c
+  metadata.gz: 0adeeff27a4a9dee8092466387624a60ff991789b419e15c667c9f0b2a94a3c8f64e836ee967182dd78834e46722c42fbb2e8cf0c1af5a2210b9bacc136da9e2
+  data.tar.gz: 308daa85d93b917ce3dbb7fc5445087269899c437baaa96ce0082901ee54de94e6e5b7016cd3cfaf4914716b0fd8bddc331c439d2cf5c9d6999572215bddfa1c

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.16"
+    VERSION = "0.1.17"
   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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 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-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake