Merge the commandline options with the payload's datastore

Not sure why this wasn't happening before. Some output formats were passing options to Msf::Simple::Payload#generate_simple, some weren't. This probably fixes several latent bugs. [FIXRM rapid7#7109]
akshuu · Jul 16, 2012 · 926fd0c · 926fd0c
1 parent 428a98c
commit 926fd0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/msfpayload b/msfpayload
@@ -117,6 +117,8 @@ rest.each do |x|
 	options[k] = v.to_s
 end
 
+payload.datastore.merge! options
+
 if (cmd =~ /^(p|y|r|d|c|j|x|b|v|w)/)
 	fmt = 'perl' if (cmd =~ /^p/)
 	fmt = 'ruby' if (cmd =~ /^y/)

diff --git a/msfvenom b/msfvenom
@@ -300,6 +300,7 @@ if opts[:payload]
 				::Msf::Serializer::ReadableText.dump_options(payload,'    '))
 			exit
 		end
+		payload.datastore.merge! datastore
 	end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -300,6 +300,7 @@ if opts[:payload] @@
     				::Msf::Serializer::ReadableText.dump_options(payload,'    '))
     			exit
     		end
+    		payload.datastore.merge! datastore
     	end
     end
@@ Expand Down @@