Luke Imhoff
2fc6154ce9
Update db/schema.rb
...
MSP-11147
Must be missing on master too.
2014-11-12 13:33:21 -06:00
Tod Beardsley
54158c8662
Land #4005 , TNS poison checker
2014-11-12 13:29:59 -06:00
Tod Beardsley
d242bc220b
Minor fixups and disclosure date for TNS module
2014-11-12 13:25:10 -06:00
Tod Beardsley
955a5142ca
Edit e-mail address for antispam
2014-11-12 13:19:04 -06:00
Luke Imhoff
69043d51e0
Merge branch 'master' into feature/MSP-11147/thread-leak-detection
...
MSP-11147
2014-11-12 12:34:25 -06:00
Luke Imhoff
44f78c21b2
Tag Msfcli spec as content
...
MSP-11147
Tests currently use the real modules directory for test cases, so the
spec should be tagged with :content because it has same performance
issues as other content specs that can potentially load all the modules.
2014-11-12 12:27:33 -06:00
Luke Imhoff
3ff87c89fe
Clean up Msf::Framework spec thread-leaks
...
MSP-11147
2014-11-12 12:20:23 -06:00
Luke Imhoff
22cbc5ca02
Use named subject instead of subject
...
MSP-11147
2014-11-12 12:18:08 -06:00
Luke Imhoff
61109d5567
Fix thread-leaks in msfcli spec
...
MSP-11147
2014-11-12 12:13:53 -06:00
Fernando Arias
e05cd95c9b
Land #4188 , remerge of #4168
...
update gemspec for metasploit-credential
2014-11-12 11:26:57 -06:00
David Maloney
e0163a325d
update metasploit-credential to 0.13.2
2014-11-12 11:16:51 -06:00
Luke Imhoff
5d48f123f6
Add #4045 to CHANGELOG
2014-11-12 11:15:58 -06:00
David Maloney
c937982a28
Merge branch 'master' into bug/MSP-11592/blank-password-failure
2014-11-12 11:13:58 -06:00
David Maloney
758fee6320
Merge branch 'master' of github.com:rapid7/metasploit-framework
...
Conflicts:
Gemfile.lock
2014-11-12 11:13:33 -06:00
Luke Imhoff
ad811dc70c
CHANGELOG template for next release
2014-11-12 11:13:22 -06:00
Luke Imhoff
ad4ee3cffd
Merge branch 'master' of rapid7.github.com:/rapid7/metasploit-framework
2014-11-12 11:10:48 -06:00
Luke Imhoff
1fd8fe57df
Merge staging/great-backport to master
...
Conflicts:
spec/lib/msf/core/module_spec.rb
2014-11-12 11:08:18 -06:00
Joe Vennix
1895311911
Change URL to single line.
2014-11-12 10:56:51 -06:00
sinn3r
ac4b2bee4d
Land #4181 - Fix nil URIPORT in get_uri (HttpServer)
2014-11-12 10:54:16 -06:00
Joe Vennix
8689b0adef
Add module for samsung knox root exploit.
2014-11-12 09:53:20 -06:00
jvazquez-r7
70589668c2
Really land the #4130 module
2014-11-12 09:39:01 -06:00
Jon Hart
e658640014
Show uniq error count
2014-11-12 07:38:07 -08:00
jvazquez-r7
ece8013d7a
Use #empty?
2014-11-12 09:35:06 -06:00
jvazquez-r7
f048463ed6
Do minor fixupts
...
* Delete peer method
* Make verifications more strict
2014-11-12 09:33:49 -06:00
Jon Hart
b05198c05a
Clean up failure messaging when bad CHOST
2014-11-12 07:32:06 -08:00
jvazquez-r7
a5c87db65e
Do minor cleanup
...
* Beautify description
* Use double quotes for interpolation
2014-11-12 09:29:53 -06:00
jvazquez-r7
e1164d3e14
Use snake_case on filename
2014-11-12 09:26:47 -06:00
Luke Imhoff
8adc80fff1
Sort context entries
...
MSP-11147
2014-11-12 09:16:37 -06:00
Luke Imhoff
9766e61b7b
Update Msfcli#engage_mode spec style
...
MSP-11147
2014-11-12 09:08:36 -06:00
Jon Hart
ae339cb59f
Land #4174 , @hmoore-r7's fix for #4170
2014-11-12 07:02:22 -08:00
jvazquez-r7
c35dc2e6b3
Add module for CVE-2014-6352
2014-11-12 01:10:49 -06:00
William Vu
b2612eaf1c
Land #4180 , Metasploit Trail banner
...
Homage to Oregon Trail. :)
2014-11-11 16:28:46 -06:00
William Vu
adad3809cc
Rename logo file
2014-11-11 16:07:44 -06:00
William Vu
89a8d27602
Fix port 0 bug in URIPORT
2014-11-11 15:57:41 -06:00
Joshua Smith
329ea4fe01
the masterpiece is complete
2014-11-11 15:35:36 -06:00
Luke Imhoff
c0a3707c52
Update Msfcli#init_modules spec style
...
MSP-11147
2014-11-11 15:29:21 -06:00
William Vu
c73a866932
Land #4178 , remerge of #4113
2014-11-11 15:23:40 -06:00
OJ
fb751e3b9f
Update meterpreter_bins to 0.0.11
...
This adds support for the getsid command in the binaries.
2014-11-12 07:21:00 +10:00
Tod Beardsley
7e05f88399
Reapply PR #4113 (removed via #4175 )
2014-11-11 15:06:43 -06:00
HD Moore
6b4eb9a8e2
Differentiate failed binds from connects, closes #4169
...
This change adds two new Rex exceptions and changes the local comm to raise the right one depending on the circumstances. The problem with the existing model is
that failed binds and failed connections both raised the same exception. This change is backwards compatible with modules that rescue Rex::AddressInUse in additi
on to Rex::ConnectionError. There were two corner cases that rescued Rex::AddressInUse specifically:
1. The 'r'-services mixin and modules caught the old exception when handling bind errors. These have been updated to use BindFailed
2. The meterpreter client had a catch for the old exception when the socket reports a bad destination (usually a network connection dropped). This has been updat
ed to use InvalidDestination as that was the intention prior to this change.
Since AddressInUse was part of ConnectionError, modules and mixins which caught both in the same rescue have been updated to just catch ConnectionError.
2014-11-11 14:59:41 -06:00
William Vu
2a6d288fe8
Land #4176 , revert of 14514d7
2014-11-11 14:57:40 -06:00
Tod Beardsley
64aaa50132
Revert 14514d7
as well
...
Another one snuck in there, see #4175
Revert "update gemspec for metasploit-credential"
This reverts commit 14514d7b8b
, reversing
changes made to 6653d5e913
.
2014-11-11 14:53:04 -06:00
Luke Imhoff
bb07de3294
Update Msfcli#generate_whitelist spec style
...
MSP-11147
2014-11-11 14:49:48 -06:00
William Vu
baf7065e1b
Land #4175 , revert of deea30d
2014-11-11 14:43:48 -06:00
Tod Beardsley
017a44c0ae
Revert errored merge of deea30d
...
Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master"
This reverts commit deea30ddb4
, reversing
changes made to 14514d7b8b
.
2014-11-11 14:38:47 -06:00
Luke Imhoff
965607c7dc
Update Msfcli#guess_nop_name spec style
...
MSP-11147
2014-11-11 14:16:55 -06:00
Luke Imhoff
577065f68d
Update Msfcli#guess_encoder_name spec style
...
MSP-11147
2014-11-11 14:14:50 -06:00
David Maloney
2d4cc8b21c
update gemfile.lock to credential 13.2
2014-11-11 13:49:47 -06:00
Luke Imhoff
d36da497d0
Update Msfcli#guess_payload_name spec style
...
MSP-11147
2014-11-11 13:47:16 -06:00
Fernando Arias
deea30ddb4
Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master
2014-11-11 13:36:50 -06:00