Commit Graph

20644 Commits

Author SHA1 Message Date
adfoster-r7 bef0c9be8f Land #16299, Make TLV Logging cache threadsafe 2022-04-01 16:19:45 +01:00
dwelch-r7 647463b5ad Use updated payloads gem and refactor debug option 2022-04-01 11:20:22 +01:00
dwelch-r7 8e773c1939 Rename debug option and make it advanced 2022-04-01 11:14:52 +01:00
dwelch-r7 13ca7c88f3 Add debug option for windows meterpreter 2022-04-01 11:14:52 +01:00
Metasploit 39aa17fd61 Bump version of framework to 6.1.37 2022-03-31 12:06:46 -05:00
Brendan Coles 283dda8172 Land #16386, Exploit::Remote::SocketServer: Wait if service is running 2022-03-28 03:41:06 +00:00
adfoster-r7 c4b6eb0165 Fix java rmi service undefined method wait 2022-03-27 17:01:43 +01:00
Heyder Andrade 79783bbe9b Checking if datastore is defined 2022-03-25 16:32:58 +01:00
Metasploit a59aa864c3 Bump version of framework to 6.1.36 2022-03-24 18:44:06 -05:00
adfoster-r7 76ede9ef8f Add ruby 3.1 support 2022-03-24 21:59:02 +00:00
Heyder Andrade ee8618e68a Handling undefined local variable
Auxiliary failed: NameError undefined local variable or method `datastore'
for #<Metasploit::Framework::LoginScanner::SSH
2022-03-24 22:57:27 +01:00
Spencer McIntyre cec44f0cab Land #16371, Fix websocket crash 2022-03-24 13:07:34 -04:00
Grant Willcox bf88b7f618 Land #16325 - Replace IO read on binary files with File binread 2022-03-24 10:08:40 -05:00
sjanusz 558d8bb727 Make TLV Logging cache threadsafe 2022-03-23 10:35:39 +00:00
Tim W 014c98acd8 Land #16369, fix upgrading meterpreter sessions with shell_to_meterpreter 2022-03-23 07:15:55 +00:00
alanfoster cebdebb188 Fix kubernetes websocket crash when identifying peer host 2022-03-23 02:28:47 +00:00
adfoster-r7 03d645016c Land #16250, Update service mixins for NAT options 2022-03-23 00:13:20 +00:00
Grant Willcox 964f78fc69 Land #16341, Implement VNC hash types 2022-03-22 17:00:02 -05:00
Grant Willcox 1408ffbab7 Fix up typo and wording on some comments 2022-03-22 16:29:08 -05:00
Grant Willcox 02c616a29e Land #16207, Fix VNC scanner modules and libraries to make them work in 2022 2022-03-22 13:40:29 -05:00
Grant Willcox c0b0c418d2 Update constants explanation to explain VeNCrypt 19 option a little clearer 2022-03-22 13:06:45 -05:00
sjanusz b54cfee665 Open a new Meterpreter session when trying to upgrade Meterpreter 2022-03-22 14:08:25 +00:00
Spencer McIntyre fd2d1c0784 Add and use the ListenerComm option for SOCKS 2022-03-22 09:23:09 -04:00
Spencer McIntyre ff0ecfa49e Display the HTTP port when necessary 2022-03-21 20:11:31 -04:00
Grant Willcox 4e8613904a Address comments from review and make explanations tidier 2022-03-21 17:54:41 -05:00
Jeffrey Martin 122d380f85 Land #16368, Conditionally recalculate in ModuleSet 2022-03-21 17:50:03 -05:00
Spencer McIntyre df04435d49 Only recalculate sometimes
Recalculations are time consuming, so only do it if necessary.
2022-03-21 17:00:31 -04:00
Grant Willcox 024da204d1 Land #16353, respect ssl_version in crawler 2022-03-21 12:24:38 -05:00
Heyder Andrade 25c4869d8a Make module to ssh_defaults
Factory is provided by mixin;
Removed the options that were the same as the defaults;
Adjusted the exception to proper feedback the user. There was a return
as incorrect when it was indeed unable to negotiate the key exchange.
2022-03-21 18:06:32 +01:00
Spencer McIntyre aca272dd76 Always return a comm from #_determine_server_comm
Instead of returning nil from Rex::Socket::SwitchBoard.best_comm, return
the local comm which Rex::Socket will defer to anyways.
2022-03-21 11:47:56 -04:00
Spencer McIntyre 551f159993 Don't pass nill to #best_comm
It'll crash if you do
2022-03-21 11:47:56 -04:00
Spencer McIntyre 0ab97b858f Update the TCP server and HTTP server mixins 2022-03-21 11:47:56 -04:00
Spencer McIntyre 2e4f04a804 Add and use the new bindhost/bindport options 2022-03-21 11:47:55 -04:00
sjanusz bbf9e3163a Fix file reads on Windows for binary files 2022-03-21 12:47:39 +00:00
Tim W a4956bfe7c Land #16358, fix apk injection on some apks by finding the correct hook point 2022-03-21 07:36:00 +00:00
Brendan Coles d9bd985cef Msf::Payload::Apk: find_hook_point: Return full packagename.classname 2022-03-19 21:08:02 +00:00
Tim W bdb729a43b Land #16340, fall back to running apktool with --use-aapt2 if apktool fails 2022-03-19 11:47:56 +00:00
Jeffrey Martin ebaf584a00 use 'Auto' for ssl_version 2022-03-18 17:06:02 -05:00
Spencer McIntyre ccdc2db9e7 Land #16309, Catch an exception in ssh_login
The ssh_login module would crash when the channel used to execute the
commands to gather the platform information reported that they failed.
2022-03-17 16:41:47 -04:00
Spencer McIntyre da1e4853b8 Land #16317, Free UDP ports after use 2022-03-17 16:39:09 -04:00
bwatters 54ad2b82c3 Land #16249, Add in Exchange Mixin - Initial Version with Version Detection
Merge branch 'land-16249' into upstream-master
2022-03-17 15:04:17 -05:00
Metasploit 374220f72f Bump version of framework to 6.1.35 2022-03-17 12:05:14 -05:00
Grant Willcox ce062973cb Make changes from review process, redo code for module to make it make less requests, and generally improve overal operations. 2022-03-17 11:29:05 -05:00
Grant Willcox c1d6dced8d Update library code to read exchange versions from exchange_versions.json and populate exchange_versions.json with initial info 2022-03-17 11:29:01 -05:00
Grant Willcox 419c9ea554 Fix review comments to simplify regex, and also add in new is_exchange? function to check if a target is running Exchange Server or not. 2022-03-17 11:29:00 -05:00
Grant Willcox 1f53e9d1c4 Rubocop and fix a mistake on commenting too much of the code out from testing 2022-03-17 11:29:00 -05:00
Grant Willcox 269cd5cfed Add in Exchange Version mixin and module example 2022-03-17 11:28:53 -05:00
Hynek Petrak 43cec440ac Treat failed proof as successful connection with nil proof.
Co-authored-by: Spencer McIntyre <58950994+smcintyre-r7@users.noreply.github.com>
2022-03-17 14:05:17 +01:00
Hynek Petrak 2841f70048 Catch exception from net/ssh/connection/session.rb:381 2022-03-16 23:11:21 +01:00
Ashley Donaldson 7fe9d0b2b6 Don't start the DNS server twice 2022-03-17 08:02:31 +11:00