rex-socket 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d5c101cf12b4b186967cc462825a01949e2a85f
-  data.tar.gz: 2a0a9e972c300e84a29fba0f14136a15833211a9
+  metadata.gz: 92ddd973eb7d16ebd11f040c398d294c62f8caf3
+  data.tar.gz: 59c01a8084132ba7df79382a23ff6ab835a5480e
 SHA512:
-  metadata.gz: da63a4de0ea57c5978f32804a87b1a9d15d65bac912762fc97ed23b2a596aedc9bf2286aa1c6d680a7f92a545281184c1bef9529509f4651eb87f03605894fc5
-  data.tar.gz: bee9a6294c9ad74fbe1ac47ac1614fd014f579744ddacc50b7cfbd2f49be212883152a49c5865066989c2cc738d6b0e7b0123b84dd2ee6f1b65f0a0951fd8089
+  metadata.gz: 4d5161ad095c421332a0180bd18985d64bf7dc2abb719dce49a442b10bc8a7d5a976c34f18d5882969341c321b6af87328c52daed44fd0ce6cf2153b45e52b02
+  data.tar.gz: 35eb1b361afd7e6df0def370c54e6539f0619ff2f820193b3628595d7671e2abc6c7a42694a071195659f06d97791b2dc44fc15a40ee9a2e161426fbdbf86d9e

data/lib/rex/socket.rb

@@ -88,13 +88,14 @@ module Socket
 
   MATCH_IPV4_PRIVATE = /^\s*(?:10\.|192\.168|172.(?:1[6-9]|2[0-9]|3[01])\.|169\.254)/
 
+  MATCH_MAC_ADDR = /^\s*(([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2})|([[0-9a-fA-F]{2}]{6})\s*$/i
+
   ##
   #
   # Serialization
   #
   ##
 
-
   # Cache our IPv6 support flag
   @@support_ipv6 = nil
 
@@ -122,27 +123,36 @@ module Socket
   # Determine whether this is an IPv4 address
   #
   def self.is_ipv4?(addr)
-    ( addr =~ MATCH_IPV4 ) ? true : false
+    addr =~ MATCH_IPV4 ? true : false
   end
 
   #
   # Determine whether this is an IPv6 address
   #
   def self.is_ipv6?(addr)
-    ( addr =~ MATCH_IPV6 ) ? true : false
+    addr =~ MATCH_IPV6 ? true : false
   end
 
   #
-  # Checks to see if the supplied address is in "dotted" form
+  # Determine whether this is a MAC address
   #
-  def self.dotted_ip?(addr)
-    # Match IPv6
-    return true if (support_ipv6? and addr =~ MATCH_IPV6)
+  def self.is_mac_addr?(addr)
+    addr =~ MATCH_MAC_ADDR ? true : false
+  end
 
-    # Match IPv4
-    return true if (addr =~ MATCH_IPV4)
+  #
+  # Determine whether this is an IP address at all
+  # Check for v4 (less expensive), v6, else false
+  #
+  def self.is_ip_addr?(addr)
+    self.is_ipv4?(addr) || self.is_ipv6?(addr)
+  end
 
-    false
+  #
+  # Checks to see if the supplied address is in "dotted" form
+  #
+  def self.dotted_ip?(addr)
+    (support_ipv6? && addr =~ MATCH_IPV6) || (addr =~ MATCH_IPV4)
   end
 
   #
@@ -150,11 +160,7 @@ module Socket
   # RFC5735/RFC3927
   #
   def self.is_internal?(addr)
-    if self.dotted_ip?(addr)
-      addr =~ MATCH_IPV4_PRIVATE
-    else
-      false
-    end
+    self.dotted_ip?(addr) && addr =~ MATCH_IPV4_PRIVATE
   end
 
   # Get the first address returned by a DNS lookup for +hostname+.
@@ -176,7 +182,7 @@ module Socket
   # @param hostname [String] A hostname or ASCII IP address
   # @return [Array<String>]
   def self.getaddresses(hostname, accept_ipv6 = true)
-    if hostname =~ MATCH_IPV4 or (accept_ipv6 and hostname =~ MATCH_IPV6)
+    if hostname =~ MATCH_IPV4 || (accept_ipv6 && hostname =~ MATCH_IPV6)
       return [hostname]
     end
 
@@ -212,7 +218,7 @@ module Socket
   # on Windows.
   #
   def self.gethostbyname(host)
-    if (is_ipv4?(host))
+    if is_ipv4?(host)
       return [ host, [], 2, host.split('.').map{ |c| c.to_i }.pack("C4") ]
     end
 
@@ -230,8 +236,7 @@ module Socket
   # address family
   #
   def self.to_sockaddr(ip, port)
-
-    if (ip == '::ffff:0.0.0.0')
+    if ip == '::ffff:0.0.0.0'
       ip = support_ipv6?() ? '::' : '0.0.0.0'
     end
 
@@ -245,7 +250,7 @@ module Socket
   def self.from_sockaddr(saddr)
     port, host = ::Socket::unpack_sockaddr_in(saddr)
     af = ::Socket::AF_INET
-    if (support_ipv6?() and is_ipv6?(host))
+    if support_ipv6?() && is_ipv6?(host)
       af = ::Socket::AF_INET6
     end
     return [ af, host, port ]
@@ -471,7 +476,6 @@ module Socket
   # lame kid way of doing it.
   #
   def self.net2bitmask(netmask)
-
     nmask = resolv_nbo(netmask)
     imask = addr_ntoi(nmask)
     bits  = 32
@@ -751,8 +755,8 @@ module Socket
   def peerinfo
     if (pi = getpeername_as_array)
       return pi[1] + ':' + pi[2].to_s
-    end 
-  end 
+    end
+  end
 
   #
   # Returns local information (host + port) in host:port format.
@@ -760,8 +764,8 @@ module Socket
   def localinfo
     if (pi = getlocalname)
       return pi[1] + ':' + pi[2].to_s
-    end 
-  end 
+    end
+  end
 
   #
   # Returns a string that indicates the type of the socket, such as 'tcp'.

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler