0052f9712b
Updated hard tabs per new requirement
2013-09-17 17:42:01 -07:00
9a555d8701
Fix the modules added since the branch
2013-09-17 18:25:12 -05:00
150f0f644e
Merge branch 'rapid7' into bug/osx-mods-load-order
...
Conflicts:
modules/post/windows/gather/enum_dirperms.rb
2013-09-17 18:21:13 -05:00
dc9246a770
New compiled bins for shiny vs2012 build
...
* Fixes x64 sniffer [FixRM #8364 ]
2013-09-17 18:11:13 -05:00
02044e8b5e
Land #2373 , Corrects x64 reverse_https alignment
...
It appears that testing of the original submit was performed
on VMWare which worked. On a non virtualized machine the
payload would crash.
[Closes #2373 ] [FixRm #8271 ]
2013-09-17 22:50:04 +01:00
6bf0d9b761
Cleanup
2013-09-17 21:46:38 +01:00
dae8847c4d
Land #2374 , more complete 32/64 migrate fix
...
[FixRM #8395 ]
2013-09-17 14:52:04 -05:00
a425859cc6
Land #2375 - incrase depth for travis
2013-09-17 13:28:58 -05:00
69946d0108
Land #2384 - remove id and revision tags
2013-09-17 12:37:22 -05:00
c77d49a640
Merge branch 'rapid7' into cleanup/remove-id-tags
...
Conflicts:
lib/msf/core/payload/osx/bundleinject.rb
lib/msf/core/payload/windows/dllinject.rb
lib/msf/core/payload/windows/exec.rb
lib/msf/core/payload/windows/loadlibrary.rb
lib/msf/core/payload/windows/reflectivedllinject.rb
lib/msf/core/payload/windows/x64/reflectivedllinject.rb
scripts/meterpreter/netenum.rb
2013-09-17 10:55:02 -05:00
97d3a20f82
Remove more $Revision tags
2013-09-17 10:46:37 -05:00
ca53c6f15b
Remove Id tags in scripts/
2013-09-17 10:42:58 -05:00
175716d552
Land @jvennix-r7 changes
2013-09-17 08:49:40 -05:00
0dcc0a9a6d
Land #2378 , meterpreter DLL suffix
...
Tested in the following configurations:
* WinXP SP0 x86 - reverse_http, reverse_tcp, ms08-067, ms03-026
* Win7 x64 fully patched - reverse_https, reverse_tcp, x64/reverse_tcp
Tested with all public extensions. Behaviour matches that of the currently released MSF.
x64 binaries no longer show up in auto-complete for x86.
2013-09-17 17:35:24 +10:00
82aa3f97b0
added Astium confweb 25399 RCE
2013-09-17 12:32:10 +07:00
21055f6856
Add x86 to meterpreter's binary suffix
...
This makes x86 more consistent with x64.
Also replaces a bunch of instances of:
File.join(Msf::Config.install_root, 'data', ...)
with the simpler
File.join(Msf::Config.data_directory, ...)
[See rapid7/meterpreter#19 ]
2013-09-16 21:52:04 -05:00
a641bc41a8
Kill unnecessary comment.
2013-09-16 21:35:53 -05:00
5fc724bced
Kill explanatory comment.
2013-09-16 21:34:38 -05:00
f954e5299f
Now working on windows even.
2013-09-16 21:34:12 -05:00
2c47e56d90
Adds module for yaml code exec.
2013-09-16 21:33:57 -05:00
d954d64f69
Add NODEJS arch constants.
2013-09-16 21:33:44 -05:00
217449a836
Ensures termination of inner while loop and cleans up #map.
...
* Tested working against ubuntu target using the sshexec test script.
2013-09-16 20:42:20 -05:00
52a1b5fa57
updated pcman_stor_msf.rb module with community feedback.
2013-09-16 17:43:10 -07:00
226a75b5da
updated pcman_stor_msf.rb module with community feedback.
2013-09-16 17:37:29 -07:00
7eb4e10999
Extend Travis's depth a bit
...
Instead of depth=1, try depth=5. This way, if something gets landed
before travis had a chance to build, it'll still get tested, at least
post-facto.
This is the root cause of the build failure at
https://travis-ci.org/rapid7/metasploit-framework/builds/11436293
That commit is not available because the HEAD pointer moved past it with
the next commit; IOW, we landed too quick for Travis to rspec each
change, which is generating failed build messages.
If there was really a failure in there, it'd be a pain now to determine
which commit actually broke the build.
2013-09-16 17:23:16 -05:00
edec022957
Use shellwords, as recommended by @jvennix-r7
2013-09-16 16:35:45 -05:00
74fd80d01e
Land #2372 - module description updates
2013-09-16 16:17:57 -05:00
d6954e9ce7
Fix migrate from 32- to 64-bit processes
...
In some cases, it was possible to end up in a situation where the x64
reflective library hadn't been loaded by the time a user typed migrate.
If the target process was 64-bit, msfconsole would error out with a
NoMethodError and much sadness would ensue.
[See #2356 ]
2013-09-16 16:04:50 -05:00
bf18e5c37f
Land #2356 , temp fix for meterpreter.rb
...
@jlee-r7 is working on something more perfect, but would really like to
ship this this week to get around existing problems.
2013-09-16 15:58:42 -05:00
38691445af
Fixed memory alignment for x64 reverse_http stager
2013-09-16 16:51:37 -04:00
b4b7cecaf4
Various minor desc fixes, also killed some tabs.
2013-09-16 15:50:00 -05:00
fe86325fd4
Fixed memory alignment for x64 reverse_http stager
2013-09-16 16:43:20 -04:00
f89af79223
Correct OSVDB for sophos sblistpack exploit
2013-09-16 15:41:50 -05:00
d4f2e72b9c
updated module to include msftidy.rb
2013-09-16 12:46:13 -07:00
82e3910959
added PCMan's FTP Server Crafted Multiple Command Handling Remote Buffer Overflow (OSVDB 94624)
2013-09-16 12:40:36 -07:00
92cf886e49
updated module to include msftidy.rb
2013-09-16 12:38:00 -07:00
4c83336944
Delete pcman_stor_msf.rb
...
delete because of commit issues.
2013-09-16 12:25:39 -07:00
2d936fb67c
Bail from payload if require() is not available.
...
* TODO: test on windows
2013-09-16 14:05:26 -05:00
08f0abafd6
Add nodejs single payloads, thanks to RageLtMan.
2013-09-16 13:38:42 -05:00
e1e1cab797
Module gets me a shell, yay
2013-09-16 13:37:16 -05:00
f657f4d145
added PCMan's FTP Server Crafted Multiple Command Handling Remote Buffer Overflow (OSVDB 94624)
2013-09-16 09:57:27 -07:00
a8198bc948
Add documentatio to the mixin
2013-09-16 11:55:30 -05:00
a5049df320
Add echo CmdStager
2013-09-16 11:35:05 -05:00
e87f8a8ae6
Land #2369 - Avoid hiding all exceptions
2013-09-16 11:09:49 -05:00
c18c41d8ea
Don't hidde exceptions
2013-09-16 09:26:13 -05:00
86e5163cad
Fix Indentation and cleanup
2013-09-16 09:19:26 -05:00
62cf9cb07c
Retab changes for PR #2188
2013-09-16 09:09:16 -05:00
842dba20b9
Merge for retab
2013-09-16 09:08:36 -05:00
299860b09d
Land #2329 , @kaospunk auxiliary module to enumerate ntlm info
2013-09-16 08:16:30 -05:00
4040fe4b6b
Fix style
2013-09-16 08:15:46 -05:00
Rick Flores (nanotechz9l)
James Lee
Meatballs
Tod Beardsley
sinn3r
jvazquez-r7
OJ
xistence
Joe Vennix
Brandon Turner
Ryan Wincey
RageLtMan