infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #2175, force string encoding for RPC 

Metasploit takes great pains to ensure that all strings are encoded as
plain old US-ASCII. This PR enforces this conversion over RPC as well.

[FixRM #7888]
bug/bundler_fix
Tod Beardsley 2013-08-16 16:01:33 -05:00
parent e50ef209b2 7937fbcc49
commit 1eb3c323ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/msf/core/rpc/v10/service.rb
View File

@ -23,7 +23,7 @@ class Service
attr_accessor :service, :srvhost, :srvport, :uri, :options attr_accessor :service, :srvhost, :srvport, :uri, :options
attr_accessor :handlers, :default_handler, :tokens, :users, :framework attr_accessor :handlers, :default_handler, :tokens, :users, :framework
attr_accessor :dispatcher_timeout, :token_timeout, :debug attr_accessor :dispatcher_timeout, :token_timeout, :debug, :str_encoding
def initialize(framework, options={}) def initialize(framework, options={})
self.framework = framework self.framework = framework
@ -36,6 +36,7 @@ class Service
:port => 3790 :port => 3790
}.merge(options) }.merge(options)
self.str_encoding = ''.encoding.name
self.srvhost = self.options[:host] self.srvhost = self.options[:host]
self.srvport = self.options[:port] self.srvport = self.options[:port]
self.uri = self.options[:uri] self.uri = self.options[:uri]
@ -121,6 +122,8 @@ class Service
raise ArgumentError, "Invalid Message Format" raise ArgumentError, "Invalid Message Format"
end end
msg.map { |a| a.respond_to?(:force_encoding) ? a.force_encoding(self.str_encoding) : a }
group, funct = msg.shift.split(".", 2) group, funct = msg.shift.split(".", 2)
if not self.handlers[group] if not self.handlers[group]