Commit Graph

4671 Commits

Author SHA1 Message Date
Brent Cook 5b579baa33 remove unused Linux migration code 2017-09-19 03:04:43 -05:00
Brent Cook 0e15b2d002 remove unneeded METERPRETER_TRANSPORT constants 2017-09-19 02:59:05 -05:00
RageLtMan 271bd4c4fe Rename METERPRETER_TRANSPORT_SSL to ..._TCP
Since OpenSSL is no longer packages with meterpreter, and transport
secrecy is handled at L7, the SSL cons name doesn't apply anymore.
Rename METERPRETER_TRANSPORT_SSL to METERPRETER_TRANSPORT_TCP for
consistency with wire-level implementation.
2017-09-17 14:31:15 -04:00
Craig Smith b218cc3c7f Merge branch 'master' into hw_auto_padding_fix 2017-09-11 18:30:34 -07:00
Craig Smith ad9329993d Added better padding and flowcontrol support. 2017-09-11 18:20:57 -07:00
RageLtMan 8d60fdf9e7 Bug - HTTP Client can call :shutdown on closed IO
When running Rex HTTP client calls across pivots, pivot sockets
can get closed by the remote server, resulting in a closed :conn
object within the client object. The clients :close method calls
self.conn.shutdown which raises an 'IOError closed stream' on what
is effectively a TCPSocket object in a closed state (under the Rex
abstraction).

Resolve by moving the self.conn.closed? check into the conditional
just above the :shutdown call, and remove if from the underlying
:close call as calling :close on an already closed TCPSocket
returns nil as opposed to throwing an exception like the :shutdown
method.
2017-09-10 03:09:59 -04:00
Brent Cook c365db135a pull in GUID fixes from #8818 2017-09-07 01:39:49 -05:00
OJ b38a962c09 Fix default session GUID when not specified
This resolves an issue with stategless HTTP sessions
2017-09-07 01:36:25 -05:00
OJ 5294722b96 Prevent socket-like behaviours during migrate on pivoted sessions 2017-09-07 01:36:24 -05:00
OJ bfdea35aca A few UI touch ups 2017-09-07 01:36:23 -05:00
OJ 75270af9e7 Tweaking of the pivot list output 2017-09-07 01:36:23 -05:00
OJ 8b8e5e4cb5 First iteration of the pivot menu for meterpreter 2017-09-07 01:36:23 -05:00
OJ d525b015f0 Enable keepalive for pivoted sessions 2017-09-07 01:36:22 -05:00
OJ 7acd772c10 Pivot session stability, display and handling 2017-09-07 01:36:21 -05:00
OJ fdc9864b61 First working packet pivot session! 2017-09-07 01:36:20 -05:00
OJ e3de01219a Pushed on with more pivot code 2017-09-07 01:33:54 -05:00
OJ abc80655b7 Progress in named pipe pivots, more to come 2017-09-07 01:33:54 -05:00
OJ 816e78b6f6 First pass of named pipe code for pivots 2017-09-07 01:33:53 -05:00
Brent Cook f7071818b1 more updates 2017-08-28 14:10:51 -05:00
Brent Cook a0e04760b5 rewrite timestomp command dispatcher to deal with file args properly 2017-08-28 08:25:42 -05:00
Brent Cook 429824b5c9 guid is hex values 2017-08-21 03:44:02 -05:00
Brent Cook 8700a36858 make session_guid default with the correct length 2017-08-21 03:24:37 -05:00
Brent Cook 5e8c2200ac Merge branch 'master' into land-8625-crypttlv2 2017-08-20 18:54:51 -05:00
h00die dc358dd087 unknow to unknown 2017-08-18 11:33:48 -04:00
OJ fa292dce96 Fix issue with truncated values when unpacking packets 2017-08-16 11:01:54 +10:00
Brent Cook 0ab6dd46d3 Land #8762, add initial Rex FTP protocol implementation 2017-08-14 01:59:53 -04:00
OJ d7e8b32312 Merge branch 'upstream/master' into transport-agnostic-packet-encryption 2017-08-08 17:30:51 +10:00
Pearce Barry cfd377fbd4 Support padding on the CAN bus.
Also use a hash for passing options around instead of individual params.
2017-08-06 18:05:59 -05:00
Brent Cook 24d323d4ed remove more instances of positive? 2017-08-02 12:47:34 -05:00
Tabish Imran f1b07b5c6d Add send_cmd_data function from /lib/metasploit/framework/ftp/client.rb to class 2017-08-02 01:14:08 +05:30
Tabish Imran 0b001fdea6 Modify to reduce rubocop offenses 2017-07-25 17:46:05 +05:30
Tabish Imran da8cb48639 Add FTP protocol client implementation 2017-07-25 00:56:34 +05:30
Tabish Imran ab37ccb173 Add FTP protocol support 2017-07-25 00:56:19 +05:30
Brent Cook cdfb6782a8 Land #8639, Add mic audio streaming to Linux/OSX native meterpreter 2017-07-24 07:01:00 -07:00
Brent Cook 6300758c46 use https for metaploit.com links 2017-07-24 06:26:21 -07:00
Pearce Barry 6a686a277b Land #8742, HWBRIDGE RFTRANSCEIVER ADD LOWBALL SUPPORT 2017-07-21 11:46:21 -05:00
Pearce Barry 3043218a7f Indention and missing comma fixup. 2017-07-21 11:43:49 -05:00
Corey Harding 22e8f1cb48 HWBRIDGE RFTRANSCEIVER ADD LOWBALL SUPPORT 2017-07-20 05:09:00 -04:00
Brent Cook f5e76092d6 Merge branch 'master' into land-8439- 2017-07-18 08:25:18 -05:00
James Lee 5c17f363be Default opts to an empty hash instead of nil
Fixes #8709
2017-07-13 15:40:08 -05:00
bwatters-r7 99bb091488 Land #8690, Fix #8636, [] for NilClass in session.fs.file.download_file 2017-07-12 13:43:12 -05:00
William Webb aa0fca9dd1 Land #8631, Add railgun support to Python Meterpreter for the OSX
platform
2017-07-11 16:05:16 -05:00
wchen-r7 d5d9e88851 Fix #8636, [] for NilClass in session.fs.file.download_file
This fixes a [] for NilClass bug in the download_file API.
The opts argument is not checked for nil before the code looks for
the block_size key.

Fix #8636
2017-07-07 19:00:33 -05:00
Pearce Barry baead02efc Addressing PR feedback.
Removing the audio_stream_pool.rb class file for now, we can recreate for MS-2749 if we really need one.
2017-07-04 09:28:38 -05:00
Pearce Barry ef1145c6b7 Use common code to delete non-applicable cmds. 2017-07-03 09:11:04 -05:00
OJ 4f054d25fc Fix packet spec problems 2017-07-03 18:12:38 +10:00
OJ 999d90687e Make encryption flags 32 bit
This changes the encryption flags on the meterpreter session so that
it's 32 bits (and hence changes the packet header). This also supports
the idea that sessions may use encryption that isn't AES256, so the
flags field will ultimately indicate that. A type flag has been added so
that MSF knows the type that should be done on the wire.

At some point soon we'll add something that makes sure that the packet
encryption type always matches the encryption type expected in MSF, this
will hopefully avoid the risk of having packets injected into the stream
by external entities.
2017-07-03 16:52:58 +10:00
Pearce Barry e21ae88b55 Update wave file header with actual length.
Fixes MS-2759.
2017-06-30 22:48:42 -05:00
James Lee ada954aab9 Land #8624, fix mis-ordered kiwi output 2017-06-30 14:23:24 -05:00
Pearce Barry d2098137a9 Grab last bit of audio from target when done.
Also remove module that needs work (we can create later).
2017-06-30 10:56:49 -05:00