Merge branch 'msftidy-1' of git://github.com/schierlm/metasploit-framework into schierlm-msftidy-1

unstable
sinn3r 2012-10-23 02:10:56 -05:00
commit 33ce74fe8c
52 changed files with 48 additions and 57 deletions

View File

@ -35,13 +35,11 @@ class Metasploit3 < Msf::Auxiliary
'Author' => 'jduck',
'License' => MSF_LICENSE,
'Version' => '$Revision$',
'Platform' => [ 'win' ],
'References' =>
[
[ 'OSVDB', '65533'],
[ 'URL', 'http://seclists.org/bugtraq/2010/Jun/160' ]
],
'Privileged' => true,
'DisclosureDate' => 'Jun 15 2010'
)

View File

@ -26,7 +26,6 @@ class Metasploit3 < Msf::Auxiliary
},
'Author' => [ 'nullbind <scott.sutherland[at]netspi.com>' ],
'License' => MSF_LICENSE,
'Platform' => [ 'win' ],
'References' => [[ 'URL', 'http://en.wikipedia.org/wiki/SMBRelay' ]]
))

View File

@ -33,7 +33,6 @@ class Metasploit3 < Msf::Auxiliary
[ 'Automatic', { } ],
],
'DefaultTarget' => 0,
'Platform' => [ 'win' ],
'References' => [[ 'URL', 'http://en.wikipedia.org/wiki/SMBRelay' ]]
))

View File

@ -45,7 +45,6 @@ class Metasploit3 < Msf::Auxiliary
['URL', 'http://sunsolve.sun.com/search/document.do?assetkey=1-77-1000898.1-1']
],
# Tested OK against sol8.tor 20100624 -jjd
'Privileged' => true,
'DisclosureDate' => 'Jan 22 2003')
register_options(

View File

@ -27,7 +27,6 @@ class Metasploit3 < Msf::Auxiliary
Code execution may be possible however this module is only a DoS.
},
'Author' => [ 'patrick' ],
'Arch' => [ ARCH_X86 ],
'License' => MSF_LICENSE,
'Version' => '$Revision$',
'References' =>

View File

@ -43,7 +43,6 @@ class Metasploit3 < Msf::Auxiliary
[ 'EDB', 15803 ],
[ 'URL', 'http://blogs.technet.com/b/srd/archive/2010/12/22/assessing-an-iis-ftp-7-5-unauthenticated-denial-of-service-vulnerability.aspx' ]
],
'Platform' => [ 'win' ],
'DisclosureDate' => 'Dec 21 2010'))
register_options(

View File

@ -31,7 +31,7 @@ class Metasploit3 < Msf::Auxiliary
},
'Author' => [ 'K. Reid Wightman <wightman[at]digitalbond.com>' ],
'License' => MSF_LICENSE,
'Version' => '$Revision: 1 $',
'Version' => '$Revision$',
'DisclosureDate' => 'Jan 19 2012'
))

View File

@ -13,7 +13,7 @@ class Metasploit3 < Msf::Auxiliary
def initialize
super(
'Name' => 'IPv6 Link Local/Node Local Ping Discovery',
'Version' => '$Revision: 13962 $',
'Version' => '$Revision$',
'Description' => %q{
Send a ICMPv6 ping request to all default multicast addresses, and wait to see who responds.
},

View File

@ -16,7 +16,7 @@ class Metasploit3 < Msf::Auxiliary
def initialize
super(
'Name' => 'H.323 Version Scanner',
'Version' => '$Revision: 9804 $',
'Version' => '$Revision$',
'Description' => 'Detect H.323 Version.',
'Author' => 'hdm',
'License' => MSF_LICENSE

View File

@ -16,7 +16,7 @@ class Metasploit4 < Msf::Auxiliary
def initialize
super(
'Name' => 'Atlassian Crowd XML Entity Expansion Remote File Access',
'Version' => '$Revision: $',
'Version' => '$Revision$',
'Description' => %q{
This module simply attempts to read a remote file from the server using a
vulnerability in the way Atlassian Crowd handles XML files. The vulnerability

View File

@ -38,7 +38,7 @@ class Metasploit3 < Msf::Auxiliary
def initialize
super(
'Name' => 'Authentication Capture: DRDA (DB2, Informix, Derby)',
'Version' => '$Revision: 14774 $',
'Version' => '$Revision$',
'Description' => %q{
This module provides a fake DRDA (DB2, Informix, Derby) server
that is designed to capture authentication credentials.

View File

@ -35,7 +35,7 @@ class Metasploit3 < Msf::Auxiliary
def initialize(info = {})
super(update_info(info,
'Name' => 'HTTP Client MS Credential Relayer',
'Version' => '$Revision:$',
'Version' => '$Revision$',
'Description' => %q{
This module relays negotiated NTLM Credentials from an HTTP server to multiple
protocols. Currently, this module supports relaying to SMB and HTTP.
@ -52,7 +52,6 @@ class Metasploit3 < Msf::Auxiliary
[
'Rich Lundeen <richard.lundeen[at]gmail.com>',
],
'Version' => '$Revision:$',
'License' => MSF_LICENSE,
'Actions' =>
[

View File

@ -25,7 +25,7 @@ class Metasploit3 < Msf::Auxiliary
'Description' => 'This module emulates a webserver leaking PII data',
'License' => MSF_LICENSE,
'Author' => 'MJC',
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'URL', 'http://www.metasploit.com'],

View File

@ -22,7 +22,7 @@ class Metasploit3 < Msf::Encoder::XorAdditiveFeedback
def initialize
super(
'Name' => 'CPUID-based Context Keyed Payload Encoder',
'Version' => '$Revision: 1$',
'Version' => '$Revision$',
'Description' => %q{
This is a Context-Keyed Payload Encoder based on CPUID and Shikata Ga Nai.
},

View File

@ -41,7 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
'PrependEncoder' => "\x83\xec\x7f",
'DisableNops' => 'True',
},
'Platform' => 'BSD',
'Platform' => 'bsd',
'Arch' => ARCH_X86,
'Targets' =>
[

View File

@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
[ 'OSVDB', '73609' ],
[ 'EDB', '17487' ]
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'Privileged' => false,
'Platform' => ['php'],
'Arch' => ARCH_PHP,

View File

@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Brendan Coles <bcoles[at]gmail.com>', # Discovery and exploit
],
'License' => MSF_LICENSE,
'Version' => '$Revision: 3 $',
'Version' => '$Revision$',
'Privileged' => false,
'Arch' => ARCH_CMD,
'Platform' => 'unix',

View File

@ -60,7 +60,7 @@ class Metasploit4 < Msf::Exploit::Local
[ 'Linux x64', { 'Arch' => ARCH_X86_64 } ],
#[ 'Command payload', { 'Arch' => ARCH_CMD } ],
],
'DefaultOptons' => { 'WfsDelay' => 2 },
'DefaultOptions' => { 'WfsDelay' => 2 },
'DefaultTarget' => 0,
'DisclosureDate' => "Apr 16 2009",
}

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
},
'Author' => [ 'MC', 'Jacob Giannantonio', 'Patrick Hof', 'h0ng10' ],
'License' => MSF_LICENSE,
'Version' => '$Revision: 15620 $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE', '2010-0738' ], # by using VERB other than GET/POST

View File

@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
'mihi' # ARCH_JAVA support
],
'License' => MSF_LICENSE,
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE', '2012-0391'],

View File

@ -20,7 +20,7 @@ class Metasploit3 < Msf::Exploit::Remote
super(update_info(info,
'Name' => 'MacOS X QuickTime RTSP Content-Type Overflow',
# Description?
# Author?
'Author' => 'unknown',
'Version' => '$Revision$',
'Platform' => 'osx',
'References' =>

View File

@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
'TecR0c <roccogiovannicalvi[at]gmail.com>', # Metasploit module
'mr_me <steventhomasseeley[at]gmail.com>' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'EDB', 15668 ],

View File

@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
'TecR0c <roccogiovannicalvi[at]gmail.com>', # Metasploit module
'mr_me <steventhomasseeley[at]gmail.com>' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE', '2010-0356' ],

View File

@ -30,7 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Secunia', # Vulnerability discovery
'juan vazquez' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE', '2012-0270' ],

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Francisco Falcon', # Discovery
'bannedit' # Metasploit module
],
'Version' => '$Revision: 14069 $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE' , '2009-0837' ],

View File

@ -27,7 +27,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Tiago Henriques', # metasploit module
'James Fitts' # clean ups
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'EDB', 14373 ],

View File

@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Jacques Louw', # Vulnerability Discovery and PoC
'juan vazquez' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'BID', '49149' ],

View File

@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
[
['CVE', '2012-0013'],
['OSVDB', '78207'],
['MSB', 'ms12-005'],
['MSB', 'MS12-005'],
['BID', '51284'],
['URL', 'http://support.microsoft.com/default.aspx?scid=kb;EN-US;2584146'],
['URL', 'http://exploitshop.wordpress.com/2012/01/14/ms12-005-embedded-object-package-allow-arbitrary-code-execution/']

View File

@ -28,7 +28,6 @@ class Metasploit3 < Msf::Exploit::Remote
'Diego Juarez', # Vulnerability discovery
'juan vazquez', # Metasploit module
],
'Version' => '$ $',
'References' =>
[
[ 'BID', '28541' ],

View File

@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
'SkD', # Exploit
'juan vazquez' # Metasploit Module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'OSVDB', '49809' ],

View File

@ -23,7 +23,7 @@ class Metasploit3 < Msf::Exploit::Remote
This module exploits the FTP server component of the Sasser worm.
By sending an overly long PORT command the stack can be overwritten.
},
'Author' => [ 'valsmith [at] metasploit.com>', 'chamuco [at] gmail.com>', 'patrick' ],
'Author' => [ '<valsmith [at] metasploit.com>', '<chamuco [at] gmail.com>', 'patrick' ],
'Arch' => [ ARCH_X86 ],
'License' => MSF_LICENSE,
'Version' => '$Revision$',

View File

@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
'KingCope', # Vulnerability Discovery and PoC
'juan vazquez', # Metasploit Module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE', '2008-3257' ],

View File

@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Andrea Micalizzi', # aka rgod - Vulnerability Discovery and PoC
'juan vazquez' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'Platform' => 'win',
'References' =>
[

View File

@ -43,7 +43,7 @@ class Metasploit4 < Msf::Exploit::Remote
{
'BadChars' => "\x00\x3a\x3b\x3d\x3c\x3e\x0a\x0d\x22\x26\x27\x2f\x60\xb4",
},
'Platforms' => [ 'win' ],
'Platform' => [ 'win' ],
'Targets' =>
[
[

View File

@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
['OSVDB', '14502'],
['BID', '6214'],
['CVE', '2002-1142'],
['MSB', 'ms02-065'],
['MSB', 'MS02-065'],
['URL', 'http://archives.neohapsis.com/archives/vulnwatch/2002-q4/0082.html']
],
'Privileged' => false,

View File

@ -42,8 +42,8 @@ class Metasploit3 < Msf::Exploit::Remote
['OSVDB', '272'],
['BID', '529'],
['CVE', '1999-1011'],
['MSB', 'ms98-004'],
['MSB', 'ms99-025']
['MSB', 'MS98-004'],
['MSB', 'MS99-025']
],
'Targets' =>
[

View File

@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Local
'References' => [
[ 'URL', 'http://www.room362.com/blog/2012/1/3/uac-user-assisted-compromise.html' ]
],
'DisclosureDate'=> "Jan 3, 2012"
'DisclosureDate'=> "Jan 3 2012"
))
register_options([

View File

@ -38,9 +38,9 @@ class Metasploit3 < Msf::Exploit::Local
'Targets' => [ [ 'Windows', {} ] ],
'DefaultTarget' => 0,
'References' => [
[ 'URL', ' http://www.trustedsec.com/december-2010/bypass-windows-uac/' ]
[ 'URL', 'http://www.trustedsec.com/december-2010/bypass-windows-uac/' ]
],
'DisclosureDate'=> "Dec 31, 2010"
'DisclosureDate'=> "Dec 31 2010"
))
end

View File

@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Local
[ 'Automatic', { } ],
],
'DefaultTarget' => 0,
'DisclosureDate'=> "Oct 15, 2012"
'DisclosureDate'=> "Oct 15 2012"
))
register_options([

View File

@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
'AbdulAziz Hariri', # Initial discovery via ZDI
'alino <26alino[at]gmail.com>' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
['OSVDB', '75780'],

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
'alino <26alino[at]gmail.com>', # citrix_streamprocess_data_msg author
'juan vazquez' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
['OSVDB', '75780'],

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
'alino <26alino[at]gmail.com>', # citrix_streamprocess_data_msg author
'juan vazquez' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
['OSVDB', '75780'],

View File

@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
'alino <26alino[at]gmail.com>', # citrix_streamprocess_data_msg author
'juan vazquez' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
['OSVDB', '75780'],

View File

@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Joseph Sheridan', # Vulnerability Discovery and PoC
'juan vazquez' # Metasploit module
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE', '2012-2763' ],

View File

@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
'juan vazquez',
'sinn3r'
],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'References' =>
[
[ 'CVE', '2012-0124' ],

View File

@ -50,7 +50,7 @@ class Metasploit3 < Msf::Exploit::Remote
[ 'Windows XP Pro SP0/SP1 English', { 'Ret' => 0x71aa32ad } ],
],
'DefaultTarget' => 0,
'DisclosureDate' => 'Jul 11 2005 '))
'DisclosureDate' => 'Jul 11 2005'))
register_options([ Opt::RPORT(25) ], self.class)
end

View File

@ -29,7 +29,7 @@ class Metasploit3 < Msf::Post
of the module against the sessions and validation of the options provided.
},
'License' => MSF_LICENSE,
'Author' => [ 'carlos_perez[at]darkoperator.com>'],
'Author' => [ '<carlos_perez[at]darkoperator.com>'],
'Version' => '$Revision$',
'Platform' => [ 'windows', 'unix', 'osx', 'linux', 'solaris' ],
'SessionTypes' => [ 'meterpreter','shell' ]

View File

@ -34,7 +34,7 @@ class Metasploit3 < Msf::Post
},
'License' => MSF_LICENSE,
'Author' => [ 'todb <todb[at]metasploit.com>'],
'Version' => '$Revision: $',
'Version' => '$Revision$',
'Platform' => [ 'linux','unix','osx','solaris','aix' ],
'References' =>
[

View File

@ -28,9 +28,9 @@ class Metasploit3 < Msf::Post
'Platform' => [ 'windows' ],
'SessionTypes' => [ 'meterpreter' ],
'References' => [
[ 'URL', ' http://www.trustedsec.com/december-2010/bypass-windows-uac/' ]
[ 'URL', 'http://www.trustedsec.com/december-2010/bypass-windows-uac/' ]
],
'DisclosureDate'=> "Dec 31, 2010"
'DisclosureDate'=> "Dec 31 2010"
))
register_options([

View File

@ -34,7 +34,7 @@ class Metasploit3 < Msf::Post
'Shubham Dawra <shubham2dawra[at]gmail.com>' # www.SecurityXploded.com
],
'License' => MSF_LICENSE,
'Version' => '$Revision: 14100 $',
'Version' => '$Revision$',
'Platform' => [ 'windows' ],
'SessionTypes' => [ 'meterpreter' ]
))

View File

@ -31,7 +31,7 @@ class Metasploit3 < Msf::Post
},
'License' => MSF_LICENSE,
'Author' => [ 'Justin Cacak'],
'Version' => '$Revision: 14835 $',
'Version' => '$Revision$',
'Platform' => [ 'windows' ],
'SessionTypes' => [ 'meterpreter' ]
))

View File

@ -25,7 +25,7 @@ class Metasploit3 < Msf::Post
However, this can be overcome by migrating to the SQL Server process.},
'License' => MSF_LICENSE,
'Author' => [ 'Scott Sutherland <scott.sutherland[at]netspi.com>'],
'Platform' => [ 'Windows' ],
'Platform' => [ 'windows' ],
'SessionTypes' => [ 'meterpreter' ]
))