Skip to content

Commit

Permalink
Update @meatballs and @firefart in authors.rb
Browse files Browse the repository at this point in the history
  • Loading branch information
Tod Beardsley committed Apr 9, 2014
1 parent 315ca54 commit 0621751
Show file tree
Hide file tree
Showing 35 changed files with 38 additions and 36 deletions.
4 changes: 3 additions & 1 deletion lib/msf/core/module/author.rb
Expand Up @@ -13,14 +13,15 @@ class Msf::Module::Author
Known =
{
'amaloteaux' => 'alex_maloteaux' + 0x40.chr + 'metasploit.com',
'anonymous' => 'anonymous-contributor' + 0x40.chr + 'metasploit.com',
'anonymous' => 'Unknown',
'bannedit' => 'bannedit' + 0x40.chr + 'metasploit.com',
'Carlos Perez' => 'carlos_perez' + 0x40.chr + 'darkoperator.com',
'cazz' => 'bmc' + 0x40.chr + 'shmoo.com',
'CG' => 'cg' + 0x40.chr + 'carnal0wnage.com',
'ddz' => 'ddz' + 0x40.chr + 'theta44.org',
'egypt' => 'egypt' + 0x40.chr + 'metasploit.com',
'et' => 'et' + 0x40.chr + 'metasploit.com',
'Christian Mehlmauer' => 'FireFart' + 0x40.chr + 'gmail.com',
'hdm' => 'hdm' + 0x40.chr + 'metasploit.com',
'I)ruid' => 'druid' + 0x40.chr + 'caughq.org',
'jcran' => 'jcran' + 0x40.chr + 'metasploit.com',
Expand All @@ -30,6 +31,7 @@ class Msf::Module::Author
'kf' => 'kf_list' + 0x40.chr + 'digitalmunition.com',
'kris katterjohn' => 'katterjohn' + 0x40.chr + 'gmail.com',
'MC' => 'mc' + 0x40.chr + 'metasploit.com',
'Ben Campbell' => 'eat_meatballs' + 0x40.chr + 'hotmail.co.uk',
'msmith' => 'msmith' + 0x40.chr + 'metasploit.com',
'mubix' => 'mubix' + 0x40.chr + 'hak5.org',
'natron' => 'natron' + 0x40.chr + 'metasploit.com',
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/dos/http/hashcollision_dos.rb
Expand Up @@ -31,7 +31,7 @@ def initialize(info = {})
'Scott A. Crosby', # original advisory
'Dan S. Wallach', # original advisory
'Krzysztof Kotowicz', # payload generator
'Christian Mehlmauer <FireFart[at]gmail.com>' # metasploit module
'Christian Mehlmauer' # metasploit module
],
'License' => MSF_LICENSE,
'References' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/gather/wp_w3_total_cache_hash_extract.rb
Expand Up @@ -30,7 +30,7 @@ def initialize
],
'Author' =>
[
'Christian Mehlmauer <FireFart[at]gmail.com>', # Metasploit module
'Christian Mehlmauer', # Metasploit module
'Jason A. Donenfeld <Jason[at]zx2c4.com>' # POC
]
)
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/parser/unattend.rb
Expand Up @@ -19,7 +19,7 @@ def initialize(info={})
'License' => MSF_LICENSE,
'Author' =>
[
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>',
'Ben Campbell',
],
'References' =>
[
Expand Down
Expand Up @@ -28,7 +28,7 @@ def initialize(info = {})
Deployment Services RPC service and parses out the stored credentials.
Tested against Windows 2008 R2 x64 and Windows 2003 x86.
},
'Author' => [ 'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' ],
'Author' => [ 'Ben Campbell' ],
'License' => MSF_LICENSE,
'References' =>
[
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/scanner/http/http_header.rb
Expand Up @@ -16,7 +16,7 @@ def initialize(info={})
'Description' => %q{ This module shows HTTP Headers returned by the scanned systems. },
'Author' =>
[
'Christian Mehlmauer <FireFart[at]gmail.com>',
'Christian Mehlmauer',
'rick2600'
],
'References' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/scanner/http/typo3_bruteforce.rb
Expand Up @@ -16,7 +16,7 @@ def initialize
super(
'Name' => 'Typo3 Login Bruteforcer',
'Description' => 'This module attempts to bruteforce Typo3 logins.',
'Author' => [ 'Christian Mehlmauer <FireFart[at]gmail.com>' ],
'Author' => [ 'Christian Mehlmauer' ],
'License' => MSF_LICENSE
)
end
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/scanner/http/wordpress_login_enum.rb
Expand Up @@ -20,7 +20,7 @@ def initialize
'Alligator Security Team',
'Tiago Ferreira <tiago.ccna[at]gmail.com>',
'Zach Grace <zgrace[at]404labs.com>',
'Christian Mehlmauer <FireFart[at]gmail.com'
'Christian Mehlmauer'
],
'References' =>
[
Expand Down
Expand Up @@ -24,7 +24,7 @@ def initialize(info = {})
[
'Thomas McCarthy "smilingraccoon" <smilingraccoon[at]gmail.com>',
'Brandon McCann "zeknox" <bmccann[at]accuvant.com>' ,
'Christian Mehlmauer "FireFart" <FireFart[at]gmail.com>' # Original PoC
'Christian Mehlmauer' # Original PoC
],
'License' => MSF_LICENSE,
'References' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/scanner/http/wordpress_scanner.rb
Expand Up @@ -14,7 +14,7 @@ def initialize
super(
'Name' => 'Wordpress Scanner',
'Description' => 'Detects Wordpress installations and their version number',
'Author' => [ 'Christian Mehlmauer <FireFart[at]gmail.com>' ],
'Author' => [ 'Christian Mehlmauer' ],
'License' => MSF_LICENSE
)
end
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/scanner/smb/smb_login.rb
Expand Up @@ -32,7 +32,7 @@ def initialize
'Author' =>
[
'tebo <tebo [at] attackresearch [dot] com>', # Original
'Ben Campbell <eat_meatballs [at] hotmail.co.uk>' # Refactoring
'Ben Campbell' # Refactoring
],
'References' =>
[
Expand Down
2 changes: 1 addition & 1 deletion modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
Expand Up @@ -97,7 +97,7 @@ def initialize
'Matti', # Vulnerability discovery
'Jared Stafford <jspenguin[at]jspenguin.org>', # Original Proof of Concept. This module is based on it.
'FiloSottile', # PoC site and tool
'Christian Mehlmauer <FireFart[at]gmail.com>', # Msf module
'Christian Mehlmauer', # Msf module
'wvu', # Msf module
'juan vazquez' # Msf module
],
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/multi/http/mediawiki_thumb.rb
Expand Up @@ -25,7 +25,7 @@ def initialize(info = {})
'Netanel Rubin', # from Check Point - Discovery
'Brandon Perry', # Metasploit Module
'Ben Harris', # Metasploit Module
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' # Metasploit Module
'Ben Campbell' # Metasploit Module
],
'License' => MSF_LICENSE,
'References' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/multi/http/phpmyadmin_preg_replace.rb
Expand Up @@ -22,7 +22,7 @@ def initialize(info = {})
'Author' =>
[
'Janek "waraxe" Vind', # Discovery
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' # Metasploit Module
'Ben Campbell' # Metasploit Module
],
'License' => MSF_LICENSE,
'References' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/browser/ie_unsafe_scripting.rb
Expand Up @@ -42,7 +42,7 @@ def initialize(info = {})
'Author' =>
[
'natron',
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' # PSH and remove ADODB.Stream
'Ben Campbell' # PSH and remove ADODB.Stream
],
'References' =>
[
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/browser/ubisoft_uplay_cmd_exec.rb
Expand Up @@ -25,7 +25,7 @@ def initialize(info = {})
'Author' =>
[
'Tavis Ormandy <taviso[at]cmpxchg8b.com>', # Initial discovery
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>',
'Ben Campbell',
'phillips321 <phillips321[at]phillips321.co.uk>',
'Richard Hicks <scriptmonkeyblog[at]gmail.com>'
],
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/always_install_elevated.rb
Expand Up @@ -29,7 +29,7 @@ def initialize(info={})
'License' => MSF_LICENSE,
'Author' =>
[
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>',
'Ben Campbell',
'Parvez Anwar' # discovery?/inspiration
],
'Arch' => [ ARCH_X86, ARCH_X86_64 ],
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/bypassuac_injection.rb
Expand Up @@ -30,7 +30,7 @@ def initialize(info={})
'David Kennedy "ReL1K" <kennedyd013[at]gmail.com>',
'mitnick',
'mubix', # Port to local exploit
'Ben Campbell <eat_meatballs[at]hotmail.co.uk' # In memory technique
'Ben Campbell' # In memory technique
],
'Platform' => [ 'win' ],
'SessionTypes' => [ 'meterpreter' ],
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/ikeext_service.rb
Expand Up @@ -32,7 +32,7 @@ def initialize(info={})
'License' => MSF_LICENSE,
'Author' =>
[
'Ben Campbell <eat_meatballs@hotmail.co.uk>'
'Ben Campbell'
],
'Platform' => [ 'win'],
'Targets' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/ms13_005_hwnd_broadcast.rb
Expand Up @@ -41,7 +41,7 @@ def initialize(info={})
[
'Tavis Ormandy', # Discovery
'Axel Souchet', # @0vercl0k POC
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' # Metasploit module
'Ben Campbell' # Metasploit module
],
'Platform' => [ 'win' ],
'SessionTypes' => [ 'meterpreter' ],
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/nvidia_nvsvc.rb
Expand Up @@ -36,7 +36,7 @@ def initialize(info={})
'Author' =>
[
'Peter Wintersmith', # Original exploit
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>', # Metasploit integration
'Ben Campbell', # Metasploit integration
],
'Arch' => ARCH_X86_64,
'Platform' => 'win',
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/powershell_cmd_upgrade.rb
Expand Up @@ -21,7 +21,7 @@ def initialize(info={})
},
'License' => MSF_LICENSE,
'Author' => [
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>'
'Ben Campbell'
],
'DefaultOptions' =>
{
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/ppr_flatten_rec.rb
Expand Up @@ -32,7 +32,7 @@ def initialize(info={})
'Keebie4e', # Metasploit integration
'egypt', # Metasploit integration
'sinn3r', # Metasploit integration
'Meatballs', # Metasploit integration
'Ben Campbell', # Metasploit integration
'juan vazquez', # Metasploit integration
'OJ Reeves' # Metasploit integration
],
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/local/wmi.rb
Expand Up @@ -33,7 +33,7 @@ def initialize(info={})
},
'License' => MSF_LICENSE,
'Author' => [
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>'
'Ben Campbell'
],
'References' =>
[
Expand Down
2 changes: 1 addition & 1 deletion modules/exploits/windows/misc/psh_web_delivery.rb
Expand Up @@ -27,7 +27,7 @@ def initialize(info = {})
'License' => MSF_LICENSE,
'Author' =>
[
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>',
'Ben Campbell',
'Chris Campbell' #@obscuresec - Inspiration n.b. no relation!
],
'References' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/post/multi/gather/resolve_hosts.rb
Expand Up @@ -15,7 +15,7 @@ def initialize(info={})
Resolves hostnames to either IPv4 or IPv6 addresses from the perspective of the remote host.
},
'License' => MSF_LICENSE,
'Author' => [ 'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' ],
'Author' => [ 'Ben Campbell' ],
'Platform' => %w{ win python },
'SessionTypes' => [ 'meterpreter' ]
))
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/gather/credentials/gpp.rb
Expand Up @@ -30,7 +30,7 @@ def initialize(info={})
},
'License' => MSF_LICENSE,
'Author' =>[
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>',
'Ben Campbell',
'Loic Jaquemet <loic.jaquemet+msf[at]gmail.com>',
'scriptmonkey <scriptmonkey[at]owobble.co.uk>',
'theLightCosine',
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/gather/credentials/sso.rb
Expand Up @@ -20,7 +20,7 @@ def initialize(info={})
in the database.
},
'License' => MSF_LICENSE,
'Author' => ['Ben Campbell <eat_meatballs[at]hotmail.co.uk>'],
'Author' => ['Ben Campbell'],
'Platform' => ['win'],
'SessionTypes' => ['meterpreter' ]
))
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/gather/enum_ad_computers.rb
Expand Up @@ -39,7 +39,7 @@ def initialize(info={})
(&(objectCategory=computer)(operatingSystem=*server*)) # All Servers
},
'License' => MSF_LICENSE,
'Author' => [ 'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' ],
'Author' => [ 'Ben Campbell' ],
'Platform' => [ 'win' ],
'SessionTypes' => [ 'meterpreter' ],
'References' =>
Expand Down
Expand Up @@ -22,7 +22,7 @@ def initialize(info={})
'License' => MSF_LICENSE,
'Author' =>
[
'Ben Campbell <ben.campbell[at]mwrinfosecurity.com>', #Metasploit Module
'Ben Campbell', #Metasploit Module
'Scott Sutherland' #Original Powershell Code
],
'Platform' => [ 'win' ],
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/gather/enum_ad_user_comments.rb
Expand Up @@ -20,7 +20,7 @@ def initialize(info={})
such users have their passwords specified in these fields.
},
'License' => MSF_LICENSE,
'Author' => [ 'Ben Campbell <eat_meatballs[at]hotmail.co.uk>' ],
'Author' => [ 'Ben Campbell' ],
'Platform' => [ 'win' ],
'SessionTypes' => [ 'meterpreter' ],
'References' =>
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/gather/enum_dirperms.rb
Expand Up @@ -24,7 +24,7 @@ def initialize(info={})
'Author' =>
[
'Kx499',
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>',
'Ben Campbell',
'sinn3r'
]
))
Expand Down
4 changes: 2 additions & 2 deletions modules/post/windows/gather/enum_domain_users.rb
Expand Up @@ -21,9 +21,9 @@ def initialize(info={})
logged into that host will be returned.'
},
'License' => MSF_LICENSE,
'Author' => [
'Author' => [
'Etienne Stalmans <etienne[at]sensepost.com>',
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>'
'Ben Campbell'
],
'Platform' => [ 'win' ],
'SessionTypes' => [ 'meterpreter' ]
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/gather/enum_unattend.rb
Expand Up @@ -24,7 +24,7 @@ def initialize(info={})
[
'Sean Verity <veritysr1980[at]gmail.com>',
'sinn3r',
'Ben Campbell <eat_meatballs[at]hotmail.co.uk>'
'Ben Campbell'
],
'References' =>
[
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/manage/reflective_dll_inject.rb
Expand Up @@ -18,7 +18,7 @@ def initialize(info={})
This module will inject into the memory of a process a specified Reflective DLL.
},
'License' => MSF_LICENSE,
'Author' => [ 'Ben Campbell <eat_meatballs[at]hotmail.co.uk>'],
'Author' => [ 'Ben Campbell'],
'Platform' => [ 'win' ],
'SessionTypes' => [ 'meterpreter' ],
'References' =>
Expand Down

0 comments on commit 0621751

Please sign in to comment.