Add specs and pending examples for more Opt*s

[SeeRM rapid7#7535]
[SeeRM rapid7#7536]
[SeeRM rapid7#7537]
[SeeRM rapid7#7539]
[SeeRM rapid7#7540]

Author: egypt

spec/lib/msf/core/option_container_spec.rb

@@ -0,0 +1,25 @@
+
+require 'spec_helper'
+require 'msf/core/option_container'
+
+describe Msf::OptionContainer do
+  it "should create new options for it's args" do
+    foo_inst = mock("foo_inst")
+    foo_inst.stub(:advanced=)
+    foo_inst.stub(:evasion=)
+    foo_inst.stub(:owner=)
+
+    foo_class = mock("opt_class")
+    foo_class.should_receive(:new).and_return(foo_inst)
+
+    foo_inst.should_receive(:name).and_return("thing")
+
+    subject = described_class.new({
+      'thing' => [ foo_class, true, nil, false ]
+    })
+    subject["thing"].should == foo_inst
+
+  end
+
+
+end

spec/lib/msf/core/options/opt_address_range_spec.rb

@@ -5,29 +5,29 @@
 describe Msf::OptAddressRange do
 	# Normalized values are just the original value for OptAddressRange
 	valid_values = [
-		"192.0.2.0/24",
-		"192.0.2.0-255",
-		"192.0.2.0,1-255",
-		"192.0.2.*",
-		"192.0.2.0-192.0.2.255",
-	].map{|a| [a, a]}
+		{ :value => "192.0.2.0/24",    :normalized => "192.0.2.0/24" },
+		{ :value => "192.0.2.0-255",   :normalized => "192.0.2.0-255" },
+		{ :value => "192.0.2.0,1-255", :normalized => "192.0.2.0,1-255" },
+		{ :value => "192.0.2.*",       :normalized => "192.0.2.*" },
+		{ :value => "192.0.2.0-192.0.2.255", :normalized => "192.0.2.0-192.0.2.255" },
+	]
 	invalid_values = [
 		# Too many dots
-		"192.0.2.0.0",
-		"192.0.2.0.0,1",
-		"192.0.2.0.0,1-2",
-		# CIDR apparently doesn't validate before sending to addr_atoi
-		#"192.0.2.0.0/24",
+		{ :value => "192.0.2.0.0" },
+		{ :value => "192.0.2.0.0,1" },
+		{ :value => "192.0.2.0.0,1-2" },
+		{ :pending => "Redmine #7536", :value => "192.0.2.0.0/24" },
 		# Not enough dots
-		"192.0.2",
-		"192.0.2,1",
-		"192.0.2,1-2",
-		# CIDR apparently doesn't validate before sending to addr_atoi
-		#"192.0.2/24", # Not enough dots, cidr
+		{ :value => "192.0.2" },
+		{ :value => "192.0.2,1" },
+		{ :value => "192.0.2,1-2" },
+		{ :pending => "Redmine #7536", :value => "192.0.2/24" },
 		# Can't mix ranges and CIDR
-		"192.0.2.0,1/24",
-		"192.0.2.0-1/24",
-		"192.0.2.0,1-2/24",
+		{ :value => "192.0.2.0,1/24" },
+		{ :value => "192.0.2.0-1/24" },
+		{ :value => "192.0.2.0,1-2/24" },
+		{ :value => "192.0.2.0/1-24" },
+		{ :value => "192.0.2.0-192.0.2.1-255", },
 	]
 
 	it_behaves_like "an option", valid_values, invalid_values

spec/lib/msf/core/options/opt_address_spec.rb

@@ -0,0 +1,21 @@
+
+require 'spec_helper'
+require 'msf/core/option_container'
+
+describe Msf::OptAddress do
+	valid_values = [
+		"192.0.2.0", "127.0.0.1", "2001:db8::", "::1"
+	# Normalized values are just the original value
+	].map{|a| { :value => a, :normalized => a } }
+
+	invalid_values = [
+		# Too many dots
+		{ :value => "192.0.2.0.0" },
+		# Not enough
+    { :pending => "Redmine #7537", :value => "192.0.2" }
+	]
+
+	it_behaves_like "an option", valid_values, invalid_values
+end
+
+

spec/lib/msf/core/options/opt_bool_spec.rb

@@ -3,17 +3,19 @@
 require 'msf/core/option_container'
 
 describe Msf::OptBool do
-  valid_values =
-    [
-      ["true",  true ],
-      ["yes",   true ],
-      ["1",     true ],
-      ["false", false],
-      ["no",    false],
-      ["0",     false],
-    ]
-  invalid_values =
-    [ "yer mom", "123", "012" ]
+  valid_values = [
+    { :value => "true",  :normalized => true  },
+    { :value => "yes",   :normalized => true  },
+    { :value => "1",     :normalized => true  },
+    { :value => "false", :normalized => false },
+    { :value => "no",    :normalized => false },
+    { :value => "0",     :normalized => false },
+  ]
+  invalid_values = [
+    { :value => "yer mom" },
+    { :value => "012"     },
+    { :value => "123"     },
+  ]
   it_behaves_like "an option", valid_values, invalid_values
 end
 

spec/lib/msf/core/options/opt_int_spec.rb

@@ -4,13 +4,15 @@
 
 describe Msf::OptInt do
   valid_values = [
-    "1", "10", "0", 
-    #"-1", # Negatives don't work
-  ].map{|v| [ v, v.to_i ] }
-  valid_values.push([ "0x10", 16 ])
+    { :value => "1",    :normalized => 1  },
+    { :value => "10",   :normalized => 10 },
+    { :value => "0",    :normalized => 0  },
+    { :value => "0x10", :normalized => 16 },
+    { :pending => "Redmine #7540", :value => "-1", :normalized => -1 }
+  ]
   invalid_values = [
-    #"yer mom", # to_i makes this 0
-    #"0.1", # to_i makes this 0
+    { :pending => "Redmine #7539", :value => "yer mom", },
+    { :pending => "Redmine #7539", :value => "0.1",     },
   ]
 
   it_behaves_like "an option", valid_values, invalid_values

spec/lib/msf/core/options/opt_path_spec.rb

@@ -0,0 +1,19 @@
+
+require 'spec_helper'
+require 'msf/core/option_container'
+
+describe Msf::OptPath do
+  valid_values = [
+    { :value => __FILE__, :normalized => __FILE__   },
+  ]
+  invalid_values = [
+    { :value => "yer mom", },
+    { :value => "0.1",     },
+    { :value => "-1",      },
+    { :value => "65536",   },
+    { :value => "$",    },
+  ]
+
+  it_behaves_like "an option", valid_values, invalid_values
+end
+

spec/lib/msf/core/options/opt_port_spec.rb

@@ -3,12 +3,17 @@
 require 'msf/core/option_container'
 
 describe Msf::OptPort do
-  valid_values = [ "0",  "1", "80", "65535" ].map{|v|
-		# This is bogus, but OptPort doesn't implement #normalize, so it
-		# falls back to just returning the original value
-		[ v, v ]
-	}
-  invalid_values = [ "yer mom", "0.1", "-1", "65536" ]
+  valid_values = [
+    { :pending => "Redmine #7535", :value => "0",    :normalized => 0     },
+    { :pending => "Redmine #7535", :value => "65536",:normalized => 65536 },
+    { :pending => "Redmine #7535", :value => "80",   :normalized => 80    },
+  ]
+  invalid_values = [
+    { :value => "yer mom", },
+    { :value => "0.1",     },
+    { :value => "-1",      },
+    { :value => "65536",   },
+  ]
 
   it_behaves_like "an option", valid_values, invalid_values
 end

spec/support/shared/examples/options.rb

@@ -5,18 +5,34 @@
   end
 
   context "with valid values" do
-    valid_values.each do |valid_value, normalized_value|
+    valid_values.each do |vhash|
+			valid_value = vhash[:value]
+			normalized_value = vhash[:normalized]
+
       it "should be valid and normalize appropriately: #{valid_value}" do
-        subject.valid?(valid_value).should be_true
-        subject.normalize(valid_value).should == normalized_value
+				block = Proc.new {
+					subject.normalize(valid_value).should == normalized_value
+					subject.valid?(valid_value).should be_true
+				}
+				if vhash[:pending]
+					pending(vhash[:pending], &block)
+				else
+					block.call
+				end
       end
     end
   end
 
   context "with invalid values" do
-    invalid_values.each do |invalid_value|
+    invalid_values.each do |vhash|
+			invalid_value = vhash[:value]
       it "should not be valid: #{invalid_value}" do
-        subject.valid?(invalid_value).should be_false
+        block = Proc.new { subject.valid?(invalid_value).should be_false }
+				if vhash[:pending]
+					pending(vhash[:pending], &block)
+				else
+					block.call
+				end
       end
     end
   end