diff --git a/docs/metasploit-framework.wiki/Creating-Your-First-PR.md b/docs/metasploit-framework.wiki/Creating-Your-First-PR.md index ebb63b2237..f1b11c6cce 100644 --- a/docs/metasploit-framework.wiki/Creating-Your-First-PR.md +++ b/docs/metasploit-framework.wiki/Creating-Your-First-PR.md @@ -85,7 +85,7 @@ Additionally any information about caveats, scenarios you have tested, custom op should also go into this file. ## Checking Documentation Syntax -Once you have written the documentation, you then want to run `toos/dev/msftidy_docs.rb `. This will report on any +Once you have written the documentation, you then want to run `tools/dev/msftidy_docs.rb `. This will report on any errors with your documentation file, which you will want to fix before submitting your PR. Notice however that if you get a warning about long lines, these may be okay to ignore depending on the context. A good example is if a line is long merely because of a URL. Such warnings can be safely ignored. diff --git a/docs/metasploit-framework.wiki/GSoC-2021-Project-Ideas.md b/docs/metasploit-framework.wiki/GSoC-2021-Project-Ideas.md index a48e9bdfca..4f63de10ee 100644 --- a/docs/metasploit-framework.wiki/GSoC-2021-Project-Ideas.md +++ b/docs/metasploit-framework.wiki/GSoC-2021-Project-Ideas.md @@ -6,7 +6,7 @@ Mentors: [@zerosteiner](https://github.com/zerosteiner), [@jmartin-r7](https://g ### Retain active status of authentication tokens -Many testing techniques interacting with web servers such as `XSS` rely on ensuring authentication obtained on a target be kept active. A mechanism for registering and maintaining open authentications identified during a test for the duration of the console session may provide an additional utility to enable more modules to target techniques that need valid authentication to be maintained. One such authentication token would be data retained in a cookie for a web service. This project would lay the groundwork for registering gathered or generated authenticaion tokens against a target to be refreshed and sustained until a console exits, or in some cases across console restarts. +Many testing techniques interacting with web servers such as `XSS` rely on ensuring authentication obtained on a target be kept active. A mechanism for registering and maintaining open authentications identified during a test for the duration of the console session may provide an additional utility to enable more modules to target techniques that need valid authentication to be maintained. One such authentication token would be data retained in a cookie for a web service. This project would lay the groundwork for registering gathered or generated authentication tokens against a target to be refreshed and sustained until a console exits, or in some cases across console restarts. Difficulty: 2/5 diff --git a/docs/metasploit-framework.wiki/How-to-use-Metasploit-Messagepack-RPC.md b/docs/metasploit-framework.wiki/How-to-use-Metasploit-Messagepack-RPC.md index 3e70612685..93396ae7bc 100644 --- a/docs/metasploit-framework.wiki/How-to-use-Metasploit-Messagepack-RPC.md +++ b/docs/metasploit-framework.wiki/How-to-use-Metasploit-Messagepack-RPC.md @@ -52,7 +52,7 @@ Which returns the following response: ### Start the server -Use the following command to run the server with a configured uesrname and password: +Use the following command to run the server with a configured username and password: ``` $ ruby msfrpcd -U user -P pass -f diff --git a/docs/metasploit-framework.wiki/Keeping-in-sync-with-rapid7-master.md b/docs/metasploit-framework.wiki/Keeping-in-sync-with-rapid7-master.md index 007f1eb4eb..e5201ad6ef 100644 --- a/docs/metasploit-framework.wiki/Keeping-in-sync-with-rapid7-master.md +++ b/docs/metasploit-framework.wiki/Keeping-in-sync-with-rapid7-master.md @@ -6,7 +6,7 @@ The term 'repo' is short for 'Repository.' Also known as 'fork' (as a noun). ## The Easy Way -The easiest way to keep in sync with master is to trash your fork of `metasploit-framework`, and re-fork. This is a surprisingly common practice, since most people in the world don't work with Metasploit every day. If you're the sort to be struck by hackerish inspiration every few months, and couldn't give a whit about preserving branches, history, or pull requests, simply nuke your local fork. +The easiest way to keep in sync with master is to trash your fork of `metasploit-framework`, and re-fork. This is a surprisingly common practice, since most people in the world don't work with Metasploit every day. If you're the sort to be struck by hackerish inspiration every few months, and couldn't give a with about preserving branches, history, or pull requests, simply nuke your local fork. On your fork, in the GitHub UI, go to **Settings**, scroll down to the **Danger Zone**, and hit **Delete this repository**. Once you've re-authenticated, re-fork the `metasploit-framework` repository by going to the [Rapid7 repo](https://github.com/rapid7/metasploit-framework) and hit **Fork** as hard as you possibly can. diff --git a/docs/metasploit-framework.wiki/Metasploit-Guide-MySQL.md b/docs/metasploit-framework.wiki/Metasploit-Guide-MySQL.md index 8958e9e866..1da57afe50 100644 --- a/docs/metasploit-framework.wiki/Metasploit-Guide-MySQL.md +++ b/docs/metasploit-framework.wiki/Metasploit-Guide-MySQL.md @@ -49,7 +49,7 @@ use auxiliary/scanner/mysql/mysql_login run 'mysql://root: a b c p4$$w0rd@127.0.0.1' ``` -Re-using MySQL credentials in a subnet: +Reusing MySQL credentials in a subnet: ``` use auxiliary/scanner/mysql/mysql_login diff --git a/docs/metasploit-framework.wiki/Metasploit-Guide-PostgreSQL.md b/docs/metasploit-framework.wiki/Metasploit-Guide-PostgreSQL.md index 32b8e583e3..7342465972 100644 --- a/docs/metasploit-framework.wiki/Metasploit-Guide-PostgreSQL.md +++ b/docs/metasploit-framework.wiki/Metasploit-Guide-PostgreSQL.md @@ -51,7 +51,7 @@ use auxiliary/scanner/postgres/postgres_login run 'postgres://root: a b c p4$$w0rd@127.0.0.1' ``` -Re-using PostgreSQL credentials in a subnet: +Reusing PostgreSQL credentials in a subnet: ``` use auxiliary/scanner/postgres/postgres_login diff --git a/docs/metasploit-framework.wiki/Metasploit-Guide-SSH.md b/docs/metasploit-framework.wiki/Metasploit-Guide-SSH.md index 9e3d9cc930..cc225a8b7a 100644 --- a/docs/metasploit-framework.wiki/Metasploit-Guide-SSH.md +++ b/docs/metasploit-framework.wiki/Metasploit-Guide-SSH.md @@ -115,7 +115,7 @@ use scanner/ssh/ssh_login run ssh://user:pass@172.18.102.20 ``` -Re-using SSH credentials in a subnet: +Reusing SSH credentials in a subnet: ``` use scanner/ssh/ssh_login diff --git a/docs/metasploit-framework.wiki/Meterpreter-Wishlist.md b/docs/metasploit-framework.wiki/Meterpreter-Wishlist.md index 96058a3b64..2e13e2db7b 100644 --- a/docs/metasploit-framework.wiki/Meterpreter-Wishlist.md +++ b/docs/metasploit-framework.wiki/Meterpreter-Wishlist.md @@ -71,7 +71,7 @@ Related open tickets (slightly broader than Meterpreter): * Change desktop/phone background * Remote mouse control * Play sound on the remote system - * Read words outloud via text to speech on the remote system + * Read words out loud via text to speech on the remote system * Volume control * RSS feed from reverse_http(s) mult-handler that I can connect a RSS reader to (or something like IFTTT) and get notices when new sessions are created * MessageBox popups diff --git a/docs/metasploit-framework.wiki/Pivoting-in-Metasploit.md b/docs/metasploit-framework.wiki/Pivoting-in-Metasploit.md index af76c68177..e1580a9280 100644 --- a/docs/metasploit-framework.wiki/Pivoting-in-Metasploit.md +++ b/docs/metasploit-framework.wiki/Pivoting-in-Metasploit.md @@ -195,7 +195,7 @@ Payload options (cmd/windows/powershell_reverse_tcp): Name Current Setting Required Description ---- --------------- -------- ----------- LHOST 172.19.182.171 yes The listen address (an interface may be speci - fied) + field) LOAD_MODULES no A list of powershell modules separated by a c omma to download over the web LPORT 4444 yes The listen port diff --git a/scripts/meterpreter/hostsedit.rb b/scripts/meterpreter/hostsedit.rb index a2e3a92627..0867a7e2af 100644 --- a/scripts/meterpreter/hostsedit.rb +++ b/scripts/meterpreter/hostsedit.rb @@ -67,7 +67,7 @@ def backuphosts(session,hosts) random = sprintf("%.5d",rand(100000)) print_status("Making Backup of the hosts file.") session.sys.process.execute("cmd /c copy #{hosts} #{hosts}#{random}.back",nil, {'Hidden' => true}) - print_status("Backup loacated in #{hosts}#{random}.back") + print_status("Backup located in #{hosts}#{random}.back") end # Clear DNS Cached entries def cleardnscach(session)