Commit Graph

13785 Commits

Author SHA1 Message Date
bwatters-r7 5202a85cd8 Use nonvolitile register for the counter
Change option name to match convention
2019-07-25 19:42:26 -05:00
bwatters-r7 d626e5641d Updated to have a handler 2019-07-25 19:42:26 -05:00
bwatters-r7 9805a14875 Add support for pingback as a single and session... 2019-07-25 19:42:26 -05:00
bwatters-r7 cc69fa286f Let's try it as a single this time.... 2019-07-25 19:42:26 -05:00
bwatters-r7 4ca6c35053 Add new files 2019-07-25 19:42:26 -05:00
bwatters-r7 e798a0dcf0 Add pingback changes 2019-07-25 19:42:25 -05:00
bwatters-r7 f0f45d9882 Maybe stage the new files, too 2019-07-25 19:42:25 -05:00
Aaron Soto 67d3bf5e01 WIP: REST API for async-callbacks, added UUID search 2019-07-25 19:42:25 -05:00
Aaron Soto 353e8e6be9 WIP: Remove PUT and DELETE endpoints 2019-07-25 19:42:25 -05:00
Aaron Soto a1b51361b0 Bring pingback-payload changes into public framework 2019-07-25 19:42:25 -05:00
William Vu da188502e4 Update method name for indexing from a list
Module-specific code was moved back into modules.rb and core.rb.
2019-07-25 14:26:42 -05:00
William Vu a22ad9ad42 Templatize HttpRawHeaders with ERB 2019-07-24 21:23:22 -05:00
William Vu 40b040b3e6 Cache "show payloads" and set PAYLOAD by index 2019-07-24 20:15:12 -05:00
William Vu 29d6c270d4 Fix setting PAYLOAD clearing target DefaultOptions 2019-07-24 17:38:14 -05:00
William Vu 1ba0d1ee5b Once more, with feeling 2019-07-24 14:59:12 -05:00
William Vu 7730b510c1 Update HttpHeaders to HttpRawHeaders to match desc 2019-07-24 14:52:56 -05:00
William Vu 800737690a Add HttpHeaders file advanced option to HttpClient 2019-07-24 13:15:44 -05:00
Wei Chen 6dfcaedf02 Land #12116, cisco docs and bug fixes 2019-07-23 10:49:25 -05:00
h00die f19ddc11e8 cisco docs and bug fixes 2019-07-21 20:57:47 -04:00
Green-m 9203a0adf0 Fix typo in #11551 to solve aux rhosts issue. 2019-07-21 19:54:44 +08:00
h00die fd628583fe crack module peer review 2019-07-15 19:57:39 -04:00
William Vu 77c0dacba2 Restore unknown_command passthrough to the shell
This continues to prefer system over popen, but it restores the original
behavior of shelling out, allowing the use of shell metacharacters, etc.
2019-07-12 13:39:37 -05:00
William Vu a586fda620 Land #12031, Msf::Exploit::Remote::Tcp#shutdown 2019-07-12 12:26:25 -05:00
Jeffrey Martin 60ffc3a954 Land #12085, Fix is_payload_compatible? for nil payloads 2019-07-11 14:30:47 -05:00
William Vu 502a26bcbd Fix is_payload_compatible? for nil payloads 2019-07-11 14:00:24 -05:00
Brent Cook 18b8974761 Land #11969, deprecate db_rebuild_cache command 2019-07-11 11:02:17 -05:00
Adam Cammack b419ab018c Gracefully handle passthrough commands
The `system` method handles input and output as appropriate, allowing
programs that need user input to execute properly without racing
msfconsole over STDIN
2019-07-10 17:40:49 -05:00
h00die b7df6c1272 juniper cisco local config eaters 2019-07-07 21:49:48 -04:00
Matthew Kienow 4e11dcfee1 Fix import issue caused by missing wspace key
Modify import module to follow pattern used in other Msf::DBManager
import modules. Test module updated for method name changes.
2019-07-01 15:58:36 -04:00
bcoles 82b583b2b5 Use symbolic args 2019-06-30 12:31:29 +10:00
Brendan Coles b71fe69c16 Add shutdown method to Exploit::Remote::Tcp 2019-06-29 16:42:08 +00:00
Brent Cook 45734408a6 remove reload_search since refresh_cache_from_module_files seems to not work as expected at runtime 2019-06-29 03:51:56 -05:00
Brent Cook a186396836 unlink the user store if it exists 2019-06-29 03:45:53 -05:00
Brent Cook 4756a17dfa remove update of the base module store 2019-06-29 03:37:54 -05:00
Brent Cook 42c0a3b96a deprecate the db_rebuild_cache command, add reload_search
For a while, Metasploit has not used the old database-backed module cache in favor of the lightweight JSON data store. This also means that the db_rebuild_cache command has been broken.

While the base module cache usually stays up to date, if you delete a module as a developer, there's currently no great way to make the search function forget about that module unless you rebuild the cache manually (a procedure mostly documented inside of an automated build job).

This moves the logic from that build job into the a new reload_search command, and deprecates the old one.
2019-06-29 03:36:39 -05:00
Brent Cook 06f6b0294c Land #12023, repeat search by default 2019-06-29 03:16:03 -05:00
Shelby Pace 6ebe192674 check core.private before accessing jtr_format 2019-06-28 14:17:52 -05:00
William Vu b8165e825d Make help syntax consistent 2019-06-28 14:01:28 -05:00
William Vu b39ed5eb02 Add period 2019-06-28 13:59:52 -05:00
William Vu 3f187d4f0a Update help 2019-06-28 13:58:14 -05:00
William Vu 3c09aa47d7 Once more, with feeling 2019-06-28 13:54:14 -05:00
William Vu fd7f6b2d59 Refactor match/search_params placement 2019-06-28 13:44:24 -05:00
William Vu 353428d10c Prefer cached results when given no arguments 2019-06-28 13:24:40 -05:00
William Vu 4bf5e6c53f Land #12014, nil bug fix for HttpServer#get_uri 2019-06-28 12:32:19 -05:00
William Vu 744a1dca75 Add the ability to display previous search results 2019-06-27 21:27:20 -05:00
William Vu 9fe138e3dc Remove misleading comment from dcerpc_getarch
I transferred my implementation. I don't understand this comment.
2019-06-26 02:40:16 -05:00
William Vu 01b308fe7c Fix get_resource nil bug in HttpServer#get_uri 2019-06-25 23:10:50 -05:00
RageLtMan d1eaac9932 Implement native reverse SSH via openssh binary
Implement a reverse SSH shell using nothing but the on-target SSH
client and a fifo in the same manner as used by netcat payloads.
This is not forensically sound as the fifo will be caught by HIDS,
filesystem snapshots, and other defensive measures. However, it
does provide a way out from almost any modern POSIX system as they
nearly all have an SSH client in one form or another.

Convert existing Ruby reverse SSH payloads to use dynamic cached
payload sizing.
2019-06-23 05:48:50 -04:00
RageLtMan c339662fed SshCommandSession and Ruby Payloads
Implement a command-only session type over the HrrRbSsh client
Connection Channels' file descriptors, adjust from base command
session to deal with the separate reader/writer IOs. Technically,
a TTY session works out of the box here as well.

Implement a pair of showcase Ruby payloads using net/ssh to call
back to the handler, create a shell channel, and loop piping I/O
between framework session and client via the Ruby backtick exec.

Next Steps:
  Command payloads need to be written for every major interpreted
language as well as some sort of bashism a la openssl_double if
it comes to that, but preferably single socket implementation.

Testing:
  Very minimal, needs a good run through by the community and R7
2019-06-23 05:20:04 -04:00
RageLtMan f0b24339fe Implement Rex::Proto::Ssh::Server scaffold
Create the Rex::Proto::Ssh namespace and implement hrr_rb_ssh
objects in the Rex namespace with Rex' sockets stack, permissive
default connection options to accept any authentication, ACLs for
port forwarding, and a modified Connection #initialize method for
simplified instantiation.

The actual Rex::Proto::Ssh::Server object follow standard Rex
semantics for services to permit use in handlers, exploits, and
auxiliary modules in the same manner as the Http::Server is used
today.

This work is far from complete - the HrrRbSsh low-level objects
should be decomposed into Rex' pattern as they currently depend
heavily on their own Procs and Threads internally which use the
parent Connection object's attributes to look up which Proc should
be called in response to a Channel or Authentication request. This
is a bit difficult to do piecemeal given the intertwined data and
execution dependency inside of HrrRbSsh.

Next steps:
1. Create handler and reverse_ssh command session payloads
1a. POSIX systems generally have SSH already
1b. Windows Powershell is likely able to hotload SSH libs as a
pre-stager.
1c. Other interpreted runtimes usually have client-ssh libraries
2. Implement options parsing, handling, etc for user-customizable
functionality from the Msf namespace.
3. Use libssh2 to permit mettle use of the SSH transport.
3a. Bother @OJ about doing the same for Windows Meterpreter.
3b. Bother @zeroSteiner to implement SSH transport for PyMeterp.
3c. Ask @timwr and @mihi how viable this is for Android/Java.
3d. See if @OJ will do this for CLR-meterp on a livestream.
4. Write a post module which runs this SSH server from a mettle
session using the compromised hosts's own host keys and passwd
file for "valid" authentication while logging and MITMing the
entire command stream remotely - help folks shake off some of the
complacency around "secure shells."
5. Write a plugin which will permit sharing of the entire console
context, specific acquired sessions, or TCP forwards with the
pugin's SSH clients based on the credentials used to connect.
6. Further decompose the server code into Rex to permit writing
client fuzzers, loggers, and other tooling to test the posture of
SSH client implementations.
7. Work to implement SSH client functionality in HrrRbSsh and
convert the rest of Rex/Msf to use this library instead only.
8. Rewrite and import MetaSsh into Metasploit proper using the
new Rex::Proto::Ssh code.

-----

Huge thanks to @hirura for writing HrrRbSsh. I've spent countless
hours on and off working to implement server-side semantics in
net/ssh years ago and it was becoming a pretty full rewrite due
to the ordering of server/client req/resp messages and who sent
what to whom. This library is a much much cleaner implementation
and provides full, modern SSH servers in pure Ruby.
2019-06-22 20:06:15 -04:00