1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-05 14:57:30 +01:00

added code to support HEX var substitution

git-svn-id: file:///home/svn/framework3/trunk@4041 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Matt Miller 2006-10-16 18:51:34 +00:00
parent 7b0c80b922
commit 34f388d0e5

View File

@ -222,6 +222,12 @@ class Payload < Msf::Module
# RHOST is substituted with the RHOST value from the datastore which will
# have been populated by the framework.
#
# Supprted packing types:
#
# - ADDR (foo.com, 1.2.3.4)
# - HEX (0x12345678, "\x41\x42\x43\x44")
# - RAW (raw bytes)
#
def substitute_vars(raw, offsets)
offsets.each_pair { |name, info|
offset, pack = info
@ -233,6 +239,27 @@ class Payload < Msf::Module
if ((val = datastore[name]))
if (pack == 'ADDR')
val = Rex::Socket.resolv_nbo(val)
elsif (pack =~ /^HEX(.*)$/)
sub = $1
# If they pass a straight up hex string, don't account for byte
# ordering.
if val =~ /^\\x/
val = [ val.gsub(/\\x/, '') ].pack('H*')
# Otherwise, do a conversion.
else
val = val.to_s.hex
if sub =~ /nbos/i
val = [ val ].pack('n')
elsif sub =~ /nbo/i
val = [ val ].pack('N')
elsif sub =~ /hbos/i
val = [ val ].pack('v')
else
val = [ val ].pack('V')
end
end
elsif (pack == 'RAW')
# Just use the raw value...
else