Merge branch 'master' into fix_misc_loot_bugs

.mailmap

@@ -64,7 +64,6 @@ wwebb-r7 <wwebb-r7@github>           <William_Webb@rapid7.com>
 
 bannedit <bannedit@github>             David Rude <bannedit0@gmail.com>
 bcoles <bcoles@github>                 bcoles <bcoles@gmail.com>
-bcoles <bcoles@github>                 Brendan Coles <bcoles@gmail.com>
 bokojan <bokojan@github>               parzamendi-r7 <peter_arzamendi@rapid7.com>
 brandonprry <brandonprry@github>       <bperry@brandons-mbp.attlocal.net>
 brandonprry <brandonprry@github>       Brandon Perry <bperry@bperry-rapid7.(none)>

data/logos/metasploit-v5.txt

@@ -22,4 +22,4 @@ xMMMMMMMMMd                        ,0MMMMMMMMMMK;
 %red           'oOWMMMMMMMMo%clr                +:+
 %red               .,cdkO0K;%clr        :+:    :+:                                
                                 :::::::+:
-           %whiMetasploit%clr %yelUnder Construction%clr
+                      %whiMetasploit%clr

lib/msf/core/author.rb

@@ -18,6 +18,7 @@ class Msf::Author
     'amaloteaux'          => 'alex_maloteaux' + 0x40.chr + 'metasploit.com',
     'aushack'             => 'patrick' + 0x40.chr + 'osisecurity.com.au',
     'bannedit'            => 'bannedit' + 0x40.chr + 'metasploit.com',
+    'bcoles'              => 'bcoles' + 0x40.chr + 'gmail.com',
     'Carlos Perez'        => 'carlos_perez' + 0x40.chr + 'darkoperator.com',
     'cazz'                => 'bmc' + 0x40.chr + 'shmoo.com',
     'CG'                  => 'cg' + 0x40.chr + 'carnal0wnage.com',

lib/msf/core/web_services/servlet/event_servlet.rb

@@ -33,8 +33,8 @@ module EventServlet
 
   def self.report_event
     lambda {
+      warden.authenticate!
       begin
-        warden.authenticate!
         job = lambda { |opts| get_db.report_event(opts) }
         exec_report_job(request, &job)
       rescue => e

lib/msf/core/web_services/servlet/host_servlet.rb

@@ -34,7 +34,7 @@ module HostServlet
         data = data.first if is_single_object?(data, sanitized_params)
         set_json_data_response(response: data, includes: includes)
       rescue => e
-        print_error_and_create_response(error: e, message: 'There was an error getting hosts:', code: 500)
+        print_error_and_create_response(error: e, message: 'There was an error retrieving hosts:', code: 500)
       end
     }
   end

lib/msf/core/web_services/servlet/msf_servlet.rb

@@ -18,8 +18,8 @@ module MsfServlet
 
   def self.get_msf_version
     lambda {
+      warden.authenticate!
       begin
-        warden.authenticate!
         set_json_data_response(response: { metasploit_version: Metasploit::Framework::VERSION })
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving the version:', code: 500)

modules/auxiliary/admin/http/scadabr_credential_dump.rb

@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
         This module has been tested successfully with ScadaBR
         versions 1.0 CE and 0.9 on Windows and Ubuntu systems.
       },
-      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'         => 'bcoles',
       'License'        => MSF_LICENSE,
       'References'     => ['URL', 'http://www.scadabr.com.br/?q=node/1375'],
       'Targets'        => [[ 'Automatic', {} ]],

modules/auxiliary/admin/smb/ms17_010_command.rb

@@ -104,7 +104,7 @@ class MetasploitModule < Msf::Auxiliary
     output = execute_command_with_output(text, bat, datastore['COMMAND'], @smbshare, @ip, datastore['RETRY'], datastore['DELAY'])
 
     # Report output
-    print_good("Command completed successfuly!")
+    print_good("Command completed successfully!")
     print_status("Output for \"#{datastore['COMMAND']}\":\n")
     print_line("#{output}\n")
     report_note(

modules/auxiliary/admin/smb/psexec_command.rb

@@ -72,7 +72,7 @@ class MetasploitModule < Msf::Auxiliary
       output = execute_command_with_output(text, bat, datastore['COMMAND'], @smbshare, @ip, datastore['RETRY'], datastore['DELAY'])
 
       unless output.nil?
-        print_good("Command completed successfuly!")
+        print_good("Command completed successfully!")
         print_status("Output for \"#{datastore['COMMAND']}\":\n")
         print_line("#{output}\n")
         report_note(

modules/auxiliary/fileformat/badpdf.rb

@@ -39,14 +39,14 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def run
-    if datastore['PDFINJECT'].to_s.end_with?('.pdf') && datastore['FILENAME'].to_s.end_with?('.pdf')
+    if datastore['PDFINJECT'].nil? && datastore['FILENAME'].nil?
       print_error 'Please configure either FILENAME or PDFINJECT'
     elsif !datastore['PDFINJECT'].nil? && datastore['PDFINJECT'].to_s.end_with?('.pdf')
       injectpdf
     elsif !datastore['FILENAME'].nil? && datastore['FILENAME'].to_s.end_with?('.pdf')
       createpdf
     else
-      print_error 'FILENAME or PDFINJECT must end with '.pdf' file extension'
+      print_error "FILENAME or PDFINJECT must end with '.pdf' file extension"
     end
   end
 

modules/auxiliary/gather/asterisk_creds.rb

@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
         This module retrieves SIP and IAX2 user extensions and credentials from
         Asterisk Call Manager service. Valid manager credentials are required.
       },
-      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'      => 'bcoles',
       'References'  =>
         [
           ['URL', 'http://www.asterisk.name/sip1.html'],

modules/auxiliary/gather/doliwamp_traversal_creds.rb

@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Auxiliary
         Note: All tokens expire after 30 minutes of inactivity by default.
       },
       'License'        => MSF_LICENSE,
-      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'         => 'bcoles',
       'References'     =>
         [
           ['URL', 'https://doliforge.org/tracker/?func=detail&aid=1212&group_id=144'],

modules/auxiliary/gather/http_pdf_authors.rb

@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary
         and extract the author's name from the document metadata.
       },
       'License'     => MSF_LICENSE,
-      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>'))
+      'Author'      => 'bcoles'))
     register_options(
       [
         OptString.new('URL', [ false, 'The target URL', '' ]),

modules/auxiliary/gather/snare_registry.rb

@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Auxiliary
         to become unresponsive until the server completes the request.
       },
       'Platform'      => 'win',
-      'Author'        => [ 'Brendan Coles <bcoles[at]gmail.com>' ],
+      'Author'        => [ 'bcoles' ],
       'License'       => MSF_LICENSE,
       'References'    =>
         [

modules/auxiliary/gather/teamtalk_creds.rb

@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Auxiliary
         This module has been tested successfully on TeamTalk versions
         5.2.2.4885 and 5.2.3.4893.
       },
-      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'      => 'bcoles',
       'References'  =>
         [
           # Protocol documentation

modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb

@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'         =>
         [
           'Pedro Ribeiro <pedrib[at]gmail.com>', # Discovery and exploit
-          'Brendan Coles <bcoles[at]gmail.com>'  # metasploit module
+          'bcoles'  # metasploit module
         ],
       'References'     =>
         [

modules/auxiliary/scanner/http/surgenews_user_creds.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Auxiliary
         [
           ['URL', 'http://news.netwinsite.com:8119/webnews?cmd=body&item=34896&group=netwin.surgemail'],
         ],
-      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'         => 'bcoles',
       'DisclosureDate' => 'Jun 16 2017'))
     register_options [ Opt::RPORT(9080) ]
     deregister_options 'RHOST'

modules/auxiliary/scanner/misc/easycafe_server_fileaccess.rb

@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'      =>
         [
           'R-73eN', # Vulnerability Discovery
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit module
+          'bcoles' # Metasploit module
         ],
       'References'  =>
         [

modules/auxiliary/scanner/nntp/nntp_login.rb

@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
         but does not support AUTHINFO GENERIC or AUTHINFO SASL
         authentication methods.
       },
-      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'      => 'bcoles',
       'License'     => MSF_LICENSE,
       'References'  => [ [ 'CVE', '1999-0502' ], # Weak password
                          [ 'URL', 'https://tools.ietf.org/html/rfc3977' ],

modules/auxiliary/scanner/wsdd/wsdd_query.rb

@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
         Discover information from Web Services Dynamic Discovery (WS-Discovery)
         enabled systems.
       },
-      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'      => 'bcoles',
       'License'     => MSF_LICENSE,
       'References'  =>
         [

modules/exploits/linux/http/dlink_dcs931l_upload.rb

@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author' =>
         [
           'Mike Baucom', 'Allen Harper', 'J. Rach', # Initial discovery by Tangible Security
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'Payload' =>
         {

modules/exploits/linux/http/mvpower_dvr_shell_exec.rb

@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'Paul Davies (UHF-Satcom)', # Initial vulnerability discovery and PoC
           'Andrew Tierney (Pen Test Partners)', # Independent vulnerability discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'License'     => MSF_LICENSE,
       'Platform'    => 'linux',

modules/exploits/linux/http/openfiler_networkcard_exec.rb

@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>' # Discovery and exploit
+          'bcoles' # Discovery and exploit
         ],
       'References'     =>
         [

modules/exploits/linux/http/qnap_qcenter_change_passwd_exec.rb

@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'          =>
         [
           'Ivan Huertas', # Discovery and PoC
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'      =>
         [

modules/exploits/linux/http/wanem_exec.rb

@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Arch'           => ARCH_CMD,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>', # Discovery and exploit
+          'bcoles', # Discovery and exploit
         ],
       'References'     =>
         [

modules/exploits/linux/http/zen_load_balancer_exec.rb

@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>' # Discovery and exploit
+          'bcoles' # Discovery and exploit
         ],
       'References'     =>
         [

modules/exploits/linux/http/zenoss_showdaemonxmlconfig_exec.rb

@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>', # Discovery and exploit
+          'bcoles', # Discovery and exploit
         ],
       'License'        => MSF_LICENSE,
       'Privileged'     => false,

modules/exploits/linux/local/abrt_raceabrt_priv_esc.rb

@@ -34,7 +34,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Tavis Ormandy', # Discovery and C exploit
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Apr 14 2015',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/af_packet_chocobo_root_priv_esc.rb

@@ -41,7 +41,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'rebel',        # Discovery and chocobo_root.c exploit
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Aug 12 2016',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/af_packet_packet_set_ring_priv_esc.rb

@@ -47,7 +47,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Andrey Konovalov', # Discovery and C exploit
-          'Brendan Coles'     # Metasploit
+          'bcoles'     # Metasploit
         ],
       'DisclosureDate' => 'Mar 29 2017',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/apport_abrt_chroot_priv_esc.rb

@@ -40,7 +40,7 @@ class MetasploitModule < Msf::Exploit::Local
           'Stéphane Graber', # Independent discovery, PoC and patch
           'Tavis Ormandy', # Independent discovery and C exploit
           'Ricardo F. Teixeira', # shell exploit
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Mar 31 2015',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/glibc_ld_audit_dso_load_priv_esc.rb

@@ -47,7 +47,7 @@ class MetasploitModule < Msf::Exploit::Local
           'zx2c4',         # "I Can't Read and I Won't Race You Either" exploit
           'Marco Ivaldi',  # raptor_ldaudit and raptor_ldaudit2 exploits
           'Todor Donev',   # libmemusage.so exploit
-          'Brendan Coles'  # Metasploit
+          'bcoles'  # Metasploit
         ],
       'DisclosureDate' => 'Oct 18 2010',
       'Platform'       => 'linux',

modules/exploits/linux/local/glibc_origin_expansion_priv_esc.rb

@@ -48,7 +48,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Tavis Ormandy', # Discovery and exploit
-          'Brendan Coles'  # Metasploit
+          'bcoles'  # Metasploit
         ],
       'DisclosureDate' => 'Oct 18 2010',
       'Platform'       => 'linux',

modules/exploits/linux/local/glibc_realpath_priv_esc.rb

@@ -34,7 +34,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'halfdog',      # Discovery and RationalLove.c exploit
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Jan 16 2018',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/juju_run_agent_priv_esc.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Exploit::Local
         [
           'Ryan Beisner', # Discovery and PoC
           'David Ames (@thedac)', # Discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Apr 13 2017',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/lastore_daemon_dbus_priv_esc.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           "King's Way",   # Discovery and exploit
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Feb 2 2016',
       'References'     =>

modules/exploits/linux/local/libuser_roothelper_priv_esc.rb

@@ -49,7 +49,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Qualys',       # Discovery and C exploit
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Jul 24 2015',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/network_manager_vpnc_username_priv_esc.rb

@@ -36,7 +36,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Denis Andzakovic', # Discovery and exploit
-          'Brendan Coles'     # Metasploit
+          'bcoles'     # Metasploit
         ],
       'DisclosureDate' => 'Jul 26 2018',
       'References'     =>

modules/exploits/linux/local/rds_priv_esc.rb

@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Dan Rosenberg', # Discovery and C exploit
-          'Brendan Coles'  # Metasploit
+          'bcoles'  # Metasploit
         ],
       'DisclosureDate' => 'Oct 20 2010',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/ufo_privilege_escalation.rb

@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Exploit::Local
         [
           'Andrey Konovalov', # Discovery and C exploit
           'h00die',           # Metasploit module
-          'Brendan Coles'     # Metasploit module
+          'bcoles'     # Metasploit module
         ],
       'DisclosureDate' => 'Aug 10 2017',
       'Platform'       => [ 'linux' ],

modules/exploits/linux/local/vmware_alsa_config.rb

@@ -39,7 +39,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Jann Horn',    # Discovery and PoC
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'May 22 2017',
       'Platform'       => 'linux',

modules/exploits/linux/misc/asus_infosvr_auth_bypass_exec.rb

@@ -28,7 +28,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'Friedrich Postelstorfer', # Initial public disclosure and Python exploit
           'jduck', # Independent discovery and C exploit
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'License'     => MSF_LICENSE,
       'Platform'    => 'unix',

modules/exploits/linux/misc/hid_discoveryd_command_blink_on_unauth_rce.rb

@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'Ricky "HeadlessZeke" Lawshae', # Discovery
           'coldfusion39', # VertXploit
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'License'     => MSF_LICENSE,
       'Platform'    => 'linux',

modules/exploits/linux/misc/qnap_transcode_server.rb

@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'Zenofex', # Initial vulnerability discovery and PoC
           '0x00string', # Initial vulnerability discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'License'    => MSF_LICENSE,
       'Platform'   => 'linux',

modules/exploits/linux/samba/is_known_pipename.rb

@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'steelo <knownsteelo[at]gmail.com>',    # Vulnerability Discovery & Python Exploit
           'hdm',                                  # Metasploit Module
-          'Brendan Coles <bcoles[at]gmail.com>',  # Check logic
+          'bcoles',  # Check logic
         ],
       'License'        => MSF_LICENSE,
       'References'     =>

modules/exploits/multi/http/cups_bash_env_exec.rb

@@ -19,7 +19,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author' => [
         'Stephane Chazelas', # Vulnerability discovery
         'lcamtuf', # CVE-2014-6278
-        'Brendan Coles <bcoles[at]gmail.com>' # msf
+        'bcoles' # msf
       ],
       'References' => [
         [ 'CVE', '2014-6271' ],

modules/exploits/multi/http/cuteflow_upload_exec.rb

@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>' # Discovery and exploit
+          'bcoles' # Discovery and exploit
         ],
       'References'     =>
         [

modules/exploits/multi/http/extplorer_upload_exec.rb

@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>' # Discovery and exploit
+          'bcoles' # Discovery and exploit
         ],
       'References'     =>
         [

modules/exploits/multi/http/glossword_upload_exec.rb

@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'AkaStep', # Discovery
-          'Brendan Coles <bcoles[at]gmail.com>' # metasploit exploit
+          'bcoles' # metasploit exploit
         ],
       'References'     =>
         [

modules/exploits/multi/http/hyperic_hq_script_console.rb

@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
       },
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'License'        => MSF_LICENSE,
       'DefaultOptions' =>

modules/exploits/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec.rb

@@ -30,7 +30,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'SecuriTeam', # Discovery and exploit
-          'Brendan Coles <bcoles[at]gmail.com>', # Metasploit
+          'bcoles', # Metasploit
         ],
       'References'     =>
         [

modules/exploits/multi/http/kordil_edms_upload_exec.rb

@@ -19,7 +19,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>' # Discovery and exploit
+          'bcoles' # Discovery and exploit
         ],
       'References'     =>
         [

modules/exploits/multi/http/processmaker_exec.rb

@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
         the web interface.
       },
       'License'        => MSF_LICENSE,
-      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'         => 'bcoles',
       'References'     =>
         [
           ['OSVDB',     '99199'],

modules/exploits/multi/http/processmaker_plugin_upload.rb

@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
         and version 3.2.0 on Debian Linux 8.
       },
       'License'        => MSF_LICENSE,
-      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'         => 'bcoles',
       'References'     =>
         [
           ['URL', 'http://wiki.processmaker.com/3.0/Plugin_Development']

modules/exploits/multi/http/testlink_upload_exec.rb

@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>' # Discovery and exploit
+          'bcoles' # Discovery and exploit
         ],
       'References'     =>
         [

modules/exploits/multi/local/magnicomp_sysinfo_mcsiwrapper_priv_esc.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Exploit::Local
         [
           'Daniel Lawson', # Discovery and exploit
           'Romain Trouve', # Discovery and exploit
-          'Brendan Coles'  # Metasploit
+          'bcoles'  # Metasploit
         ],
       'DisclosureDate' => 'Sep 23 2016',
       'Platform'       => %w(linux solaris),

modules/exploits/multi/local/xorg_x11_suid_server.rb

@@ -41,7 +41,7 @@ class MetasploitModule < Msf::Exploit::Local
           'Narendra Shinde', # Discovery and exploit
           'Raptor - 0xdea',  # Modified exploit for cron
           'Aaron Ringo',     # Metasploit module
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit module
+          'bcoles' # Metasploit module
         ],
       'DisclosureDate' => 'Oct 25 2018',
       'References'     =>

modules/exploits/multi/misc/msf_rpc_console.rb

@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
         4.14 on Windows 7 SP1.
       },
       'License'        => MSF_LICENSE,
-      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'         => 'bcoles',
       'References'     =>
         [
           [ 'URL', 'https://help.rapid7.com/metasploit/Content/api/rpc/overview.html' ],

modules/exploits/qnx/local/ifwatchd_priv_esc.rb

@@ -30,7 +30,7 @@ class MetasploitModule < Msf::Exploit::Local
         [
           'cenobyte',     # Discovery and exploit
           'Tim Brown',    # Independent discovery
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/qnx/qconn/qconn_exec.rb

@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'David Odell',  # Discovery
           'Mor!p3r',      # PoC
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/solaris/local/extremeparr_dtappgather_priv_esc.rb

@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Exploit::Local
         [
           'Shadow Brokers',   # exploit
           'Hacker Fantastic', # dtappgather-poc.sh
-          'Brendan Coles'     # Metasploit
+          'bcoles'     # Metasploit
         ],
       'DisclosureDate' => 'Apr 24 2017',
       'Privileged'     => true,

modules/exploits/solaris/local/libnspr_nspr_log_file_priv_esc.rb

@@ -51,7 +51,7 @@ class MetasploitModule < Msf::Exploit::Local
         [
           'iDefense',     # Discovery
           'Marco Ivaldi', # Exploit
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'DisclosureDate' => 'Oct 11 2006',
       'Privileged'     => true,

modules/exploits/solaris/local/rsh_stack_clash_priv_esc.rb

@@ -57,7 +57,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Author'         =>
         [
           'Qualys Corporation', # Stack Clash technique and Solaris_rsh.c exploit
-          'Brendan Coles'       # Metasploit
+          'bcoles'       # Metasploit
         ],
       'DisclosureDate' => 'Jun 19 2017',
       'Privileged'     => true,

modules/exploits/unix/http/dell_kace_k1000_upload.rb

@@ -30,7 +30,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'Bradley Austin (steponequit)', # Initial discovery and exploit
-          'Brendan Coles <bcoles[at]gmail.com>', # Metasploit
+          'bcoles', # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/http/quest_kace_systems_management_rce.rb

@@ -38,7 +38,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'Leandro Barragan', # Discovery and PoC
           'Guido Leo',        # Discovery and PoC
-          'Brendan Coles',    # Metasploit
+          'bcoles',    # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/misc/qnx_qconn_exec.rb

@@ -28,7 +28,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'David Odell',  # Discovery
           'Mor!p3r',      # PoC
-          'Brendan Coles' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/actualanalyzer_ant_cookie_exec.rb

@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'          =>
         [
           'Benjamin Harris', # Discovery and exploit
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'      =>
         [

modules/exploits/unix/webapp/flashchat_upload_exec.rb

@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'x-hayben21', # Discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>'  # Metasploit
+          'bcoles'  # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/hybridauth_install_php_exec.rb

@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'Pichaya Morimoto', # Discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/kimai_sqli.rb

@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'drone', # Discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit module
+          'bcoles' # Metasploit module
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/open_flash_chart_upload_exec.rb

@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
           'Braeden Thomas', # Initial discovery + Piwik PoC
           'Gjoko Krstic <gjoko[at]zeroscience.mk>', # OpenEMR PoC
           'Halim Cruzito', # zonPHP PoC
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/opensis_modname_exec.rb

@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'            =>
         [
           'EgiX', # Discovery
-          'Brendan Coles <bcoles[at]gmail.com>' # msf exploit
+          'bcoles' # msf exploit
         ],
       'References'        =>
         [

modules/exploits/unix/webapp/php_charts_exec.rb

@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'AkaStep', # Discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>' # msf exploit
+          'bcoles' # msf exploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/projectsend_upload_exec.rb

@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'Fady Mohammed Osman', # Discovery and Exploit
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/simple_e_document_upload_exec.rb

@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'vinicius777[at]gmail.com', # Auth bypass discovery and PoC, kinda
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/vicidial_user_authorization_unauth_cmd_exec.rb

@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Exploit::Remote
         and 2.13 RC1 on CentOS.
       },
       'License'        => MSF_LICENSE,
-      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'         => 'bcoles',
       'References'     =>
         [
           ['URL', 'http://www.vicidial.org/VICIDIALmantis/view.php?id=1016']

modules/exploits/unix/webapp/webtester_exec.rb

@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>'  # Metasploit
+          'bcoles'  # Metasploit
         ],
       'References'     =>
         [

modules/exploits/unix/webapp/zoneminder_packagecontrol_exec.rb

@@ -28,7 +28,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'Author'         =>
         [
-          'Brendan Coles <bcoles[at]gmail.com>', # Discovery and exploit
+          'bcoles', # Discovery and exploit
         ],
       'License'        => MSF_LICENSE,
       'Privileged'     => true,

modules/exploits/windows/fileformat/nitro_reader_jsapi.rb

@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
       [
         'mr_me <steven[at]srcincite.io>',         # vulnerability discovery and exploit
-        'Brendan Coles <bcoles [at] gmail.com>',  # hidden hta tricks!
+        'bcoles',                                 # hidden hta tricks!
         'sinn3r'                                  # help with msf foo!
       ],
       'References'     =>

modules/exploits/windows/fileformat/tfm_mmplayer_m3u_ppl_bof.rb

@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'RjRjh Hack3r',                        # Original discovery and exploit
-          'Brendan Coles <bcoles[at]gmail.com>'  # msf exploit
+          'bcoles'  # msf exploit
         ],
       'References'     =>
         [

modules/exploits/windows/ftp/open_ftpd_wbem.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'Serge Gorbunov', # Initial discovery
-          'Brendan Coles <bcoles[at]gmail.com>', # Metasploit
+          'bcoles', # Metasploit
         ],
       'References'     =>
         [

modules/exploits/windows/http/avaya_ccr_imageupload_exec.rb

@@ -136,7 +136,7 @@ class MetasploitModule < Msf::Exploit::Remote
     payload_url = ""
     @payload_path = ""
     if res and res.code == 200 and res.body =~ /"Key":"RadUAG_success","Value":true/
-      print_good("Payload uploaded successfuly")
+      print_good("Payload uploaded successfully")
     else
       print_error("Payload upload failed")
       return

modules/exploits/windows/http/efs_easychatserver_username.rb

@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
          'LSO <lso[at]hushmail.com>', # original metasploit
-         'Brendan Coles <bcoles[at]gmail.com>' # metasploit
+         'bcoles' # metasploit
         ],
       'License'        => BSD_LICENSE,
       'References'     =>

modules/exploits/windows/http/miniweb_upload_wbem.rb

@@ -30,7 +30,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'AkaStep', # Initial discovery
-          'Brendan Coles <bcoles[at]gmail.com>', # Metasploit
+          'bcoles', # Metasploit
         ],
       'References'     =>
         [

modules/exploits/windows/http/serviio_checkstreamurl_cmd_exec.rb

@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'Gjoko Krstic(LiquidWorm) <gjoko[at]zeroscience.mk>', # Discovery and exploit
-          'Brendan Coles <bcoles[at]gmail.com>', # Metasploit
+          'bcoles', # Metasploit
         ],
       'References'     =>
         [

modules/exploits/windows/misc/hp_imc_dbman_restartdb_unauth_rce.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'sztivi', # Discovery
           'Chris Lyne', # Python PoC (@lynerc)
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/windows/misc/hp_imc_dbman_restoredbase_unauth_rce.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           'sztivi', # Discovery
           'Chris Lyne', # Python PoC (@lynerc)
-          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+          'bcoles' # Metasploit
         ],
       'References'     =>
         [

modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb

@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         =>
         [
           'Mohamed Shetta <mshetta[at]live.com>', # Initial discovery and PoC
-          'Brendan Coles <bcoles[at]gmail.com>',  # Metasploit
+          'bcoles',  # Metasploit
         ],
       'References'     =>
         [

modules/payloads/singles/cmd/unix/reverse_python.rb

@@ -19,7 +19,7 @@ module MetasploitModule
       'Name'        => 'Unix Command Shell, Reverse TCP (via Python)',
       'Version'     => '$Revision: 1 $',
       'Description' => 'Connect back and create a command shell via Python',
-      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'Author'      => 'bcoles',
       'License'     => MSF_LICENSE,
       'Platform'    => 'unix',
       'Arch'        => ARCH_CMD,

modules/post/windows/escalate/ms10_073_kbdlayout.rb

@@ -85,7 +85,7 @@ EOS
 
     ring0_code =
       #"\xcc" +
-      # save registers -- necessary for successfuly recovery
+      # save registers -- necessary for successful recovery
       "\x60" +
       # get EPROCESS from ETHREAD
       "\x64\xa1\x24\x01\x00\x00" +

modules/post/windows/gather/bitlocker_fvek.rb

@@ -103,7 +103,7 @@ class MetasploitModule < Msf::Post
         if !recovery_key.nil?
           recovery_key = recovery_key[1]
           id_key_tmp = id_key_tmp[1]
-          print_good("Recovery key generated successfuly : #{recovery_key}")
+          print_good("Recovery key generated successfully : #{recovery_key}")
         else
           print_error('Recovery Key generation failed')
           print_status('No recovery key can be used')

modules/post/windows/gather/credentials/dynazip_log.rb

@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Post
         files in Microsoft Plus! 98 and Windows Me.
       },
       'License'        => MSF_LICENSE,
-      'Author'         => ['Brendan Coles <bcoles[at]gmail.com>'],
+      'Author'         => ['bcoles'],
       'References'     =>
         [
           ['CVE', '2001-0152'],

modules/post/windows/gather/credentials/ftpx.rb

@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Post
         FTP client for Windows.
       },
       'License'       => MSF_LICENSE,
-      'Author'        => [ 'Brendan Coles <bcoles[at]gmail.com>' ],
+      'Author'        => [ 'bcoles' ],
       'Platform'      => [ 'win' ],
       'SessionTypes'  => [ 'meterpreter' ]
     ))

modules/post/windows/gather/credentials/smartermail.rb

@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Post
       'License'       => MSF_LICENSE,
       'Author'        => [
         'Joe Giron',                           # Discovery and PoC (@theonlyevil1)
-        'Brendan Coles <bcoles[at]gmail.com>', # Metasploit
+        'bcoles', # Metasploit
         'sinn3r'                               # shell session support
       ],
       'References'    =>