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

*Backwards Compatibility Broken* - The session XMLRPC object now requires data for read/write to be encoded using Base64, this solves a number of issues with the builtin XMLRPC library with regards to binary data encoding. The response from read() now contains an 'encoding' element with the value 'base64', in order to differentiate from older versions. 

git-svn-id: file:///home/svn/framework3/trunk@8776 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2010-03-11 00:55:21 +00:00
parent b01f9ff233
commit dcfdb95e5f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/msf/core/rpc/session.rb
View File

@ -40,13 +40,13 @@ class Session < Base
end end
if(not s.rstream.has_read_data?(0)) if(not s.rstream.has_read_data?(0))
{ "data" => "" } { "data" => "", "encoding" => "base64" }
else else
data = s.shell_read data = s.shell_read
if data.length > 0 if data.length > 0
@framework.events.on_session_output(s, data) @framework.events.on_session_output(s, data)
end end
{ "data" => data } { "data" => Rex::Text.encode_base64(data), "encoding" => "base64" }
end end
end end
@ -56,9 +56,10 @@ class Session < Base
if(s.type != "shell") if(s.type != "shell")
raise ::XMLRPC::FaultException.new(403, "session is not a shell") raise ::XMLRPC::FaultException.new(403, "session is not a shell")
end end
@framework.events.on_session_command(s, data) buff = Rex::Text.decode_base64(data)
@framework.events.on_session_command(s, buff)
{ "write_count" => s.shell_write(data) } { "write_count" => s.shell_write(buff) }
end end
def meterpreter_read(token, sid) def meterpreter_read(token, sid)
@ -81,7 +82,7 @@ class Session < Base
if data.length > 0 if data.length > 0
@framework.events.on_session_output(s, data) @framework.events.on_session_output(s, data)
end end
{ "data" => data } { "data" => Rex::Text.encode_base64(data), "encoding" => "base64" }
end end
# #
@ -98,11 +99,12 @@ class Session < Base
s.init_ui(nil, Rex::Ui::Text::Output::Buffer.new) s.init_ui(nil, Rex::Ui::Text::Output::Buffer.new)
end end
buff = Rex::Text.decode_base64(data)
# This is already covered by the meterpreter console's on_command_proc # This is already covered by the meterpreter console's on_command_proc
# so don't do it here # so don't do it here
#@framework.events.on_session_command(s, data) #@framework.events.on_session_command(s, buff)
Thread.new { s.console.run_single(data) } Thread.new { s.console.run_single(buff) }
{} {}
end end