8fc683d75d
Use MonitorMixing in Msf::Framework
...
MSP-11605
To get access to `#synchronize` for thread-safe lazy initialization.
2014-11-13 11:11:34 -06:00
55aa32c6b6
Merge branch 'feature/MSP-11147/thread-leak-detection' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
2014-11-13 10:14:22 -06:00
b17b263cc7
Ignore debugger threads
...
MSP-11147
When using the debugger, it adds a thread that should be allowed and not
go towards the count.
2014-11-13 09:49:08 -06:00
535f69b56d
Append to RUBYOPT for debugger compatibility
...
MSP-11147
When using Rubymine's debugger, the tests would run and say there were
no tests and no break points would be hit. It was determined that this
was due the Rubymine's debugger injecting itself into RUBYOPTS and only
working if it's first in RUBYOPT, which means that
'metasploit:framework:spec:threads:suite' must inject '-Ilib
-rmetasploit/framework/spec/threads/logger' at the end of RUBOPT instead
of the beginning.
2014-11-13 09:19:07 -06:00
cca82f4b36
Failing spec for Msf::Framework.new threads
...
MSP-11605
`Msf::Framework.new` creates 8 threads (change from 1 thread to 9 threads), but
it shouldn't create any threads.
2014-11-12 13:41:30 -06:00
2fc6154ce9
Update db/schema.rb
...
MSP-11147
Must be missing on master too.
2014-11-12 13:33:21 -06:00
69043d51e0
Merge branch 'master' into feature/MSP-11147/thread-leak-detection
...
MSP-11147
2014-11-12 12:34:25 -06:00
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
3ff87c89fe
Clean up Msf::Framework spec thread-leaks
...
MSP-11147
2014-11-12 12:20:23 -06:00
22cbc5ca02
Use named subject instead of subject
...
MSP-11147
2014-11-12 12:18:08 -06:00
61109d5567
Fix thread-leaks in msfcli spec
...
MSP-11147
2014-11-12 12:13:53 -06:00
e05cd95c9b
Land #4188 , remerge of #4168
...
update gemspec for metasploit-credential
2014-11-12 11:26:57 -06:00
e0163a325d
update metasploit-credential to 0.13.2
2014-11-12 11:16:51 -06:00
5d48f123f6
Add #4045 to CHANGELOG
2014-11-12 11:15:58 -06:00
c937982a28
Merge branch 'master' into bug/MSP-11592/blank-password-failure
2014-11-12 11:13:58 -06:00
758fee6320
Merge branch 'master' of github.com:rapid7/metasploit-framework
...
Conflicts:
Gemfile.lock
2014-11-12 11:13:33 -06:00
ad811dc70c
CHANGELOG template for next release
2014-11-12 11:13:22 -06:00
ad4ee3cffd
Merge branch 'master' of rapid7.github.com:/rapid7/metasploit-framework
2014-11-12 11:10:48 -06:00
1fd8fe57df
Merge staging/great-backport to master
...
Conflicts:
spec/lib/msf/core/module_spec.rb
2014-11-12 11:08:18 -06:00
ac4b2bee4d
Land #4181 - Fix nil URIPORT in get_uri (HttpServer)
2014-11-12 10:54:16 -06:00
70589668c2
Really land the #4130 module
2014-11-12 09:39:01 -06:00
ece8013d7a
Use #empty?
2014-11-12 09:35:06 -06:00
f048463ed6
Do minor fixupts
...
* Delete peer method
* Make verifications more strict
2014-11-12 09:33:49 -06:00
a5c87db65e
Do minor cleanup
...
* Beautify description
* Use double quotes for interpolation
2014-11-12 09:29:53 -06:00
e1164d3e14
Use snake_case on filename
2014-11-12 09:26:47 -06:00
8adc80fff1
Sort context entries
...
MSP-11147
2014-11-12 09:16:37 -06:00
9766e61b7b
Update Msfcli#engage_mode spec style
...
MSP-11147
2014-11-12 09:08:36 -06:00
ae339cb59f
Land #4174 , @hmoore-r7's fix for #4170
2014-11-12 07:02:22 -08:00
b2612eaf1c
Land #4180 , Metasploit Trail banner
...
Homage to Oregon Trail. :)
2014-11-11 16:28:46 -06:00
adad3809cc
Rename logo file
2014-11-11 16:07:44 -06:00
89a8d27602
Fix port 0 bug in URIPORT
2014-11-11 15:57:41 -06:00
329ea4fe01
the masterpiece is complete
2014-11-11 15:35:36 -06:00
c0a3707c52
Update Msfcli#init_modules spec style
...
MSP-11147
2014-11-11 15:29:21 -06:00
c73a866932
Land #4178 , remerge of #4113
2014-11-11 15:23:40 -06:00
7e05f88399
Reapply PR #4113 (removed via #4175 )
2014-11-11 15:06:43 -06:00
2a6d288fe8
Land #4176 , revert of 14514d7
2014-11-11 14:57:40 -06:00
64aaa50132
Revert 14514d7 as well
...
Another one snuck in there, see #4175
Revert "update gemspec for metasploit-credential"
This reverts commit 14514d7b8b6653d5e913
2014-11-11 14:53:04 -06:00
bb07de3294
Update Msfcli#generate_whitelist spec style
...
MSP-11147
2014-11-11 14:49:48 -06:00
baf7065e1b
Land #4175 , revert of deea30d
2014-11-11 14:43:48 -06:00
017a44c0ae
Revert errored merge of deea30d
...
Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master"
This reverts commit deea30ddb414514d7b8b
2014-11-11 14:38:47 -06:00
965607c7dc
Update Msfcli#guess_nop_name spec style
...
MSP-11147
2014-11-11 14:16:55 -06:00
577065f68d
Update Msfcli#guess_encoder_name spec style
...
MSP-11147
2014-11-11 14:14:50 -06:00
2d4cc8b21c
update gemfile.lock to credential 13.2
2014-11-11 13:49:47 -06:00
d36da497d0
Update Msfcli#guess_payload_name spec style
...
MSP-11147
2014-11-11 13:47:16 -06:00
deea30ddb4
Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master
2014-11-11 13:36:50 -06:00
14514d7b8b
update gemspec for metasploit-credential
2014-11-11 13:35:00 -06:00
1f1af70047
Update Msfcli#usage spec style
...
MSP-11147
2014-11-11 13:22:28 -06:00
dbd5937dc7
Limit threads to 1 when CPORT is set, closes #4170
...
This issue also applies to TCP scanner modules.
2014-11-11 13:21:09 -06:00
ebec5329df
Update Msfclie#dump_module_list spec style
...
MSP-11147
2014-11-11 13:21:06 -06:00
56b53b0dcd
Remove redundant 'it' in text name
...
MSP-11147
2014-11-11 13:16:45 -06:00
Luke Imhoff
Fernando Arias
David Maloney
sinn3r
jvazquez-r7
Jon Hart
William Vu
Joshua Smith
Tod Beardsley
HD Moore