rex-socket 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c761ab84c205dd7b2046c7249f279f4f9b4ac2ba16168dd4c7cc62e1ac41fb8
-  data.tar.gz: 4ead3c6958a08e49e7255946a772ee8ba4934de87e3f1e1e96ad94db9399fb69
+  metadata.gz: 324deceef4e08a04cdfee10fa7fcda792dfee027e2a83792492da6294a2a5b18
+  data.tar.gz: bdb5cdb27e4cf46c90fe0c5ace17347c47fcb257497fba247c18a627afe9b536
 SHA512:
-  metadata.gz: 5b2ddff4009180354ffc849c021da8087855406e0fa2d7c549981cc7bdfc13adc854cda40da406605c513d719327fa2464948f2e24c06a533b248a149e171061
-  data.tar.gz: 4a862d8480c701c99a28ff67be3db07ecd5803509f18d712f5acfa42bbb432e3022a5797a8847d13e7a989243e19bf4081ad632e7466ee51e5ef29006a5ab39d
+  metadata.gz: 5b161f04cb05e3e44c6fd0034e4a5fc062d229bc582937a525f44230706a5c3b90c0abbafa71d359453040667034a76a597d93ecb153cf65abec00f4dfc8ef1d
+  data.tar.gz: 8c2238d6a358ef0dbb2cb513ca723d3fd97ea5ce97c64c8e79f7f166764d50a68cb0721e23a3701086d3418e7caac937366f2ab2b0fc887b54e742408cd37312

data/lib/rex/socket/range_walker.rb

@@ -84,27 +84,27 @@ class RangeWalker
 
       # Handle IPv6 CIDR first
       if arg.include?(':') && arg.include?('/')
-        return false if (new_ranges = parse_ipv6_cidr(arg)) == nil
+        next if (new_ranges = parse_ipv6_cidr(arg)).nil?
 
       # Handle plain IPv6 next (support ranges, but not CIDR)
       elsif arg.include?(':')
-        return false if (new_ranges = parse_ipv6(arg)) == nil
+        next if (new_ranges = parse_ipv6(arg)).nil?
 
       # Handle IPv4 CIDR
       elsif arg.include?("/")
-        return false if (new_ranges = parse_ipv4_cidr(arg)) == nil
+        next if (new_ranges = parse_ipv4_cidr(arg)).nil?
 
       # Handle hostnames
       elsif arg =~ /[^-0-9,.*]/
-        return false if (new_ranges = parse_hostname(arg)) == nil
+        next if (new_ranges = parse_hostname(arg)).nil?
 
       # Handle IPv4 ranges
       elsif arg =~ MATCH_IPV4_RANGE
         # Then it's in the format of 1.2.3.4-5.6.7.8
-        return false if (new_ranges = parse_ipv4_ranges(arg)) == nil
+        next if (new_ranges = parse_ipv4_ranges(arg)).nil?
 
       else
-        new_ranges = expand_nmap(arg)
+        next if (new_ranges = expand_nmap(arg)).nil?
       end
 
       ranges += new_ranges
@@ -275,18 +275,16 @@ class RangeWalker
   #
   def expand_nmap(arg)
     # Can't really do anything with IPv6
-    return false if arg.include?(":")
+    return if arg.include?(":")
 
     # nmap calls these errors, but it's hard to catch them with our
     # splitting below, so short-cut them here
-    return false if arg.include?(",-") or arg.include?("-,")
+    return if arg.include?(",-") or arg.include?("-,")
 
     bytes = []
     sections = arg.split('.')
-    if sections.length != 4
-      # Too many or not enough dots
-      return false
-    end
+    return unless sections.length == 4  # Too many or not enough dots
+
     sections.each { |section|
       if section.empty?
         # pretty sure this is an unintentional artifact of the C
@@ -300,7 +298,7 @@ class RangeWalker
         # I think this ought to be 1-254, but this is how nmap does it.
         section = "0-255"
       elsif section.include?("*")
-        return false
+        return
       end
 
       # Break down the sections into ranges like so
@@ -317,18 +315,18 @@ class RangeWalker
           # if the upper bound is empty, stop at 255
           #
           bounds = r.split('-', -1)
-          return false if (bounds.length > 2)
+          return if (bounds.length > 2)
 
           bounds[0] = 0   if bounds[0].nil? or bounds[0].empty?
           bounds[1] = 255 if bounds[1].nil? or bounds[1].empty?
           bounds.map!{|b| b.to_i}
-          return false if bounds[0] > bounds[1]
+          return if bounds[0] > bounds[1]
         else
           # Then it's a single value
           bounds[0] = r.to_i
         end
-        return false if bounds[0] > 255 or (bounds[1] and bounds[1] > 255)
-        return false if bounds[1] and bounds[0] > bounds[1]
+        return if bounds[0] > 255 or (bounds[1] and bounds[1] > 255)
+        return if bounds[1] and bounds[0] > bounds[1]
         if bounds[1]
           bounds[0].upto(bounds[1]) do |i|
             sets.push(i)

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.27"
+    VERSION = "0.1.28"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake