Commit Graph

18584 Commits

Author SHA1 Message Date
alanfoster ec2ae16135 Order loadpath summary output 2022-02-12 21:47:35 +00:00
Brendan Coles c30dcf57d0 prepend_nops: Return unmodified shellcode if no compatible nops for arch 2022-01-28 16:15:29 +00:00
Metasploit 50c1f7b775
Bump version of framework to 6.1.28 2022-01-27 12:05:14 -06:00
Grant Willcox 397e3aa1c6
Land #16090 - Add in user_data_directory function 2022-01-26 09:31:52 -06:00
Grant Willcox 780c8d3b7f
Land #16096, Support session -1 for ListenerComm options 2022-01-24 22:07:23 -06:00
Spencer McIntyre 12431d8479 Add a client reader for SSH server channels 2022-01-24 14:41:59 -05:00
Spencer McIntyre dd2d512851 Support session -1 for ListenerComm options 2022-01-24 11:42:39 -05:00
Spencer McIntyre 3cd2b1b929 Update naming for consistency and the module 2022-01-24 10:35:40 -06:00
Ashley Donaldson d088be6fa0 Metasploit-side logic to support a 5th getsystem mechanism 2022-01-24 10:35:40 -06:00
h00die b72bdf0b76
Land #16054, updates to JTR compatibility with logging 2022-01-23 14:41:54 -05:00
audibleblink e445a39719 adds user_data_directory 2022-01-23 10:29:01 -05:00
Metasploit eccac8df4f
Bump version of framework to 6.1.27 2022-01-20 12:07:12 -06:00
bwatters 4cf3ae352c
Land #16050, Log4Shell: vCenter RCE
Merge branch 'land-16050' into upstream-master
2022-01-19 16:30:33 -06:00
Grant Willcox a7bb8d0480
Land #16029, Fix OptPath options with empty strings 2022-01-19 13:08:34 -06:00
h00die d01594a570 spec not working quite right 2022-01-17 17:40:35 -05:00
h00die 7a7b009161 add more smarts to nolog for jtr 2022-01-17 15:33:41 -05:00
Metasploit ad9517b81d
Bump version of framework to 6.1.26 2022-01-14 09:32:56 -06:00
namaenonaimumei 85aab39dbd
Fix syntax error for --nolog 2022-01-14 07:14:47 +09:00
space-r7 383ada6ae2
Land #16016, fix RHOSTS in dcerpc scanner 2022-01-13 13:15:24 -06:00
Spencer McIntyre 7b1398f0ae Allow overriding check module datastore options 2022-01-13 11:51:39 -05:00
Spencer McIntyre 62a814fa59 Refactor Log4shell exploit code into reusable bits 2022-01-13 09:45:02 -05:00
Spencer McIntyre e093154865 Refactor the BeanFactory gadget code 2022-01-12 16:58:31 -05:00
Spencer McIntyre e873907d13 Initial vCenter exploit via Log4Shell 2022-01-12 15:34:45 -05:00
space-r7 199eae5e99
Land #16012, add pi-hole aux module and lib 2022-01-12 09:21:11 -06:00
Spencer McIntyre 877bab6f2a
Land #15969, Log4j2 HTTP Header Injection Exploit 2022-01-11 16:52:08 -05:00
Christophe De La Fuente e8208c60b9
Land #16027, Fix the generate command's tab completion for -o and -f 2022-01-11 18:03:37 +01:00
Metasploit 9c1316d3a4
Bump version of framework to 6.1.25 2022-01-10 09:35:41 -06:00
Spencer McIntyre f56f328c8d Use an enum for the YSoSerial payload option 2022-01-07 17:30:39 -05:00
sjanusz 21beb58ffb
Add command to kill all Meterpreter channels 2022-01-07 12:12:14 +00:00
Christophe De La Fuente 59de13be43
Do not call File.expand_path() with empty strings 2022-01-07 13:09:47 +01:00
bwatters f17d460a7a
Remove now unused deregister_tcp_options method 2022-01-06 15:48:24 -06:00
Spencer McIntyre 41b2bc4fac Fix the generate command's tab completion 2022-01-06 15:15:49 -05:00
Metasploit 0234b89c9c
Bump version of framework to 6.1.24 2022-01-06 12:05:06 -06:00
space-r7 27ad15d040
Land #16015, fix tab completion for RHOSTS 2022-01-06 10:44:33 -06:00
Spencer McIntyre 4b37076bd4 Unify completion for OptAddressRange and OptRhosts 2022-01-05 14:11:43 -05:00
Spencer McIntyre 1e0d9af9d8 Fix tab completion for RHOSTS 2022-01-05 13:43:34 -05:00
Spencer McIntyre d0417f60bd
Land #15924, Updates to Windows Secrets Dump 2022-01-05 13:25:59 -05:00
Christophe De La Fuente f3f6f93e23
Fix sanity check failing on specific Ubuntu versions 2022-01-05 18:26:19 +01:00
Spencer McIntyre cc2616b7cf
Land #15982, Normalize smbuser to a string 2022-01-04 15:42:01 -05:00
Christophe De La Fuente ae2e4d723b Add NTDS technique 2022-01-03 21:39:33 +01:00
h00die 990e4a1e7a pihole new module and lib 2022-01-02 11:48:41 -05:00
h00die c3e0f455ec some cleanup for rubocop 2021-12-30 15:35:22 -05:00
Metasploit ca3c80102a
Bump version of framework to 6.1.23 2021-12-30 12:11:12 -06:00
RageLtMan 4874943e7f Implement infrastructure for payload delivery
Per the discussion with @schierlm on GitHub (mihi), the most direct
way to deliver and instantiate our Java payload in the target is
via remote code loading of the JAR using HTTP. This requires a
bootstrap class, a Factory, which instantiates our Payload.class
by calling its main() function on-load from the HTTP endpoint
serving the remote-code-loaded JAR.

Implement a basic PayloadFactory class and include and its sources
in the Metasploit tree.

Using @schierlm's own code from ~10y ago, implement injection of
the PayloadFactory class into our JAR-encoded payloads. Then,
using more of his code from the same module (2011-3544), implement
a secondary service within the exploit module (Rex::ServiceManager
services don't stack well in Msf namespace as they all get assigned
to self.service - faux pas on our end) to serve HTTP requests with
the injected JAR. Finally, generate an appropriate URL target for
the remote code loaded JAR for injection into the LDAP response and
leveraging a final piece of @schierlm's hackery, generate a valid
URI path (updating the datastore is ill advised @ runtime, but its
needed here for the correct service cleanup routines to fire).

Note: during development, i figured out a way to use Rjb for native
Java object serialization to buffers which we can use in Ruby, so i
stashed that away in the Exploit::Java mixin for posterity and left
a reference to it in the module for future endeavors.

Testing:
  Verified that the generated jar is served at the generated URL
  Verified that the generated JAR can be executed at the CLI for
both metasploit.Payload and metasploit.PayloadFactory
  Currently not triggering the remote code load (per wireshark and
our own HTTP service) when delivering the LDAP response, so tuning
that is the next leg of this effort.
2021-12-29 09:10:07 -05:00
Spencer McIntyre d08714d474
Land #15961, Initial Rex LDAP Server 2021-12-28 14:50:03 -05:00
Tim W b1922c305b Revert "Land #15941, fix command output in rpc console.write"
This reverts commit 8d808d11c0, reversing
changes made to c1f06eace8.
2021-12-24 07:32:29 +00:00
bwatters 6ed8e317f7
Land #15984, fix snmp library to run correct version
Merge branch 'land-15984' into upstream-master
2021-12-23 13:12:49 -06:00
Metasploit 8757971193
Bump version of framework to 6.1.22 2021-12-23 12:10:50 -06:00
RageLtMan 25e2fbd640 Do not redefine constant 2021-12-21 22:36:51 -05:00
Tim W 8d808d11c0
Land #15941, fix command output in rpc console.write 2021-12-21 06:07:29 +00:00