Commit Graph

20644 Commits

Author SHA1 Message Date
William Vu ccf6ec9628 RuboCop selectively 2021-07-06 21:14:48 -05:00
William Vu e5fee3b0b8 Improve AutoCheck prints 2021-07-06 21:14:48 -05:00
Grant Willcox 0eb2b71244 Land #15320, Enables powershell sessions to use the read_file method 2021-07-06 13:37:29 -05:00
Grant Willcox b4fed72328 Add in a small additional fix to properly check session.platform until a full fix can be implemented 2021-07-06 13:37:01 -05:00
Grant Willcox 104ddd9b26 Bump version of Metasm while we are at it so this fixes both the current issue and also imports the related changes made in Metasm 2021-07-06 09:29:15 -05:00
Grant Willcox c3406514ab Apply fixes to prevent EXEs from being used as template files if they don't have any exports 2021-07-06 09:27:09 -05:00
miralayipouya 252325f1e3 Update payload.rb 2021-07-04 15:00:07 +04:30
Spencer McIntyre 040636d4f4 Land #15366, Add limit to size of history files
Fixes #15360
2021-07-02 17:28:25 -04:00
Gaurav Purswani 25d4a71ef8 Add rescue for load error in case pry gem is not present
Co-authored-by: Jeffrey Martin <jeffrey_martin@rapid7.com>
2021-07-02 08:11:27 +05:30
Gaurav Purswani ff7625ed7d Update lib/rex/ui/text/shell.rb
Co-authored-by: Jeffrey Martin <jeffrey_martin@rapid7.com>
2021-07-02 08:10:55 +05:30
Metasploit 19574414a4 Bump version of framework to 6.0.52 2021-07-01 12:05:27 -05:00
Jeffrey Martin 9e447d33a5 ensure final history write 2021-07-01 09:19:45 -05:00
Jeffrey Martin 35189dbc9a reverse commands when pulled from queue 2021-07-01 08:17:42 -05:00
Gaurav Purswani 5115651f11 Update history_manager.rb 2021-07-01 16:58:00 +05:30
Christophe De La Fuente daa5b32393 Update from review
- Remove `MeterpreterTryToFork` option logic
- Add `Prepend` code directly under `Payload` info
- Rebase to use the updated `PrependFork`
- Add logic to verify that shells specified in the options really exist
  on the remote host
2021-06-30 18:13:35 +02:00
Spencer McIntyre f66a64d2fb Update the ssh_login_pubkey module 2021-06-30 09:51:52 -04:00
Spencer McIntyre 46a877678d Refactor some channel related Meterpreter code
This makes some of the channel related Meterpreter code accessible to
other locations in the framework which enables other sessions to also
support pivoting capabilities.
2021-06-30 09:25:25 -04:00
Spencer McIntyre 7bddaeb74f Add documentation for the new session 2021-06-30 09:00:13 -04:00
Christophe De La Fuente eca20bec92 Update from code review
- Fix documentation typos
- Rename `MeterpreterBackground` Mettle option to `MeterpreterTryToFork`
2021-06-30 11:02:11 +02:00
Christophe De La Fuente ccaedd6c9a Last additions and improvements
- add binaries
- add documentation
- backup `runc` binary in the exploit C file
- add `MeterpreterBackground` options to set Mettle `background` option
- add `WsfDelay` logic
- refactor code
- add cleanup logic
- add restore `runc` binary logic
2021-06-30 11:02:11 +02:00
Christophe De La Fuente 1b59b8c83e Rebase and fix conflicts in lib/msf/core/post/common.rb 2021-06-30 11:02:11 +02:00
Spencer McIntyre 208ab470e7 Switch from stderr to proper logging 2021-06-29 18:29:14 -04:00
bwatters 2effd46bc6 Updated with changes requested by adfoster 2021-06-29 14:51:40 -05:00
Spencer McIntyre 51f8808bed Fix the representation of IPv6 addresses 2021-06-29 14:21:36 -04:00
Spencer McIntyre 4c925ce686 Add the channel's #read method 2021-06-29 13:40:21 -04:00
Spencer McIntyre a6b5c89b1d Cleanup channels when the session is closed 2021-06-29 09:55:35 -04:00
Jeffrey Martin e85a31c36a write new instead of append
Co-authored-by: Gaurav Purswani <43883877+pingport80@users.noreply.github.com>
2021-06-29 08:17:47 -05:00
Spencer McIntyre 2c2ae2581a Make the session a channel container 2021-06-28 17:43:57 -04:00
Spencer McIntyre 1aef1658b0 Handle ssh channel failures and timeouts 2021-06-28 16:47:14 -04:00
Jeffrey Martin 8e716b56a9 adjust history context to thread file write
By moving writes to a thread and allowing short circuit when
a context is reloaded quickly this code can shorten the conditions
that would cause slow context transitions.  This also restricts
history length to a defined constant applied to each context.
2021-06-28 15:01:10 -05:00
Gaurav Purswani c7749fa2c3 Update lib/rex/ui/text/shell.rb
Co-authored-by: Spencer McIntyre <58950994+smcintyre-r7@users.noreply.github.com>
2021-06-28 19:35:19 +05:30
Hynek Petrak 50a24bf198 handle raw-sha256, ignore *LK*, *NP* 2021-06-28 10:41:45 +02:00
Spencer McIntyre 233d353403 Fix how the address of forwarded connections
The rstream is the command shell stream which is not the same as the
underlying network transport. In order for the session's connection
information to be reported properly (as represented by the output of
`sessions`) the SSH connection socket needs to be set as #sock.
2021-06-25 21:59:27 -04:00
Spencer McIntyre a6afac608b Squash some unnecessary code 2021-06-25 21:19:05 -04:00
Spencer McIntyre f01e4a4408 More work on SSH pivoting 2021-06-25 21:19:05 -04:00
Spencer McIntyre 10ad84434c Initial support for pivoting over SSH 2021-06-25 21:19:05 -04:00
pingport80 b404c90830 disable pry history by default when used as break points 2021-06-25 20:35:52 +05:30
pingport80 1215ea2946 add rescue for interrupt 2021-06-25 16:21:22 +05:30
Metasploit 95e5830bc8 Bump version of framework to 6.0.51 2021-06-24 12:04:41 -05:00
pingport80 1b816596bf update size to 2000 2021-06-23 23:49:13 +05:30
pingport80 8187a58549 add limit to size of history_files 2021-06-23 23:04:49 +05:30
bwatters a876500c5b Update comments and refactor substring range to Ruby 2.5 standards for RSPEC 2021-06-23 09:19:43 -05:00
Shelby Pace c3d4bb42bd Land #15358, use valid python binary in sshexec 2021-06-22 16:15:36 -05:00
bwatters 71db2fd698 Burn all silent rescue alls to the ground 2021-06-22 10:56:46 -05:00
bwatters e24dc806da Fixed append and file write for windows 2021-06-22 09:34:54 -05:00
adfoster-r7 fe41a6b518 Land #15350, fix shellcode_inject module 2021-06-21 09:03:26 +01:00
Spencer McIntyre b85031ff6a Fallback to Python3 in sshexec when it's available 2021-06-18 13:35:23 -04:00
dwelch-r7 a68a62dce5 Land #15352, Ensure msfdb init can be used for starting the database 2021-06-18 13:07:10 +01:00
Alan Foster ae7a978889 Ensure msfdb reinit can be used for starting the database 2021-06-18 09:13:48 +01:00
deadjakk dadc59ebbe Added changes requested by @smcintyre-r7
- Updated default port number to match documentation
- Updated the str append to '<<'
- Fixed issue with the login scanner returning false positives
- Removed rank from login scanner
- Removed Custom Executable target in favor of EXE::CUSTOM
- Moved the X3Crypt code out of the exception block
- Added additional checks to the exploit module, the same that were made in login_scanner
- Changed the check function to produce the proper return 'CheckCode' values
2021-06-17 12:39:17 -05:00