sinn3r
d7e702891d
Merge branch 'cleanup/specs' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-cleanup/specs
2012-10-18 13:19:44 -05:00
James Lee
5f1ec459ee
Disambiguate with parens
...
Removes a "ruby -c -W" warning
2012-10-18 12:46:08 -05:00
James Lee
37522a4bf0
Remove debugging output
2012-10-18 11:47:21 -05:00
James Lee
258c8800fc
Add a spec for Util::EXE.to_executable_fmt
2012-10-18 11:40:44 -05:00
jvazquez-r7
291ad27a69
Merge branch 'msftidy_police' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-msftidy_police
2012-10-18 11:32:55 +02:00
sinn3r
dbbf1eceaf
Merge branch 'find_next_fix' of git://github.com/Meatballs1/metasploit-framework into Meatballs1-find_next_fix
2012-10-17 22:43:09 -05:00
Tod Beardsley
cbce2c0fd5
Loop management, timeouts, and verbosity
...
Add a todo for cred recording. Allow the user to determine when to give
up. Changes while true to simply loop. Clear up some of the boolean
checks. Inform the user what's going on.
2012-10-17 17:30:30 -05:00
sinn3r
0675a6171b
Cosmetic changes
2012-10-17 17:30:16 -05:00
sinn3r
201518b66f
msftidy corrections
2012-10-17 17:22:26 -05:00
Meatballs
e1a4ec2fcc
Fix to SMB Client when using find_first on a directory with exactly 20 files.
2012-10-17 21:58:20 +01:00
jvazquez-r7
7b1c35624e
Merge branch 'mssql_ntlm_stealer' of https://github.com/nullbind/metasploit-framework into nullbind-mssql_ntlm_stealer
2012-10-17 22:50:54 +02:00
Scott Sutherland
b14a980462
Merge pull request #1 from jvazquez-r7/nullbind_test1
...
Looks good and works as excepted. Thanks for the updates!
- jvazquez-r7 did some nice clean up
2012-10-17 13:45:11 -07:00
jvazquez-r7
1f55e02535
minor cleanup
2012-10-17 22:21:28 +02:00
jvazquez-r7
4c6b331bdc
Merge branch 'mssql_ntlm_stealer_sqli' of https://github.com/nullbind/metasploit-framework into nullbind-mssql_ntlm_stealer_sqli
2012-10-17 22:21:00 +02:00
jvazquez-r7
3bd84e255f
minor cleanup
2012-10-17 22:06:47 +02:00
jvazquez-r7
848f0cd899
Merge branch 'module-lantronix_telnet_password' of https://github.com/jgor/metasploit-framework into jgor-module-lantronix_telnet_password
2012-10-17 22:06:25 +02:00
James Lee
4800d5428d
Fix nmap spec
2012-10-17 15:01:01 -05:00
James Lee
9e85e97dae
Use the proper filename for nmap spec
2012-10-17 15:00:42 -05:00
James Lee
e6ec7281f6
Make old specs work with new rake task
2012-10-17 14:50:25 -05:00
James Lee
b342cdd52b
Move specs from test/tests/ into spec/
2012-10-17 14:48:53 -05:00
jgor
e22059da9d
Merge branch 'module-lantronix_telnet_password' of github.com:jgor/metasploit-framework into module-lantronix_telnet_password
2012-10-17 14:27:49 -05:00
jgor
9af727388f
deleted superfluous code and comments
2012-10-17 14:27:00 -05:00
jgor
c9a5a2b0c6
deleted superflous code and comments
2012-10-17 14:23:00 -05:00
sinn3r
feb4389d52
Merge branch 'bug/rm7298-msfvenom-c' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-bug/rm7298-msfvenom-c
2012-10-17 12:18:29 -05:00
jvazquez-r7
12e2ff9bb5
proposed cleanup
2012-10-17 19:03:28 +02:00
James Lee
87eabaf915
Allow 'x64' and 'x86_64' for backcompat
2012-10-17 11:03:42 -05:00
sinn3r
e30b5b417a
Merge branch 'master' of git://github.com/sput-nick/metasploit-framework into sput-nick-master
2012-10-17 10:35:11 -05:00
sput-nick
60dc83748c
Update modules/exploits/windows/browser/mozilla_mchannel.rb
2012-10-17 12:25:44 -03:00
jvazquez-r7
16e2a2e050
fix title for the apache activemq source disclosure mod
2012-10-17 17:23:56 +02:00
scriptjunkie
0564a6eaa7
Add migrate stub option to Windows x86 payloads.
...
Migrate stub spawns payload in new process.
2012-10-16 20:53:36 -05:00
James Lee
e2cf22add7
Fix msfvenom -c
...
Also cleans up some dirty ifs that should be cases.
[SeeRM #7298 ]
2012-10-16 19:16:59 -05:00
James Lee
1a0e53dcbb
Merge branch 'jvazquez-r7-osx_x86_exec_prepend' into rapid7
...
[Closes #919 ]
2012-10-16 16:50:15 -05:00
nullbind
c52b834f50
updated name and description
2012-10-16 14:37:02 -05:00
nullbind
d8c2aa9796
added mssql ntlm stealer for sqli
2012-10-16 14:26:10 -05:00
James Lee
9ee3a14a5a
Merge branch 'rapid7' into wchen-r7-smb_login_smb_login_handling
...
[Closes #913 ]
2012-10-16 13:08:11 -05:00
nullbind
fafa6e49ce
address comments from jvazquez
2012-10-16 12:10:37 -05:00
jvazquez-r7
6f227dddff
Related to #885 , allow Prepend* for osx/x86/exec payload
2012-10-16 16:26:18 +02:00
sinn3r
e583847a31
I missed this sucker.
2012-10-15 22:02:26 -05:00
sinn3r
20d1dc3b1d
Merge branch 'armitage' of git://github.com/rsmudge/metasploit-framework
2012-10-15 18:47:03 -05:00
Tod Beardsley
dd1a352ae1
Merge remote branch 'jlee-r7/dont-require-dot-rb'
2012-10-15 18:41:16 -05:00
Raphael Mudge
eee6248795
Armitage 10.16.12 - a lot of bug fixes.
2012-10-15 19:19:31 -04:00
James Lee
45a60b6bdd
Clarify why we need to sleep.
...
[Closes #911 ][FixRM #7344 ]
2012-10-15 17:54:18 -05:00
Raphael Mudge
f4b151f63d
Detect and mitigate CPU starvation condition [SeeRM #7344 ]
2012-10-15 17:54:18 -05:00
James Lee
46ed888ffe
Don't require .rb
2012-10-15 17:27:23 -05:00
James Lee
52feae2dcd
Add missing require
...
[FixRM #7345 ]
2012-10-15 17:18:04 -05:00
sinn3r
8e668e2808
Check STATUS_ACCESS_DENIED properly
...
When Samba throws STATUS_ACCESS_DENIED, the exception that's
throwin is actually Rex::Proto::SMB::Exception::ErrorCode, not
as LoginError. It was handled correctly in try_user_pass(), but
not in other functions that also use smb_login().
2012-10-15 16:52:34 -05:00
Tod Beardsley
9192a01803
All exploits need a disclosure date.
2012-10-15 16:29:12 -05:00
nullbind
553ce82e79
added mssql ntlm stealer
2012-10-15 13:29:51 -05:00
jvazquez-r7
29299b29a5
Added modules for CVE-2012-4933
2012-10-15 16:03:19 +02:00
Tod Beardsley
932b8ba841
Require, not load, msf, not lib/msf
2012-10-15 07:11:15 -05:00