rex-socket 0.1.55 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f205a57e2e9e372f999bd08d4e39d6be05bb5fc4a3bcc83e3b27b0de29dd90ad
-  data.tar.gz: '028fca6197d04804b78b7f6ee8d9ca849196c84714a1eabf640b25fe723b8226'
+  metadata.gz: 3813cfab9315c8efee87b3104d1270a7f9c542cbd012b97b5155650d78f2f98b
+  data.tar.gz: 15962d9201caa7cfb3c90a80457b0988913f35007126b15669114632842fa465
 SHA512:
-  metadata.gz: 393eb18d30bf96737c546a91cc646991cb1b17641cce3266911378a6a423c1d7a3f0e921ca455816bf7563fae6fa6933a38a39263c5b7a823be1c319ff0d8960
-  data.tar.gz: c5f866f117febd1717a60404a2b07e5cf945f48c37c479e490d26992b5438abfb78f1b7e84940399e0e741ef155830ec07cb7fa5ef211fb88d70e7b33341e9de
+  metadata.gz: 0b0a6fb36088a4a299583325ff7ebe74363efd2587a0ed32ac8769b99ba8937a31b09042277d0349142e19b12bcbb7a16738d53b26b14a4d490261da3eeddad5
+  data.tar.gz: 32e6b77da1e059619c9aca489c6eb7cba8116e2069f79af276646db40b0fd949b4cc82d73eee4d7198e19d5fa5e06b100d3ded0aae644dbe8d6573bf318ba836

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.55"
+    VERSION = "0.1.57"
   end
 end

data/lib/rex/socket.rb

@@ -84,6 +84,9 @@ module Socket
   # Common Regular Expressions
   #
 
+  # see: https://debugpointer.com/regex/regex-for-dns-name
+  MATCH_DNS_NAME = /^(((?!-))(xn--)?([a-z0-9_][a-z0-9_\-]{0,59})?[a-z0-9_]\.)*(xn--)?([a-z0-9_\-]{1,61}|[a-z0-9_-]{1,30}\.[a-z]{2,})$/i
+
   MATCH_IPV6 = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/
 
   MATCH_IPV4 = /^\s*(?:(?:25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{1,2})[.](?:25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{1,2})[.](?:25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{1,2})[.](?:25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{1,2}))\s*$/
@@ -125,24 +128,33 @@ module Socket
   # Cache our resolver
   @@resolver = nil
 
+  #
+  # Determine whether this is a valid DNS name without trying to resolve it
+  #
+  def self.is_name?(name)
+    return false if name.length > 253
+    name.delete_suffix('.') =~ MATCH_DNS_NAME ? (name =~ /\s/).nil? : false
+  end
+
+  #
   # Determine whether this is an IPv4 address
   #
   def self.is_ipv4?(addr)
-    addr =~ MATCH_IPV4 ? true : false
+    addr =~ MATCH_IPV4 ? (addr =~ /\s/).nil? : false
   end
 
   #
   # Determine whether this is an IPv6 address
   #
   def self.is_ipv6?(addr)
-    addr =~ MATCH_IPV6 ? true : false
+    addr =~ MATCH_IPV6 ? (addr =~ /\s/).nil? : false
   end
 
   #
   # Determine whether this is a MAC address
   #
   def self.is_mac_addr?(addr)
-    !(addr =~ MATCH_MAC_ADDR).nil?
+    addr =~ MATCH_MAC_ADDR ? (addr =~ /\s/).nil? : false
   end
 
   #
@@ -157,7 +169,7 @@ module Socket
   # Checks to see if the supplied address is in "dotted" form
   #
   def self.dotted_ip?(addr)
-    (support_ipv6? && addr =~ MATCH_IPV6) || (addr =~ MATCH_IPV4)
+    (support_ipv6? && self.is_ipv6?(addr)) || self.is_ipv4?(addr)
   end
 
   # Checks to see if an address is an IPv6 address and if so, converts it into its

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.57
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -34,7 +34,7 @@ cert_chain:
   DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
   Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
   -----END CERTIFICATE-----
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: The Ruby Exploitation (Rex) Socket Abstraction Library.