1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-05 14:57:30 +01:00
Commit Graph

13119 Commits

Author SHA1 Message Date
William Webb
bf85386acf
add help switch 2017-06-24 17:45:53 -05:00
William Webb
9eeb3dc143
use typical command option and TLV scheme instead of dumb stuff for keyscan_start 2017-06-23 13:11:12 -05:00
Brent Cook
2617ae7609
Land #8513, check extapi commands for dependencies 2017-06-22 20:21:26 -05:00
Brent Cook
fda2e8c73d
Land #8523, Add support for session GUIDs 2017-06-22 20:10:10 -05:00
Metasploit
fad696ed58
Bump version of framework to 4.15.0 2017-06-22 18:02:38 -07:00
David Maloney
c307cfab50
Land #8592, rpc module info
enhance module details returned by the RPC
2017-06-22 14:18:39 -05:00
David Maloney
3a445655ae
Land #8511, console search options
lands sempervictus' console search command
enahncements and bug fixes
2017-06-22 12:07:10 -05:00
Brent Cook
0eaffde4b3 fix rex arguments parser to handle adjacent flags, update accordingly 2017-06-22 09:54:03 -05:00
William Webb
47a659f554
Land #8185, Convert ntp modules to bindata 2017-06-22 09:37:58 -05:00
Brent Cook
eb4c4c911b
Land #8587, Add android wakelock command to turn the screen on 2017-06-21 14:48:20 -05:00
Brent Cook
f96f61d29e enhance module info to be on par with pro RPC interface 2017-06-21 08:36:49 -05:00
James Lee
700dfee963
Land #8584, remove meterpreter TLVs for dead code 2017-06-19 15:56:15 -05:00
Pearce Barry
c0efb7bc76
Land #8573, Adapted the authentitcity_token scheme 2017-06-19 15:45:20 -05:00
OJ
a48f0fcec6
Remove references to Meterpreter CRYPTO TLVs
This feature wasn't supported, and so the TLVs are no longer needed.
2017-06-19 16:53:33 +10:00
RageLtMan
42d1fae2e6 Upstream console search additions and fixes
The -S flag for console commands, backed by search functionality
in Rex' tables, originally pushed upstream in #1604 (iirc), lacks
coverage for a number of commands which benefit a good deal from
inline filtering of the potentially large number of results.

Push more -S flags and surrounding table functionality upstream
to provide coverage for the console commands included in framework.

Include a fix for deleting hosts when DB references are a problem.

Include a fix for the upstream route command wherein scope must be
defined for the routing target by assuming a /32 without explicit
definition.

Note:
  With this in place, console behavior when filtering results is
roughly analagous to the R7 filtering in web UI, which should help
those of us trying to use both maintain corresponding workflows.

Testing:
  Used in-house for years, though changes to the diff from upstream
and our fork (expunging some internal code) are untested, so would
appreciate eyes and hands on.
2017-06-16 20:28:51 -04:00
Metasploit
9ce0bb9345
Bump version of framework to 4.14.28 2017-06-16 10:02:07 -07:00
SecureAB
ef7434b59b added new authentitcity_token scheme 2017-06-16 16:54:38 +02:00
Brent Cook
55b71e115f
Land #8535, MSGRPC module minor fixes 2017-06-15 21:44:34 -05:00
OJ
2c0f41ee8f
Fix session guid handling in python 3
I made the mistake of using str.decode() which isn't a thing in python3
(works fine in 2). So this commit fixes it so that the GUID string
itself is generated directly as a byte string, so that the call to
decode() isn't needed at all.
2017-06-16 09:01:29 +10:00
Metasploit
0515980138
Bump version of framework to 4.14.27 2017-06-12 07:39:14 -07:00
Brent Cook
bf674263f3
Land #8533, record vulnerability attempts 2017-06-09 17:52:49 -05:00
TheNaterz
40fafaa270 dereference the service from the service manager 2017-06-09 16:24:01 -06:00
Jeffrey Martin
2b6f823a1b
store vuln attempt when reported 2017-06-09 12:46:39 -05:00
Metasploit
77b1125e77
Bump version of framework to 4.14.26 2017-06-09 10:03:35 -07:00
David Maloney
c89fee89db
Land #8529, RPC Session Arch
Lands pr adding Session arch to info
returned by rpc
2017-06-09 11:58:19 -05:00
OJ
c4288fb35a
Update branch to include chances from upstream/master 2017-06-09 17:18:57 +10:00
TheNaterz
c3b2476a51 add arch to rpc session details 2017-06-08 16:26:13 -06:00
William Vu
4198efa41f
Remove pry from CommandDispatcher::Creds...
My bad. Should have been caught in #8517.
2017-06-08 00:18:46 -05:00
OJ
eef82a501d
Add support for session GUIDs in mettle 2017-06-08 11:20:48 +10:00
William Vu
3e27fd3db4
Land #8517, CommandDispatcher::Common
Also fixes jobs -i.
2017-06-07 03:20:45 -05:00
William Vu
596924552e Fix literal \n in jobs -i
Regression from #4063.
2017-06-07 03:19:30 -05:00
Spencer McIntyre
a052ee4064
Use the opts hash not the datastore 2017-06-06 20:02:06 -04:00
OJ
6131e4bd82
Fix download lambda function to take correct param count
This is an emergency fix as a result of something being broken in
master. This is also being pushed straight to master because github is
down and the PR process isn't possible. This commit was reviewed by
@wvu-r7 prior to being pushed.
2017-06-07 09:37:24 +10:00
Spencer McIntyre
834e0eba95
Land #8340, add exception handling for rev_tcp_ssl 2017-06-06 19:09:15 -04:00
Spencer McIntyre
a953d94f61 Minor white space cleanups for PR #8340 2017-06-06 19:07:55 -04:00
Brent Cook
3ded57e1cd
Land #8516, add verbose debug to ntds dumper 2017-06-06 07:26:54 -05:00
Brent Cook
0830e4aaa5
Land #8503, Linux x86 reverse_tcp error handling 2017-06-06 06:36:55 -05:00
OJ
37b9cd07a2
Add support for the session GUID in the UI
The Session GUID will identify active sessions, and is the beginning of
work that will allow for tracking of sessions that have come back alive
after failing or switching transports.
2017-06-06 17:15:57 +10:00
Tim
871c30c0b3 refactor stdapi and lanattacks to use filter_commands 2017-06-06 14:05:07 +08:00
Tim
e9c9c852ab check_commands -> filter_commands 2017-06-06 13:56:38 +08:00
bwatters-r7
f0f21891ad
Land #8512, Enable adaptive download with variable block sizes 2017-06-05 18:46:24 -05:00
David Maloney
42aa2e5acf
add some attempts at debugging to ntds
add some logging and more status outputs to the
NTDS domain hasdump. Also force the encoding on
strings to UTF8
2017-06-05 15:21:50 -05:00
darkbushido
f4013b02e1
renaming db_common to common
this moves the following methods into common
  arg_host_range ( used in creds and db )
  arg_port_range ( used in creds and db )
  set_rhosts_from_addrs ( used in creds and db )
  show_options ( used in jobs and modules )
2017-06-05 14:19:18 -05:00
Tim
7625d36c1c fix #8199, check extapi for dependencies 2017-06-05 14:56:59 +08:00
Brent Cook
8c35e54934
Land #8495, Expand multi-handler for generic http(s) sessions 2017-06-04 20:21:32 -05:00
itsmeroy2012
39cee481c1 Making changes similar to the reverse_tcp payload 2017-06-03 22:57:59 +05:30
tkmru
82a83af6c2 add error handling to x86 linux reverse tcp 2017-06-03 04:04:55 +09:00
Metasploit
92a65f5c63
Bump version of framework to 4.14.25 2017-06-02 10:03:44 -07:00
OJ
cc0ff8f3db
Enable adaptive download with variable block sizes
The aim of this commit is to allow users of Meterpreter in high-latency
environments have better control over the behaviour of the download
function. This code contains two new options that manage the block size
of the downloads and the ability to set "adaptive" which means that the
block size will adjust on the fly of things continue to fail.
2017-06-02 17:16:58 +10:00
William Vu
abeececb46
Land #8493, creds -R fix with DbCommon 2017-06-01 14:19:16 -05:00