Commit Graph

8869 Commits (20e21db1d4496d574a4b4884c880267fa9813485)

Author SHA1 Message Date
bwatters-r7 7964868fcd
Revert "Land #9565, Reverse TCP x64 RC4 via max3raza's rc4_x64 asm"
This reverts commit fcc579377f, reversing
changes made to 95cd149378.
2018-03-02 08:29:48 -06:00
bwatters-r7 fcc579377f
Land #9565, Reverse TCP x64 RC4 via max3raza's rc4_x64 asm 2018-03-02 07:34:45 -06:00
Sonny Gonzalez 883654f0ea
Land #9653, fix Y2k38 issue (until Jan 1, 2038) 2018-03-01 09:13:41 -06:00
Brent Cook 4fec2e758d make fix more precise, based on https://github.com/rapid7/metasploit-framework/pull/2343 2018-03-01 08:59:55 -06:00
Brent Cook 27bd2a4a9f workaround Y2k38 issues in java certificate generation 2018-03-01 08:41:28 -06:00
christopher lee 0949e0a501 Don't munch exception 2018-02-28 11:28:07 -06:00
christopher lee cea61e7aa4 Fix bug with remove_from_cache 2018-02-28 11:21:34 -06:00
christopher lee 1686b82a40 Adhere to style guide by using unless 2018-02-28 11:11:26 -06:00
christopher lee 8b4c7b886f Updated to use delete_if 2018-02-28 11:00:40 -06:00
christopher lee 964be3b5f0 Fix problem with stale module cache 2018-02-28 08:41:14 -06:00
William Vu 0e4fc48df4
Fix #9602, a little defensive programming
Check for a nil message and unnecessary auth failures while looping.
2018-02-26 16:52:25 -06:00
Jacob Robles 738d6ab33a
Land #9604, Fix logged errors when running without Python 3.6 / gmpy2 2018-02-22 08:11:30 -06:00
Brent Cook 3f88e59516 handle Python 3.5/3.6 differences so we always have a UTF-8 string 2018-02-21 21:54:27 -06:00
William Vu 3880f6a65e Finally fix "Unknown admin user ''" after 2yrs
The failed password auth was necessary after all. I misread the PoC. :'(

Apparently the password auth sets the username, while the backdoored
keyboard-interactive auth sets the password.
2018-02-21 20:44:35 -06:00
Brent Cook b9c1a64d20
Land #9505, Support local knowledge base documents 2018-02-19 21:39:55 -06:00
Brent Cook 93689f0f0e
Land #9270, Implement plugin API for hooking database events 2018-02-19 21:36:26 -06:00
Brent Cook 3d67d2ed12
Land #9443, Add warning to FileDropper for deleting CWD 2018-02-19 21:22:39 -06:00
UserExistsError b3f26ea55f bind_named_pipe fixes 2018-02-18 10:31:57 -07:00
RageLtMan 80779f73ef Implement Michael Schierl's suggestions 2018-02-16 23:03:05 -05:00
RageLtMan 354eb4092a Reverse TCP x64 RC4 via max3raza's rc4_x64 asm
To round out the work done by mihi for x86 stages back in the day,
this PR provides x64 Windows stage encryption in RC4 via assembly
written/modified by max3raza during adjacent work on DNS tunneled
transport.

Stage encryption differs from encoding in that there is no decoder
stub or key materiel carried with the stage which can be used by
defensive systems to decode and identify the contents. Persistence
payloads, oob-delivered stage0, and other contexts benefit heavily
from this as their subsequent stage is difficult to detect/identify,
and the chance of accidental execution of the wrong payload/stage
is drastically reduced if separate keys are in play for individual
targets - acquiring the wrong stage will result in decryption
failure and prevent further execution.

For historical context, all of the RC4 stagers implement in-place
decryption via stage0 for the contents of stage1 using the provided
passphrase converted to a key and embedded in stage0 as part of the
payload.

Testing:
  In-house testing with Max - we got sessions, loaded extensions.

Notes:
  All credit for the work goes to Max3raza - big ups for getting
this knocked out.
2018-02-16 05:15:05 -05:00
Brent Cook 6734e532f5
Land #9562, avoid an error with aux module command dispatcher 2018-02-15 17:46:58 -06:00
Brent Cook a197997aca avoid chinese finger trap logic, put it all on one side 2018-02-15 17:45:09 -06:00
Brent Cook 38b03fdfff Merge branch 'upstream-master' into land-9539- 2018-02-15 16:22:13 -06:00
Brent Cook 2d3aef9031
Land #9533, Add output file support to the vulns command 2018-02-15 15:52:25 -06:00
Brent Cook 93450b87dd use common retry options for UDP 2018-02-15 14:36:21 -06:00
Wei Chen 6fe8691528 Fix #9090, honoring retry counts for x86/64 payloads
Fix #9090
2018-02-15 13:52:34 -06:00
RageLtMan 177e1321ae Aux command dispatcher in exploit ctx with action
The Auxiliary command dispatcher checks modules for passive actions
expecting them to have included Msf::Module::HasActions mixin. The
mixin is included in post and aux modules already, but not in
exploits. When the aux dispatcher handles an exploit module, it
may get upset along the lines of:
```
[-] Error while running command exploit: undefined method 'passive'
for #<Msf::Modules::M...3::MetasploitModule:0x0000000d83de0428>
Did you mean?  passive?

Call stack:
/opt/metasploit4/msf4/lib/msf/ui/console/command_dispatcher/
auxiliary.rb:106:in `cmd_run'
```

Avoid this mess by having the conditional which checks the methods
included by that mixin depend on the module having included the
mixin in the first place.

Testing:
  In local fork (hence the lineno) it seems to fix the problem.
  The problem condition and fix should be independently tested
upstream.
2018-02-15 04:20:09 -05:00
Jeffrey Martin 3811665b69
Land #7699, Add UDP handlers and payloads (redux) 2018-02-13 14:50:09 -06:00
Jeffrey Martin f5768e7ced
gate session reported when using bind udp
While this method here is somewhat noisy on the network it eliminates
a poor user experience when the handler is started but the payload is
not yet running on the target.

When a target is sent a udp packet and it is not rejected push down
an initial "echo syn" command that will respond with output.  This
allows framework to be aware that the payload is what is running on
the server port instead of assuming a non-existent target is a valid
session.
2018-02-13 14:44:57 -06:00
UserExistsError 8ae8a0d94b added bind_named_pipe payload 2018-02-11 18:56:50 -07:00
Wei Chen b9faa9e92b Fix a typo 2018-02-09 20:28:55 -06:00
Wei Chen 81e0d56261 Always write the file as long as the option is set 2018-02-09 20:28:12 -06:00
Wei Chen 958513bd86 Fix #9522, Add output file support to the vulns command
This adds a new feature for the vulns command for msfconsole. It
allows the user to be able to save the vulnerability as a CSV
file.

Fix #9522
2018-02-09 19:45:46 -06:00
Spencer McIntyre c612dbfdbf Also fix GitHub related pull request links 2018-02-09 15:16:10 -05:00
Spencer McIntyre b2d617bde7 Fix a bug in the markdown docs references 2018-02-09 13:41:39 -05:00
Jacob Robles c642d420c2
Land #9489, Add scanner for the Bleichenbacker oracle (AKA: ROBOT) 2018-02-08 12:55:02 -06:00
Spencer McIntyre b88eff7e97 Switch the docs search order 2018-02-07 16:43:15 -05:00
Spencer McIntyre 2a79319dad Support local knowledge base documents 2018-02-05 11:13:05 -05:00
Brent Cook 0a3fe0c608 fix html escaping for UTF-8 module metadata 2018-02-02 16:35:50 -06:00
Adam Cammack 02e81d166d
Add Enum-type options for external modules 2018-02-02 14:40:04 -06:00
Adam Cammack ab36b5dd5d
Add support for single-IP external scanners 2018-02-02 14:01:16 -06:00
William Vu c9473f8cbc
Land #9473, new MS17-010 aux and exploit modules 2018-02-01 23:56:29 -06:00
zerosum0x0 afef1948bf catch exception for patched Vista 2018-02-01 21:39:25 -07:00
zerosum0x0 469209a2b3 prefer x64 dynamite 2018-01-31 17:19:09 -07:00
zerosum0x0 6d7b48382e fix print arch key 2018-01-31 17:17:53 -07:00
zerosum0x0 ec26f01360 fix x64 typo 2018-01-31 17:12:07 -07:00
William Vu da23432745 Update cleanup method to check CWD 2018-01-31 16:19:43 -06:00
William Vu e60aeca2db Pass in session to CWD check
Oops, used to this being accessible universally. Not the case here.
2018-01-31 16:19:43 -06:00
William Vu 199a7cc134 Check for subdirectories and relative paths 2018-01-31 16:19:43 -06:00
William Vu 09d931e392 Split assignment across two lines for clarity
https://github.com/bbatsov/ruby-style-guide#use-if-case-returns
2018-01-31 16:19:43 -06:00