rex-socket 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bdb4cd1c80f682ba03ce203c85aba6fa1d6f097
-  data.tar.gz: 17547f6431af31a89a5ef92618460c3837ecb0f1
+  metadata.gz: 24fd1f504f256379c0d5d2edd6784c3023f56f03
+  data.tar.gz: f173a85b8a8fcb821f45be200c8a1704caeeca77
 SHA512:
-  metadata.gz: 8ab1f746dfca5ce6329f51ae3675415a11c949eb65fd9adf47dce42276e5d0f8d1cf8ea7e6deac20405f4d41f948736f50e333117a979e3d8b277015b92cd8b6
-  data.tar.gz: 3ed9c24becb764bfc92d6cf06eabb9e0c36d0e7cd5c614cafa7e8d44b6549390f1c35ad49c5bc04f72380ec17b4b2e2565a16cc5f23a33b3f59ac8b9a7fe091f
+  metadata.gz: d3c3e16ee50aa43e3d96c6f41bb9b41541b24160839890dd1edb842e32e264141102be75d02778491593f830c2fb3e1a2af8485e5f68a81178758b9e2840374e
+  data.tar.gz: 7d09132d390ff1cccaf0c66b485239d059a7959c0e68e2553b48305b7a02b8546fc2afbcc734d436bd67bd22046a115ea61ace6a710f15ed4539bcb8fc116d1f

data/lib/rex/socket/range_walker.rb

@@ -79,8 +79,21 @@ class RangeWalker
     parseme.split(', ').map{ |a| a.split(' ') }.flatten.each do |arg|
       opts = {}
 
-      # Handle IPv6 first (support ranges, but not CIDR)
-      if arg.include?(":")
+      # Handle IPv6 CIDR first
+      if arg.include?(':') && arg.include?('/')
+        return false if !valid_cidr_chars?(arg)
+
+        ip_part, mask_part = arg.split("/")
+        return false unless (0..128).include? mask_part.to_i
+
+        addr, scope_id = ip_part.split('%')
+        return false unless Rex::Socket.is_ipv6?(addr)
+
+        range = expand_cidr(addr + '/' + mask_part)
+        range.options[:scope_id] = scope_id if scope_id
+        ranges.push(range)
+      # Handle plain IPv6 next (support ranges, but not CIDR)
+      elsif arg.include?(':')
         addrs = arg.split('-', 2)
 
         # Handle a single address
@@ -97,8 +110,9 @@ class RangeWalker
 
         addr1, scope_id = addrs[0].split('%')
         opts[:scope_id] = scope_id if scope_id
+        opts[:ipv6] = true
 
-        addr2, scope_id = addrs[0].split('%')
+        addr2, scope_id = addrs[1].split('%')
         ( opts[:scope_id] ||= scope_id ) if scope_id
 
         # Both have to be IPv6 for this to work
@@ -114,12 +128,9 @@ class RangeWalker
       # Handle IPv4 CIDR
       elsif arg.include?("/")
         # Then it's CIDR notation and needs special case
-        return false if arg =~ /[,-]/ # Improper CIDR notation (can't mix with 1,3 or 1-3 style IP ranges)
-        return false if arg.scan("/").size > 1 # ..but there are too many slashes
-        ip_part,mask_part = arg.split("/")
-        return false if ip_part.nil? or ip_part.empty? or mask_part.nil? or mask_part.empty?
-        return false if mask_part !~ /^[0-9]{1,2}$/ # Illegal mask -- numerals only
-        return false if mask_part.to_i > 32 # This too -- between 0 and 32.
+        return false if !valid_cidr_chars?(arg)
+        ip_part, mask_part = arg.split("/")
+        return false unless (0..32).include? mask_part.to_i
         if ip_part =~ /^\d{1,3}(\.\d{1,3}){1,3}$/
           return false unless ip_part =~ Rex::Socket::MATCH_IPV4
         end
@@ -417,6 +428,17 @@ class RangeWalker
     return ranges
   end
 
+  protected
+
+  def valid_cidr_chars?(arg)
+    return false if arg.include? ',-' # Improper CIDR notation (can't mix with 1,3 or 1-3 style IP ranges)
+    return false if arg.scan("/").size > 1 # ..but there are too many slashes
+    ip_part, mask_part = arg.split("/")
+    return false if ip_part.nil? || ip_part.empty? || mask_part.nil? || mask_part.empty?
+    return false if mask_part !~ /^[0-9]{1,3}$/ # Illegal mask -- numerals only
+    true
+  end
+
 end
 
 # A range of IP addresses

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.16"
+    VERSION = "0.1.17"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler