Commit Graph

143 Commits

Author SHA1 Message Date
William Vu 6c74820843 Land #10773, session.platform TypeError fix
This also adds an "unknown" platform class.
2018-10-08 14:38:31 -05:00
William Vu ccfdfb6a5c Clean up new "unknown" platform and current use 2018-10-08 14:31:31 -05:00
h00die edea3c45cd dont append nothing 2018-10-08 13:23:54 -04:00
h00die e937f5fee1 to_s platform 2018-10-08 11:39:31 -04:00
Wei Chen c7efd57144 Sync up with master 2018-10-06 08:27:01 -05:00
Wei Chen f5190525fc support for multiple module types 2018-10-04 13:20:47 -05:00
Wei Chen 18d6cc0ee0 Add support for info command 2018-10-03 15:19:08 -05:00
Wei Chen 02ef565730 Update evasion_module_type branch 2018-09-24 08:20:32 -05:00
Brent Cook 86f5b25d8f Land #10563, Add 'Notes' metadata section 2018-09-17 11:18:08 -05:00
Erin Bleiweiss 184d1d5954 Leave notes type as a plain hash 2018-09-14 11:17:37 -05:00
Matthew Kienow 6a6d92abc1 Check DB is active before querying sessions 2018-09-13 15:06:53 -04:00
OJ 8d6fcefccc Fix crash when using sessions -x 2018-09-11 13:28:33 +10:00
Erin Bleiweiss 1eb703b1b5 Refactor initialization of module's notes attribute 2018-09-06 16:15:52 -05:00
Erin Bleiweiss 420041f287 Don't refer to AKA as 'alias' in order to not overlap nomenclature with upcoming 'alias' feature 2018-08-31 16:54:07 -05:00
Erin Bleiweiss e5106b54db Add AKA info to module info 2018-08-31 16:52:26 -05:00
Wei Chen 5c6b33bcf4 Add support for evasion targets, also module doc 2018-08-31 11:45:29 -05:00
Wei Chen ea41127c6e Support info command 2018-08-29 16:24:23 -05:00
Green-m 1dd91434f4 Fix #10518, bug fix when add persistent to non-payload job. 2018-08-24 03:39:18 -04:00
Jeffrey Martin d6bce4410c Land #10203, Add command for persistent job handler when msf restart 2018-08-16 15:37:10 -05:00
Green-m 1475f205d4 Update for style requirements. 2018-08-15 22:24:20 -04:00
Green-m bdb663b078 Make persist list go all in on the JSON format. 2018-08-14 06:33:44 -04:00
Green-m 91a9a24879 Update the dump_jobs for persistent job info. 2018-08-07 05:36:57 -04:00
William Vu 98d6d4cbcd Add check for check to info command 2018-07-18 16:33:30 -05:00
William Vu 38daeb1b9f Fix #10283, SOUNDTRACK and LOGO refs
Some dupe code came in from master. Fixing and refactoring.
2018-07-17 19:36:35 -05:00
William Vu 07203dccc6 Clean up some things 2018-07-17 19:11:26 -05:00
Brendan Coles bf53896aa7 Rex::Compat.getenv 2018-07-14 06:24:04 +10:00
Brendan Coles 104e4cee2e Merge branch 'master' into soundtrack_logo_module_refs 2018-07-13 03:01:33 +10:00
William Vu 147f59836a Fuel the hype machine 2018-07-12 11:34:09 -05:00
Wei Chen 95e54f497b Be explicit when there is no CVE assigned to a vulnerability 2018-07-09 18:42:36 -05:00
Matthew Kienow 5322a682f6 Fix exception in verbose mode sessions listing 2018-05-05 00:50:07 -04:00
Matthew Kienow cd38f56924 Add sessions cmd option to list inactive sessions 2018-05-05 00:42:22 -04:00
Brent Cook 446f3fa675 more conversions 2017-11-29 11:49:41 -06:00
Brent Cook 59446f3d96 change ui to use new settings 2017-11-29 11:49:41 -06:00
William Vu f556a5f805 Add compatible session types to post module info 2017-10-12 11:41:02 -05:00
bwatters-r7 e0fee9e317 Land #8821, Expose session naming 2017-09-29 15:32:47 -05:00
OJ 558d007d8e Final tweak to avoid issues in session dump 2017-09-07 01:36:22 -05:00
OJ f004e6f0f2 Fix session output for pivoted sessions 2017-09-07 01:36:22 -05:00
William Vu 6eae3b3d4e Add session name output to ReadableText 2017-08-16 18:14:56 -05:00
OJ 228fb8c436 Fix small issue with encryptionf flag rendering 2017-07-03 17:31:09 +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
OJ 3c767552e9 Make session list show the encryption status
Both extended and verbose session logging will show which of the
sessions has the encryption enabled as it's not yet supported on all
sessions.
2017-06-26 16:41:58 +10: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
William Vu 84513fd83c Add exception for HttpClient
Since it uses Rex::Proto::Http, which then uses Rex::Socket::Tcp.
2017-01-20 20:00:27 -06:00
William Vu 89b2f087fc Add TCP/UDP hint to RPORT
Caveat: works with mixins only (tenuously).
2017-01-20 19:50:40 -06:00
OJ 505cc19662 Update reverse_tcp to show TCP listener information
Also update the readable text to only output the listener information if
it differs from the payload information.
2016-12-12 15:56:26 +10:00
OJ 9e3960f334 Update session listing to show type or platform 2016-10-29 12:46:11 +10:00
David Maloney eb73a6914d replace old rex::ui::text::table refs
everywhere we called the class we have now rewritten it
to use the new namespace

MS-1875
2016-08-10 13:30:09 -05:00
Pearce Barry 0660880332 Ensure 'show options' reflects correct values.
Small fix here to ensure that, even when boolean 'option' variables have a default value of 'true', that their current value is correctly reflected via the 'show options' command.  This change should play fine with all other option variable types, I believe.

Current behavior:

```
msf > use auxiliary/gather/darkcomet_filedownloader
msf auxiliary(darkcomet_filedownloader) > show options

Module options (auxiliary/gather/darkcomet_filedownloader):

   Name          Current Setting  Required  Description
   ----          ---------------  --------  -----------
   BRUTETIMEOUT  1                no        Timeout (in seconds) for bruteforce attempts
   KEY                            no        DarkComet RC4 key (include DC prefix with key eg. #KCMDDC51#-890password)
   LHOST         0.0.0.0          yes       This is our IP (as it appears to the DarkComet C2 server)
   NEWVERSION    true             no        Set to true if DarkComet version >= 5.1, set to false if version < 5.1
   RHOST         0.0.0.0          yes       The target address
   RPORT         1604             yes       The target port
   STORE_LOOT    true             no        Store file in loot (will simply output file to console if set to false).
   TARGETFILE                     no        Target file to download (assumes password is set)

msf auxiliary(darkcomet_filedownloader) > set STORE_LOOT false
STORE_LOOT => false
msf auxiliary(darkcomet_filedownloader) > get STORE_LOOT
STORE_LOOT => false
msf auxiliary(darkcomet_filedownloader) > set NEW_VERSION false
NEW_VERSION => false
msf auxiliary(darkcomet_filedownloader) > get NEW_VERSION
NEW_VERSION => false
msf auxiliary(darkcomet_filedownloader) > show options

Module options (auxiliary/gather/darkcomet_filedownloader):

   Name          Current Setting  Required  Description
   ----          ---------------  --------  -----------
   BRUTETIMEOUT  1                no        Timeout (in seconds) for bruteforce attempts
   KEY                            no        DarkComet RC4 key (include DC prefix with key eg. #KCMDDC51#-890password)
   LHOST         0.0.0.0          yes       This is our IP (as it appears to the DarkComet C2 server)
   NEWVERSION    true             no        Set to true if DarkComet version >= 5.1, set to false if version < 5.1
   RHOST         0.0.0.0          yes       The target address
   RPORT         1604             yes       The target port
   STORE_LOOT    true             no        Store file in loot (will simply output file to console if set to false).
   TARGETFILE                     no        Target file to download (assumes password is set)
```

New behavior with this change:

```
msf > use auxiliary/gather/darkcomet_filedownloader
msf auxiliary(darkcomet_filedownloader) > show options

Module options (auxiliary/gather/darkcomet_filedownloader):

   Name          Current Setting  Required  Description
   ----          ---------------  --------  -----------
   BRUTETIMEOUT  1                no        Timeout (in seconds) for bruteforce attempts
   KEY                            no        DarkComet RC4 key (include DC prefix with key eg. #KCMDDC51#-890password)
   LHOST         0.0.0.0          yes       This is our IP (as it appears to the DarkComet C2 server)
   NEWVERSION    true             no        Set to true if DarkComet version >= 5.1, set to false if version < 5.1
   RHOST         0.0.0.0          yes       The target address
   RPORT         1604             yes       The target port
   STORE_LOOT    true             no        Store file in loot (will simply output file to console if set to false).
   TARGETFILE                     no        Target file to download (assumes password is set)

msf auxiliary(darkcomet_filedownloader) > set STORE_LOOT false
STORE_LOOT => false
msf auxiliary(darkcomet_filedownloader) > get STORE_LOOT
STORE_LOOT => false
msf auxiliary(darkcomet_filedownloader) > set NEWVERSION false
NEWVERSION => false
msf auxiliary(darkcomet_filedownloader) > get NEWVERSION
NEWVERSION => false
msf auxiliary(darkcomet_filedownloader) > show options

Module options (auxiliary/gather/darkcomet_filedownloader):

   Name          Current Setting  Required  Description
   ----          ---------------  --------  -----------
   BRUTETIMEOUT  1                no        Timeout (in seconds) for bruteforce attempts
   KEY                            no        DarkComet RC4 key (include DC prefix with key eg. #KCMDDC51#-890password)
   LHOST         0.0.0.0          yes       This is our IP (as it appears to the DarkComet C2 server)
   NEWVERSION    false            no        Set to true if DarkComet version >= 5.1, set to false if version < 5.1
   RHOST         0.0.0.0          yes       The target address
   RPORT         1604             yes       The target port
   STORE_LOOT    false            no        Store file in loot (will simply output file to console if set to false).
   TARGETFILE                     no        Target file to download (assumes password is set)
```
2016-06-28 13:12:34 -05:00
James Lee f7382f5b3b Make jobs display a full uri
Addresses the problem of LURI taking the place of URIPATH, which has
different semantics.

See #4623
2016-05-27 11:15:12 -05:00
join-us c1a64b1f6f fix: issues/6803 - info command references bug 2016-04-22 15:14:35 +08:00