Land rapid7#4629, @wchen-r7's proper fixes for rapid7#4616 and rapid7#3798

Brent Cook · Brent Cook · commit fc016fe2ec32 · 2015-01-23T14:29:14.000-06:00
diff --git a/lib/msf/core/option_container.rb b/lib/msf/core/option_container.rb
@@ -527,10 +527,6 @@ def normalize(value)
     return Regexp.compile(value)
   end
 
-  def default
-    @default.to_s
-  end
-
   def display_value(value)
     if value.kind_of?(Regexp)
       return value.source
diff --git a/modules/auxiliary/scanner/http/scraper.rb b/modules/auxiliary/scanner/http/scraper.rb
@@ -27,7 +27,7 @@ def initialize
     register_options(
       [
         OptString.new('PATH', [ true,  "The test path to the page to analize", '/']),
-        OptRegexp.new('PATTERN', [ true,  "The regex to use (default regex is a sample to grab page title)", %r{<title>(.*)</title>}i])
+        OptRegexp.new('PATTERN', [ true,  "The regex to use (default regex is a sample to grab page title)", '<title>(.*)</title>'])
 
       ], self.class)
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ def initialize`
`27`	`27`	`register_options(`
`28`	`28`	`[`
`29`	`29`	`OptString.new('PATH', [ true, "The test path to the page to analize", '/']),`
`30`		`- OptRegexp.new('PATTERN', [ true, "The regex to use (default regex is a sample to grab page title)", %r{<title>(.*)</title>}i])`
	`30`	`+ OptRegexp.new('PATTERN', [ true, "The regex to use (default regex is a sample to grab page title)", '<title>(.*)</title>'])`
`31`	`31`
`32`	`32`	`], self.class)`
`33`	`33`