Commit Graph

7956 Commits

Author SHA1 Message Date
Clément Notin 911d3c41cd RHOSTS: accept both "file://<path>" and "file:<path>" syntax 2019-09-11 18:45:59 +02:00
Brent Cook 73eab2c34a Land #12286, RDP lib: lower SSL security level for compatibility with older implementations 2019-09-09 23:11:15 -05:00
h00die d25d8e77b8 12291 sempervictus words 2019-09-07 23:54:19 -04:00
Clément Notin 579ea56f3b RDP_TLS_SECURITY_LEVEL default value is 0 (less secure) 2019-09-07 18:39:59 +02:00
Clément Notin 49a991891c Add RDP_TLS_SECURITY_LEVEL advanced option 2019-09-07 17:19:59 +02:00
Brent Cook a985da9318 expand scope of errors caught to include all StandardErrors 2019-09-07 07:38:37 -04:00
Brent Cook 1d91e7f53c make payload generation failures at boot time non-fatal
Currently, if any payload fails to generate that has a dynamic size, it causes a Framework instance to throw an exception on start. This can happen for a number of reasons, and more often than not it is enviromental (files missing, Y2k38 bugs, etc.). Instead of failing entirely, catch the exception and log as an error, don't register the payload, but continue booting.
2019-09-07 07:21:40 -04:00
Clément Notin d4e2ac696a RDP lib: lower SSL security level for compatibility with stock Win7 2019-09-07 01:17:22 +02:00
bwatters-r7 e2815a997b Land #12251, Unify SSL cert generate interfaces
Merge branch 'land-12251' into upstream-master
2019-09-05 16:45:31 -05:00
Adam Cammack 2ee5ec97e4 Use smallest stager size
Since these stagers can shrink based on the expected size of the next
stage, do our best to anticipate a small size. This makes the cached
payload size consistent for now, though if the x64 mettle stager grows
past 128 bytes I think we'll see the stager start oscillating in size
again. If you run into that and are reading this, sorry :(
2019-09-04 16:06:44 -05:00
Adam Cammack bb0f1b02ac Fully golf the x86 read size 2019-09-04 14:54:48 -05:00
RageLtMan 04e750024c Clean up linux/x86/rev_tcp asm per acammack
Push read_size to edx as suggested by Adam, optimize shellcode a
bit by selecting using dx instead of edx for sizes under 64K.

Testing:
  Internal only, creates session on every try instead of every 5th.
2019-09-04 01:51:54 -04:00
RageLtMan 80522a5712 Clean up linux/x64/rev_tcp asm per acammack
Address Adam's comments on the PR - remove redundantly pushed
size from mmap section.
2019-09-03 15:01:52 -04:00
Tim W ac9b4c137c add compile.rb 2019-09-03 18:46:13 +08:00
Tim W bade8bfc48 add live compiling 2019-09-03 17:31:04 +08:00
RageLtMan 97943261ed Linux x86 reverse_tcp should read known # of bytes
See notes for x64.

This part does not appear to be working properly yet - stages
generated with this commit recv 102b on the first call to read(),
but subsequently things seem to go off the rails after the
intermediate stage is loaded.

Needs testing and fixup at present for x86 (no worse than before
in terms of success rate however).
2019-09-03 01:55:12 -04:00
RageLtMan 05944ba8c1 Linux x64 reverse_tcp should read known # of bytes
The linux x64 reverse tcp stager is hardcoded to read 4K off the
socket. When a small intermediate stager is used, this can result
in reading part of the next stage as well, which means that the
intermediate stager will never recv the # of bytes it needs and
hang indefinitely.

Break out the mettle piece to use separate methods for assembly and
binary payload generation as well as actually putting the product
on the existing session socket.

Change the first part of the stage to check for the intermediate
stager generation method, and use the size of the produced stager
in the recvfrom call or fall back to the prior 4K read size.

Testing:
  None yet

Ping @bcook-r7, @acammack-r7, @OJ, @ZeroSteiner
2019-09-03 01:27:27 -04:00
Adam Cammack b98327472a Correct realname calls in the cache to fullname 2019-08-30 15:38:45 -05:00
Adam Cammack 991639c493 Unify SSL cert generate interfaces
After this and rex-socket#19 the interfaces should be compatible again.
2019-08-30 00:01:55 -05:00
Adam Cammack bcccfd86b8 Teach module cache about realname
Also uses the class refname where appropriate since an instances refname
reflects the alias currently in use and if a module is reloaded while
using an alias the old behavior would generate spurious cache entries
that would not be cleaned up or modified. Specifically, this could
register a self-referential alias that would cause a stack overflow when
trying to `use` such an alias.

Additionally, some other `fullname`s were changed to `realname`s for
clarity.
2019-08-26 13:26:48 -05:00
Tim W 64695f1354 initial commit 2019-08-24 13:42:22 +08:00
Adam Cammack 6a8f6d7a57 Unify spec and lib 2019-08-22 18:03:13 -05:00
Adam Cammack 948918dacb Use alias when reloading aliased module
Also speeds up module reloads by avoiding module instance creating
without a type.

Fixes #12026
2019-08-22 17:58:20 -05:00
Adam Cammack d8e8a33b46 Rewrite Msf::Module::Deprecated w/ alerts, aliases
Less janky, and allows module moves without copying!
2019-08-22 17:58:20 -05:00
Adam Cammack 969ad7aa8a Add Msf::Module::Alert for alerting users 2019-08-22 17:58:20 -05:00
OJ 071626ed34 Land #12186 - Add RDP Fingerprinting 2019-08-22 08:44:08 +10:00
Brent Cook 262cd89859 Land #12168, fix HTTP client redirects with SSL enabled 2019-08-20 04:03:37 -05:00
Brent Cook bd90241192 set opts['SSL'] above for consistency 2019-08-20 04:03:10 -05:00
Brent Cook d1b482366b Land #12181, add Juniper config parser tests 2019-08-20 03:48:16 -05:00
Clément Notin 40b74211c9 RDP lib: accept TLS 1.0 2019-08-19 19:48:25 +02:00
bwatters-r7 1701dae701 Add needs_cleanup to the post module class so filedropper does not
crash everything trying to set that variable.
2019-08-15 07:27:28 -05:00
Spencer McIntyre 63dfa2a8bd Fix the RDP NLA protocol detection 2019-08-11 19:23:29 -07:00
Spencer McIntyre 84669f567b Add the RDP fingerprinting method to rdp_scanner 2019-08-11 16:20:14 -07:00
Spencer McIntyre e8057b0b55 Add an initial fingerprinting method for rdp 2019-08-11 01:24:55 -07:00
h00die a2160c84c6 juniper config parser tests 2019-08-10 09:39:26 -04:00
Tom Sellers 2d5e9cb241 RDP: address feedback from wvu 2019-08-07 14:47:33 -05:00
Tom Sellers f78c6469b8 RDP: rubocop cleanup lib 2019-08-07 10:28:24 -05:00
Tom Sellers de8cd38eb2 RDP: rubocop cleanup packets 2019-08-07 10:00:18 -05:00
Tom Sellers b6956bd3be RDP: moar migration 2019-08-07 08:50:01 -05:00
Tom Sellers 0c1868b158 RDP: migrate security nego to lib 2019-08-07 08:27:15 -05:00
Tom Sellers 7dc87bf8bc RDP: Refactor protocol code 2019-08-07 07:25:42 -05:00
James Lee 3b7abfcaf2 Use correct case for SSL option 2019-08-06 15:25:34 -05:00
Jeffrey Martin 2e06b4e93f Land #12126, Implement "set PAYLOAD" by index 2019-07-31 14:50:20 -05:00
bwatters-r7 36ae16df74 Accidentally removed include that is sort of imperative.... 2019-07-31 08:46:01 -05:00
bwatters-r7 fb7f30e60d Land #12129, Add Pingback Payloads
Merge branch 'land-12129' into upstream-master
2019-07-30 12:06:57 -05:00
bwatters-r7 79e17d0dda Remove unsupported options 2019-07-29 21:38:20 -05:00
bwatters-r7 05ffa6e4a0 More updates, optimizations, and style fixes 2019-07-29 16:29:32 -05:00
bwatters-r7 6bf10e1f91 Fixups for syntax 2019-07-29 11:55:51 -05:00
ines 4856e0f87d remove call for to_ascii on share_type 2019-07-28 10:19:58 +02:00
Adam Cammack bd6a0c872f Remove workspace reqs from remote db payloads
The requirements had already been removed from local payloads in
865f214a85
2019-07-26 17:55:57 -05:00