Fix rapid7#4163 - Update merge_check_key to keep up with 2.1.4 change

wchen-r7 · wchen-r7 · commit 846dbc7432ec · 2014-11-12T13:46:14.000-06:00
The merge_check_key method (found in Msf::Module::ModuleInfo)) uses respond_to? to check is our object includes a merge_info_description method before merging descriptions. The respond_to? method in 2.1.4 by default no longer checks private and protected methods, and this is breaking our merge_check_key method. Fix rapid7#4163
diff --git a/lib/msf/core/module/module_info.rb b/lib/msf/core/module/module_info.rb
@@ -74,7 +74,7 @@ def info_fixups
   # Checks and merges the supplied key/value pair in the supplied hash.
   #
   def merge_check_key(info, name, val)
-    if (self.respond_to?("merge_info_#{name.downcase}"))
+    if (self.respond_to?("merge_info_#{name.downcase}", true))
       eval("merge_info_#{name.downcase}(info, val)")
     else
       # If the info hash already has an entry for this name

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ def info_fixups`
`74`	`74`	`# Checks and merges the supplied key/value pair in the supplied hash.`
`75`	`75`	`#`
`76`	`76`	`def merge_check_key(info, name, val)`
`77`		`- if (self.respond_to?("merge_info_#{name.downcase}"))`
	`77`	`+ if (self.respond_to?("merge_info_#{name.downcase}", true))`
`78`	`78`	`eval("merge_info_#{name.downcase}(info, val)")`
`79`	`79`	`else`
`80`	`80`	`# If the info hash already has an entry for this name`