Test for subdom_list existence first

todb · todb · commit 1b9d45e1065d · 2012-11-09T15:01:36.000-06:00
Otherwise, you get ```` [11/09/2012 14:50:38] [e(0)] core: Error running against host 173.236.237.136: can't convert nil into String ```` Other than that, looks good. [Fixes rapid7#851]
diff --git a/modules/auxiliary/scanner/http/vhost_scanner.rb b/modules/auxiliary/scanner/http/vhost_scanner.rb
@@ -51,7 +51,7 @@ def initialize(info = {})
 		end
 
 		def run_host(ip)
-			if ::File.file?(datastore['SUBDOM_LIST'])
+			if datastore['SUBDOM_LIST'] and ::File.file?(datastore['SUBDOM_LIST'])
 				valstr = IO.readlines(datastore['SUBDOM_LIST']).map {
 					|e| e.gsub(".#{datastore['DOMAIN']}", "").chomp
 				}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def initialize(info = {})`
`51`	`51`	`end`
`52`	`52`
`53`	`53`	`def run_host(ip)`
`54`		`- if ::File.file?(datastore['SUBDOM_LIST'])`
	`54`	`+ if datastore['SUBDOM_LIST'] and ::File.file?(datastore['SUBDOM_LIST'])`
`55`	`55`	`valstr = IO.readlines(datastore['SUBDOM_LIST']).map {`
`56`	`56`	`\|e\| e.gsub(".#{datastore['DOMAIN']}", "").chomp`
`57`	`57`	`}`