wchen-r7
7aeb9e555b
Change ranking and support CAMPAIGN_ID
2015-06-29 12:13:46 -05:00
jvazquez-r7
02cd2a9cd9
Fix #3951 Update Windows::Registry to use cmd_exec
2015-06-29 12:07:37 -05:00
jvazquez-r7
834c0e594a
Update multi modules
2015-06-29 11:36:28 -05:00
wchen-r7
7742d85f2f
I guess that's fine
2015-06-27 20:58:19 -05:00
wchen-r7
6136269ace
No can't do this
2015-06-27 13:53:29 -05:00
wchen-r7
5c039ccfd7
Even faster
2015-06-27 13:51:21 -05:00
wchen-r7
9bd920b169
Merge branch 'upstream-master' into bapv2
2015-06-27 12:19:55 -05:00
wchen-r7
88e58cbdc5
Better performance
2015-06-27 12:19:07 -05:00
OJ
007da4af41
Force :init_connect for stageless
2015-06-27 18:21:15 +10:00
Spencer McIntyre
79185e91c6
Refactor the pymet to use transport objects
2015-06-26 14:56:31 -04:00
wchen-r7
b46e1be22f
Land #5371 , Add file checking to the on_new_session cleanup
2015-06-26 13:33:57 -05:00
wchen-r7
0c608e2a4c
Change doc for boolean args
2015-06-26 12:01:53 -05:00
wchen-r7
1d9caeffc0
Update documentation for fuzzer.rb and file_info.rb
...
See #5599
2015-06-26 11:22:30 -05:00
OJ
f6ae1f4223
Merge branch 'upstream/master' into android-java-transport-refactor
2015-06-26 14:12:56 +10:00
OJ
a773979992
Java config wiring, tweak to include block counts
...
This commit adjusts the way that the config block is set for java and
android because behind the scenes the stageless connect-backs need to
know what to discard. as a result of connecting back to staged listeners
we need to be able to discard a number of bytes/blocks before we can
continue process (at least in the case of TCP).
2015-06-26 13:59:09 +10:00
Tod Beardsley
15f9fc5d8f
Land #5599 , YARD for fuzzer.rb
2015-06-25 14:37:55 -05:00
Mo Sadek
31c35715fc
YARD Documentation for file_info.rb
2015-06-25 11:08:35 -05:00
OJ
98156ec944
Add user agent to the transport config
...
Why this was missing I will never know :)
2015-06-25 14:51:06 +10:00
OJ
d9b6e46685
Merge branch 'upstream/master' into android-java-transport-refactor
2015-06-25 09:50:42 +10:00
Mo Sadek
e0c52730a0
YARD Documentation for Fuzzer.rb
2015-06-24 13:38:11 -05:00
OJ
a8c20496be
Remove unused code from the java http stager
2015-06-24 22:37:40 +10:00
joev
c305348a3b
Fix the mixin to work in the exploit again.
2015-06-24 02:19:09 -05:00
joev
8b6fba4988
Tweak and fix some things in Safari file URL module.
2015-06-24 02:08:06 -05:00
OJ
e796e56c6c
Modify the staging process
2015-06-24 13:22:33 +10:00
Tod Beardsley
18a9585f7a
Add safari module for CVE-2015-1155
2015-06-23 16:15:50 -05:00
Trevor Rosen
4e3a2b2b35
Upstream merge
2015-06-23 14:11:28 -05:00
Brent Cook
e696d2f3dc
Merge branch 'master' into land-5348-ntds
2015-06-22 17:18:13 -05:00
Trevor Rosen
d53067b0b7
Fix ctype handling for body-less pages
...
#5515
2015-06-22 14:17:29 -05:00
wchen-r7
ef57afbfcf
Explain about performance problems
2015-06-19 13:35:14 -05:00
wchen-r7
9da99a8265
Merge branch 'upstream-master' into bapv2
2015-06-19 11:36:27 -05:00
g0tmi1k
ce9481d2b7
Inconstancy - If datastore['VERBOSE'] vs vprint
2015-06-18 09:27:01 +01:00
wchen-r7
e549580ad2
Linux doesn't like the uppercase
2015-06-18 00:40:47 -05:00
wchen-r7
5fa864b097
done with rspec
2015-06-17 16:23:39 -05:00
g0tmi1k
3410782fe9
Capitalized 'Accepted'
2015-06-16 19:42:32 +01:00
William Vu
8d640a0c8f
Land #5527 , multi/handler -> exploit/multi/handler
2015-06-15 10:23:26 -05:00
HD Moore
ab6f3a7373
Fix #5531 , the ```stage_payload``` method does not take arguments.
2015-06-13 18:26:56 -05:00
g0tmi1k
6dcc9b7dab
More inconsistencies
2015-06-12 21:59:15 +01:00
wchen-r7
6eb25743e3
Merge branch 'upstream-master' into bapv2
2015-06-09 10:10:00 -05:00
wchen-r7
07d1282afb
Correct file naming for better Ruby coding style
2015-06-08 12:17:49 -05:00
David Maloney
2a474c8375
Merge branch 'master' into feature/MSP-12358/ntds-dump-module
2015-06-08 11:42:03 -05:00
HD Moore
1f11cd5470
Lands #5446 , support for 64-bit native powershell payloads
2015-06-07 14:16:19 -05:00
benpturner
20b605e7cb
Remove duplicate exec
2015-06-07 18:11:11 +01:00
RageLtMan
a46510465d
Fix older Windows payloads to not require UUID
...
Default Windows payload to not include_send_uuid for compatibility.
2015-06-07 02:58:31 -04:00
wchen-r7
4b6dcbb9d9
remove junk method
2015-06-05 22:03:56 -05:00
wchen-r7
7ca15f1ae1
Update select_payload doc
2015-06-05 21:06:20 -05:00
wchen-r7
4e058c942e
Fix typo
2015-06-05 21:04:22 -05:00
wchen-r7
a7fa434e89
If exploit list is empty, have the option to return content
2015-06-05 21:03:24 -05:00
wchen-r7
fb8abe54fc
This will continue loading the rest of the exploits
2015-06-05 17:52:40 -05:00
wchen-r7
188b15b17f
Fix the symbol vs string prob
2015-06-05 16:18:56 -05:00
wchen-r7
e1c30e973d
Fix SRVHOST
2015-06-05 12:14:43 -05:00
wchen-r7
f8c5e5a70a
Don't show "Server stopped"
2015-06-05 11:16:43 -05:00
wchen-r7
ecdeeea5c6
Make sure super is called
2015-06-05 11:11:40 -05:00
wchen-r7
be60f964c6
Call super for cleanup
2015-06-05 10:50:52 -05:00
wchen-r7
69968fc9f1
Merge branch 'upstream-master' into bapv2
2015-06-04 23:36:24 -05:00
wchen-r7
910ae8a480
Fix #5461 , actually stop a job from the RPC service
...
Fix #5461 . The RPC service is incorrectly using the wrong method to
stop a job, this patch should fix that.
2015-06-04 23:09:55 -05:00
wchen-r7
7de78c1d69
Land #5447 , more info about using the deprecated report_auth_info
2015-06-04 12:37:22 -05:00
wchen-r7
be709ba370
Merge branch 'upstream-master' into bapv2
2015-06-04 10:33:07 -05:00
jvazquez-r7
d22dda2bab
Provide more context and references
2015-06-01 10:33:40 -05:00
benpturner
9d1a7cead4
New modules to support 64bit process powershell.
2015-06-01 16:11:23 +01:00
Brent Cook
64e86165ef
remove android meterpreter bins, update to payloads 1.0.2
...
This switches us to using the Android payload files from the
metasploit-payloads gem
2015-06-01 09:14:31 -05:00
Brent Cook
70ef1b83f9
Merge branch 'master' into land-5366-android
2015-06-01 09:07:55 -05:00
wchen-r7
5c890004b8
Do stop_service in cleanup
2015-05-29 18:32:57 -05:00
wchen-r7
28d35a5bf4
Update doc
2015-05-29 18:03:56 -05:00
wchen-r7
58c5767330
Don't need stderr.puts
2015-05-29 17:41:29 -05:00
wchen-r7
0384b115e9
Fix reload bug
2015-05-29 17:41:02 -05:00
OJ
3dd3ef5edb
Merge branch 'upstrea/master' into winhttp-ie-proxy
2015-05-30 08:03:43 +10:00
jvazquez-r7
af326a4f88
Use compatible_payloads instead of copy and paste
2015-05-29 16:55:19 -05:00
Brent Cook
6d488c63d4
php UUIDOptions->UUID::Options
2015-05-29 16:33:03 -05:00
Brent Cook
b8a8e65c2c
Merge branch 'master' into land-5394-uuid-tracker
2015-05-29 16:22:45 -05:00
Brent Cook
7b0006a1b2
Merge branch 'master' into land-5394-uuid-tracker
2015-05-29 15:41:31 -05:00
wchen-r7
defda01d87
Some doc
2015-05-29 15:09:29 -05:00
wchen-r7
b33ace2f44
Put is_payload_compatible? in exploit.rb
2015-05-29 15:07:59 -05:00
wchen-r7
13779adab4
Merge branch 'upstream-master' into bapv2
2015-05-29 14:59:04 -05:00
wchen-r7
6be363d82a
Merge branch 'upstream-master' into bapv2
2015-05-29 14:58:38 -05:00
Brent Cook
340792aae4
don't jump past the uuid sender on win32/tcp connect
2015-05-29 14:34:27 -05:00
wchen-r7
dab9a66ea3
Use current ruby hash syntax
2015-05-29 13:43:20 -05:00
Brent Cook
7d5af66fa0
Merge branch 'master' into land-5367-uuid-stagers
2015-05-29 13:00:35 -05:00
Brent Cook
8f747d2541
Land #5382 , add meterpreter session reconnect RPC call
2015-05-29 12:53:15 -05:00
Spencer McIntyre
24b4dacec5
Land #5408 , @g0tmi1k fixes verbiage and whitespace
2015-05-27 21:02:02 -04:00
wchen-r7
5d0053e4ef
Move iframe instead of hiding, which seems to improve Flash reliability
2015-05-27 00:43:47 -05:00
wchen-r7
60cdf71e6c
Merge branch 'upstream-master' into bapv2
2015-05-26 15:56:48 -05:00
Brent Cook
d76a9c6565
Land #5409 , update cmd stager documentation.
...
Merge remote-tracking branch 'upstream/pr/5409' into upstream-master
2015-05-26 10:34:03 -05:00
wchen-r7
3102741157
Don't need print_line
2015-05-25 11:54:58 -05:00
wchen-r7
3d5248f023
This is better
2015-05-25 11:46:18 -05:00
OJ
307dcd09dd
Update payload cache sizes again
2015-05-25 20:12:20 +10:00
OJ
87bc198c82
x64 winhttp ie proxy support, autoconfig ignore
2015-05-25 20:01:37 +10:00
wchen-r7
db09b9846c
I think I found the speed back
2015-05-25 02:44:57 -05:00
wchen-r7
72112317cc
Update
2015-05-25 01:58:34 -05:00
wchen-r7
3efe22d5e2
This seems better, slower though
2015-05-25 01:42:34 -05:00
OJ
78176c4335
First pass of IE proxy support for winhttp x86
2015-05-25 15:44:35 +10:00
OJ
43f7054a5c
Refactor base64 stub into base module
...
As per @zeroSteiner's suggestion.
2015-05-25 11:51:01 +10:00
OJ
9e50114082
Merge branch 'upstream/master' into uuid-stagers
2015-05-25 11:22:35 +10:00
OJ
9042f141ff
Implement the IPv6 UUID bind stagers
2015-05-25 11:21:28 +10:00
wchen-r7
7089bd945a
This payload handling looks much better
2015-05-24 12:47:20 -05:00
Spencer McIntyre
6fb2da4f62
Fix #5391 , cmd stager documentation fixes
2015-05-23 13:56:49 -04:00
wchen-r7
a376464710
It kind of blew up
2015-05-23 05:26:13 -05:00
wchen-r7
f378b45408
bug fixes, sorta
2015-05-23 05:06:15 -05:00
wchen-r7
7f4b51f0ff
Fix nil bug
2015-05-23 02:08:51 -05:00
wchen-r7
60b0be8e3f
Fix a lot of bugs
2015-05-23 01:59:29 -05:00
wchen-r7
916b7b83be
Change how we load payload handlers
2015-05-22 20:35:43 -05:00
jvazquez-r7
d10b20b7a3
Land #5251 , @hmoore-r7's second opportunity to Oracle connect
...
SYSTEM shouldn't have SYSDBA privileges by default anymore
2015-05-22 17:47:41 -05:00
jvazquez-r7
41a86b2e9b
add vprint_status
2015-05-22 17:46:56 -05:00
wchen-r7
6de75ffd9f
Merge branch 'upstream-master' into bapv2
2015-05-22 17:11:03 -05:00
jvazquez-r7
c201955fdf
Land #5387 , @wchen-r7's user-configurable HTTP timeout
...
Fixes #5219 , Add connection timeout and response timeout for HttpClient
2015-05-22 15:36:11 -05:00
jvazquez-r7
e0d9ee062f
Use HttpClientTimeout
2015-05-22 13:35:37 -05:00
wchen-r7
8fd468a89f
Get the dry-run feature right this time
2015-05-22 13:07:30 -05:00
wchen-r7
905fe73d78
Track clicks
2015-05-22 12:57:06 -05:00
wchen-r7
e8a32bdd10
Make MaxSessions/RealList/Custom404 work better
2015-05-22 12:40:56 -05:00
wchen-r7
2bb6f390c0
Add session limiter and fix a race bug in notes removal
2015-05-22 12:22:41 -05:00
HD Moore
078438f66e
Update UUIDOptions -> UUID::Options
2015-05-22 00:30:05 -05:00
HD Moore
c17ee64d81
Merge branch 'master' into feature/uuid-registration
2015-05-22 00:29:16 -05:00
OJ
c07ff70f19
Add check for UUID payloads
...
Thankfully those payloads already had a flag that could be reused.
2015-05-22 15:11:12 +10:00
Brent Cook
9ce669f878
Land #5328 : reworked x64 http/https stagers
2015-05-21 23:26:34 -05:00
OJ
10bd75348c
Merge branch 'upstream/master' into uuid-stagers
2015-05-22 13:07:25 +10:00
OJ
a6a274d3a3
Merge recent stager changes
2015-05-22 13:01:45 +10:00
wchen-r7
c29bb35e28
Change datastore name
2015-05-21 10:15:03 -05:00
David Maloney
356f361b40
add sid to the the yard docs
...
you win this round OJ ;)
MSP-12722
2015-05-21 09:30:09 -05:00
wchen-r7
3ee02d3626
Hmm bug
2015-05-21 00:36:40 -05:00
HD Moore
4622fa60eb
Register the init_* URLs and whitelist these
2015-05-21 00:22:41 -05:00
wchen-r7
31c60b48c8
Don't forget to doc
2015-05-21 00:08:04 -05:00
wchen-r7
6e8ee2f3ba
Add whitelist feature
2015-05-21 00:05:14 -05:00
HD Moore
27406204ed
Disable payload UUID registration by default
2015-05-20 23:56:15 -05:00
wchen-r7
bdf30dd383
Land #5374 , --smallest option in msfvenom
2015-05-20 21:06:10 -05:00
HD Moore
a8d111ce89
Merge branch 'master' into feature/uuid-registration
2015-05-20 19:48:39 -05:00
HD Moore
ac0004ea0a
Implement IgnoreUnknownPayloads
2015-05-20 19:47:17 -05:00
wchen-r7
93900087c7
Resolve #5219 , user-configurable HTTP timeout
...
Resolve #5219
2015-05-20 13:30:45 -05:00
OJ
44f8cf4124
Add more size to stagers, adjust psexec payloads
...
This psexec payload size should be evaluated to make sure I'm not doing
anything stupid. i can't see a reason why increasing these sizes would
be bad. They seem to work fine.
2015-05-20 17:07:56 +10:00
OJ
5963a5833a
Fix up php stageless payload includes
2015-05-20 16:50:00 +10:00
OJ
d0a5b803e8
Use generate_payload_uuid instead of manual obj creation
2015-05-20 16:25:52 +10:00
HD Moore
818d8b186c
Implement tracking
2015-05-20 01:10:19 -05:00
OJ
289873c25f
Merge all the stager changes
2015-05-20 16:02:37 +10:00
OJ
6859b24c1c
Fix missing label, update payload sizes
2015-05-20 15:42:31 +10:00
OJ
d43e11f5af
WinHTTP rework with proxy support, and SSL verification
...
This commit fixes up the winhttps stuff properly too. PHEW!
2015-05-20 15:32:34 +10:00
HD Moore
513a81e340
Add framework.uuid_db as a JSONHashFile
2015-05-20 00:28:32 -05:00
OJ
fd2534914d
Small tweaks to reverse_http
2015-05-20 12:15:38 +10:00
David Maloney
48c50a897c
add rpc call to change meterp transport
...
this rpc method allows the user to change transport
on an existing meterp session. if it's successful
it will close the old 'session' tied to the rpevious transport
MSP-12722
2015-05-19 14:43:25 -05:00
Christian Catalan
046003acb4
Increase REXML expansion text limit
...
MSP-9532
* Increase to reasonable size to handle larger xml file expansion on import
* Prevents the 'RuntimeError entity expansion has grown too large' error that prevents import
2015-05-19 12:47:19 -05:00
William Vu
c1b8cee315
Land #5369 , @dmaloney-r7's snmp_login fixes
2015-05-19 10:39:03 -05:00
Tim
e7c8a3b56c
add support for SessionRetryTotal and SessionRetryWait on Android
2015-05-19 16:16:04 +01:00
OJ
9fddc21cf3
Shaved another sneaky byte off the payload
2015-05-19 21:21:07 +10:00
OJ
6e96e6d118
Shellcode golf to make the payload smaller
...
Tried to implement some more of the stuff that egypt suggested, managed
to get some in, but not others. Ultimately, its smaller than it was, and
I'm sure there are ways to make it better as well.
2015-05-19 21:17:42 +10:00
OJ
62720ab357
Fix the wininet stager for http/s
...
For some reason this was only working on Windows7/2008, yet when tired
on Windows 2012 it was resulting in crashes. It was also stopping
working in exploits such as psexec_psh.
Went back to the beginning and started again. With this in place, we can
now do a bit of shellcode golf to make it a bit smaller.
Adjusted payload sizes as well.
2015-05-19 20:03:22 +10:00
HD Moore
9d7e54f360
Add the UUID subdirectory, including initial DB class
2015-05-18 23:41:22 -05:00
HD Moore
c7932855f2
Move UUIDOptions to UUID::Options
2015-05-18 23:35:18 -05:00
wchen-r7
46f389fecd
Documentation
2015-05-18 18:41:37 -05:00
wchen-r7
fbbd25f4bc
I never use this thing
2015-05-18 17:56:17 -05:00
wchen-r7
89be3fc1f2
Do global requirement comparison in BAP
2015-05-18 16:27:18 -05:00
HD Moore
9dd82d94ae
Exclude Manual ranked encoders from automatic selection, these can still be specified with -e
2015-05-18 15:47:15 -05:00
HD Moore
71eab7a236
Implements msfvenom --smallest, still some blockers
2015-05-18 15:24:59 -05:00
HD Moore
a82168d7bb
Fixes #5361 by adding --encoder-space to msfvenom
2015-05-18 14:27:52 -05:00