Land rapid7#3342, Support negation in portspec

Author: zeroSteiner

lib/rex/socket.rb

@@ -505,26 +505,40 @@ def self.portspec_crack(pspec)
   end
 
   #
-  # Converts a port specification like "80,21-23,443" into a sorted,
-  # unique array of valid port numbers like [21,22,23,80,443]
+  # Converts a port specification like "80,21-25,!24,443" into a sorted,
+  # unique array of valid port numbers like [21,22,23,25,80,443]
   #
   def self.portspec_to_portlist(pspec)
     ports = []
+    remove = []
 
     # Build ports array from port specification
     pspec.split(/,/).each do |item|
+      target = ports
+
+      item.strip!
+
+      if item.start_with? '!'
+        item.delete! '!'
+        target = remove
+      end
+
       start, stop = item.split(/-/).map { |p| p.to_i }
 
       start ||= 0
       stop ||= item.match(/-/) ? 65535 : start
 
       start, stop = stop, start if stop < start
 
-      start.upto(stop) { |p| ports << p }
+      start.upto(stop) { |p| target << p }
+    end
+
+    if ports.empty? and not remove.empty? then
+      ports = 0.upto 65535
     end
 
     # Sort, and remove dups and invalid ports
-    ports.sort.uniq.delete_if { |p| p < 1 or p > 65535 }
+    ports.sort.uniq.delete_if { |p| p < 0 or p > 65535 or remove.include? p }
   end
 
   #
@@ -537,7 +551,7 @@ def self.portlist_to_portspec(parr)
     lastp  = nil
 
     parr.uniq.sort{|a,b| a<=>b}.map{|a| a.to_i}.each do |n|
-      next if (n < 1 or n > 65535)
+      next if (n < 0 or n > 65535)
       if not lastp
         range = [n]
         lastp = n

spec/lib/rex/socket_spec.rb

@@ -163,4 +163,35 @@
 
     end
   end
+
+  describe '.portspec_to_portlist' do
+
+    portspec = '-1,0-10,!2-5,!7,65530-,65536'
+    context "'#{portspec}'" do
+
+      subject { described_class.portspec_to_portlist portspec } 
+
+      it { should be_a(Array) }
+
+      not_included = []
+      not_included << -1
+      not_included << 65536
+      not_included.concat (2..5).to_a
+      not_included << 7
+      not_included.each do |item|
+        it { should_not include item }
+      end
+
+      included = []
+      included << -1
+      included.concat (0..10).to_a
+      included.concat (65530..65535).to_a
+      included << 65536
+      included = included - not_included
+      included.each do |item|
+        it { should include item }
+      end
+    end
+  end
+
 end