Tod Beardsley
9545b6e4d6
Land #4343 , os_flavor reduction
2014-12-12 14:49:15 -06:00
Tod Beardsley
177cade6a5
Merge branch 'land-4274-ssl' into temp
2014-12-12 13:25:54 -06:00
sinn3r
985245e8a1
Document method
...
Fix #4366 (support dynamic_base templates)
2014-12-12 01:22:32 -06:00
jvazquez-r7
78eb3325bc
Add initial Rex Client and mixin
2014-12-12 01:20:14 -06:00
sinn3r
b8e58d0f04
Support 32 and 64-bit for exe-only, and fix -k
2014-12-12 01:13:09 -06:00
Brent Cook
fef9c67b0e
Land #3175 , OJ's TLV group refactoring
2014-12-11 22:12:35 -06:00
Brent Cook
8140ed4a45
Merge branch 'upstream-master' into land-3175
2014-12-11 22:03:03 -06:00
sinn3r
d311059e75
Fix DYNAMIC_BASE templates
2014-12-11 20:44:03 -06:00
James Lee
0c1d02c940
Fix event handlers on ruby 2
...
Fixes #4219
2014-12-11 20:08:45 -06:00
jvazquez-r7
20836c1789
Refactor crypto usage
2014-12-11 18:18:37 -06:00
jvazquez-r7
0b2fd7ffec
Update PreAuthEncTimeStamp#encrypt documentation
2014-12-11 17:08:04 -06:00
jvazquez-r7
424ce6ad53
Add constant with CRYPTO_MSG_TYPE
2014-12-11 17:03:46 -06:00
jvazquez-r7
38a0506f2d
Refactor Crypto
2014-12-11 17:00:46 -06:00
jvazquez-r7
35f02e6796
Add support to encode KdcRequest
2014-12-11 15:51:54 -06:00
dmaloney-r7
47c38ed04e
Merge pull request #4364 from todb-r7/bug/bruteforce-speed-3904
...
Modules should respect bruteforce_speed again
2014-12-11 13:19:42 -06:00
jvazquez-r7
d96206b813
Support KdcRequest#encode
2014-12-11 12:44:17 -06:00
Tod Beardsley
4eaf64afef
Don't lie about stop_on_success
...
This absolutely needs to be honored too, though.
See #4365 .
2014-12-11 12:37:13 -06:00
jvazquez-r7
3f12c5c9c5
Redo decode_asn1
2014-12-11 12:34:47 -06:00
jvazquez-r7
8d6e41fae3
Add documentation for KdcRequest
2014-12-11 12:27:26 -06:00
jvazquez-r7
162d2d39b5
Add support for KdcRequestBody decoding
2014-12-11 12:19:26 -06:00
Tod Beardsley
edf541fabe
Fix some double spacing
2014-12-11 09:39:15 -06:00
jvazquez-r7
39ffc0c58a
Add support for PreAuthData#encode
2014-12-10 19:48:44 -06:00
jvazquez-r7
b89dee03c6
Add PreAuthEncTimeStamp#encode support
2014-12-10 19:30:21 -06:00
jvazquez-r7
3accdb705b
Add support for PreAuthPacRequest#encode
2014-12-10 19:18:19 -06:00
jvazquez-r7
96c1370334
Add EncryptedData#encode support
2014-12-10 19:12:24 -06:00
jvazquez-r7
543ec35a01
Refactor PrincipalName#encode
2014-12-10 18:57:23 -06:00
jvazquez-r7
5d2ff5982e
Add support for PreAuthEncTimeStamp decoding/decrypting
2014-12-10 18:33:46 -06:00
Tod Beardsley
0eea9a02a1
Land #3144 , psexec refactoring
2014-12-10 17:30:39 -06:00
sinn3r
9202c4f2a1
No mercy for os_flavor
2014-12-10 11:46:21 -06:00
jvazquez-r7
785ff60d8e
Add inital support for PreAuthEncTimeStamp
2014-12-10 11:25:48 -06:00
jvazquez-r7
8ec403af89
Add support for PA-PAC-REQUEST
2014-12-10 10:51:37 -06:00
jvazquez-r7
6ebfbe7271
Prefix coding
2014-12-10 09:54:57 -06:00
jvazquez-r7
11acba3324
Prefix coding
2014-12-10 09:52:23 -06:00
jvazquez-r7
6653502e68
Support pa_data parsing on kdc_request
2014-12-10 09:47:31 -06:00
jvazquez-r7
cc909ba402
Add documentation for PreAuthData
2014-12-09 19:57:16 -06:00
jvazquez-r7
18819ad6b9
Prefix Rex
2014-12-09 19:37:42 -06:00
jvazquez-r7
0a6e42968b
Add inital support for padata
2014-12-09 19:28:40 -06:00
jvazquez-r7
e62628f1cc
Make specs pass
2014-12-09 18:52:42 -06:00
jvazquez-r7
2557780e7c
Add initial support to decode kdc requests
2014-12-09 18:48:08 -06:00
jvazquez-r7
bed1e06d13
Mark EncryptedData encode as unsupported atm
2014-12-09 17:06:51 -06:00
jvazquez-r7
82549315ff
Mark KdcRequestBody encode as unsupported atm
2014-12-09 17:05:20 -06:00
jvazquez-r7
b84840a596
Add support to decode TGS_REQ body
2014-12-09 16:51:34 -06:00
jvazquez-r7
f236438290
Add initial support for EncryptedData
2014-12-09 16:40:44 -06:00
jvazquez-r7
2725235bc1
Add require for EncryptedData
2014-12-09 16:28:37 -06:00
jvazquez-r7
c5865c6fec
Add initial design draft
2014-12-09 15:53:29 -06:00
Tod Beardsley
09617f990b
Implement BRUTEFORCE_SPEED respect (telnet)
...
This implements just for telnet, but assuming this strategy is kosher,
it's not too painful to add for the rest of the LoginScanner using the
old defaults used by `AuthBrute`.
See #3904 , @dmaloney-r7 or @jlee-r7
2014-12-09 15:40:43 -06:00
Spencer McIntyre
d74a8f6c41
Include the datastore options for the encoder too
2014-12-09 16:32:41 -05:00
sinn3r
a584a5982f
Clarify about how BES uses os_flavor
...
We don't. We don't use os_flavor anymore because it is no longer
implemented. We get the information from os_name instead.
2014-12-09 12:21:59 -06:00
sinn3r
c670bb72df
Land #4337 - Fix prompt coloring on Windows
2014-12-09 11:53:35 -06:00
Spencer McIntyre
42710cc32e
Error messages for the python meterpreter
2014-12-09 11:03:57 -06:00
Luke Imhoff
5f730277cf
Fix prompt coloring on Windows
...
MSP-11669
Set output stream for RbReadline (rl_outstream) to the
Rex::Ui::Text::Output::Stdio, which will use translate the ANSI color
escapes to set_color calls in Windows.
2014-12-08 14:31:00 -06:00
Luke Imhoff
8c0610cb7a
Merge branch 'master' into feature/MSP-11671/test-optimization
...
MSP-11671
Conflicts:
.travis.yml
2014-12-08 08:46:22 -06:00
jvazquez-r7
564da4446e
Add print friendly to_s
2014-12-07 17:52:09 -06:00
jvazquez-r7
19effa7eb9
Fix feedback's review
2014-12-06 21:47:55 -06:00
jvazquez-r7
21742b6469
Test #3729
2014-12-06 21:20:52 -06:00
jvazquez-r7
2c290e2004
Use classes short name
2014-12-05 20:16:50 -06:00
jvazquez-r7
8f403f3eea
Update documentation
2014-12-05 20:11:45 -06:00
jvazquez-r7
03740df931
Support serialization
2014-12-05 19:55:52 -06:00
jvazquez-r7
785006b684
Use references
2014-12-05 19:12:05 -06:00
jvazquez-r7
ae608b1311
Add references to stream when possible
2014-12-05 17:35:38 -06:00
jvazquez-r7
13d8058fe5
Fill stream attribute
2014-12-05 17:14:37 -06:00
Jon Hart
39790a95a0
Land #4313 , @wchen-r7's fix for #4304
2014-12-05 15:08:35 -08:00
jvazquez-r7
ca164cd99f
Support the stream attribute
2014-12-05 16:52:59 -06:00
jvazquez-r7
90e2bbbff5
Refactor Contents
2014-12-05 16:05:35 -06:00
Jon Hart
da92e4705c
Land #4319 , @wchen-r7's fix for #4307
2014-12-05 12:08:39 -08:00
Tod Beardsley
0431720a07
Land #4294 , msfconsole speedups on module load
...
Related to #4257 and #4195 vaguely, and possibly even #4147 .
2014-12-05 13:45:11 -06:00
jvazquez-r7
2241653cb6
Delete self.stream initialization
2014-12-05 12:44:04 -06:00
jvazquez-r7
f5a19b9b41
Add support to decode TC_REFERENCE
2014-12-05 12:42:27 -06:00
sinn3r
abf199f924
Remove junk code
2014-12-05 11:01:34 -06:00
jvazquez-r7
1653101da4
Add support for Arrays of Objects
2014-12-04 20:31:38 -06:00
jvazquez-r7
8e5dc27546
Support Objects with super classes
2014-12-04 19:19:42 -06:00
jvazquez-r7
4b8bdad44b
Refactor contents serialization
2014-12-04 18:28:25 -06:00
sinn3r
cfc1acfcae
Fix #4307 - Check action for nil
...
Auxiiary modules already do this, but looks like we forgot to do the
same for post modules.
I also changed the error to allow "reason" in order to be more
informative about what the user should do.
Fix #4307
2014-12-04 17:07:59 -06:00
Jon Hart
743e9fca9d
Correctly set default SECRET
2014-12-04 14:06:22 -08:00
Jon Hart
1e423f415e
Add missing opt ,
2014-12-04 14:05:17 -08:00
Jon Hart
7f425fc3ab
Configurable fix for #4305
...
Rename UDP_SECRET to just SECRET, as it is used for more than just UDP
Rename and properly document GATEWAY option
Introduce an option to configure what UDP port will be probed
2014-12-04 13:17:34 -08:00
Jon Hart
f22d7191cd
Test fix for #4305
2014-12-04 10:59:57 -08:00
sinn3r
9cc04e59eb
Fix #4304 - Blank password is tried when it shouldn't happen
...
Fix #4304
2014-12-04 12:59:51 -06:00
jvazquez-r7
08f69da41a
Undo to_s methods
2014-12-04 12:48:05 -06:00
jvazquez-r7
b80f6c34c0
Add tool to deserialize streams from files
2014-12-04 12:47:02 -06:00
Jon Hart
d8b1401545
Test fix for #4306
2014-12-03 19:54:31 -08:00
jvazquez-r7
08fe467452
Add Stream specs
2014-12-03 19:31:46 -06:00
jvazquez-r7
2c8f66bba2
Add support for Reset
2014-12-03 18:50:56 -06:00
jvazquez-r7
fb246ac943
Add support for (de)serialization of contents
2014-12-03 18:50:31 -06:00
jvazquez-r7
3e8b8390dd
Add support for Java Streams
2014-12-03 17:59:00 -06:00
jvazquez-r7
6cb6252914
Add YARD documentation for NewObject
2014-12-03 17:34:12 -06:00
jvazquez-r7
d0fcbf2cdb
Add support for simple Objects really
2014-12-03 17:22:23 -06:00
jvazquez-r7
2b91d5013e
Add support for simple Objects
2014-12-03 17:21:11 -06:00
James Lee
8f2e444aca
Land #4281 , ::Queue workarounds for 2.1.x
...
Conflicts:
lib/msf/core/handler/reverse_tcp.rb
2014-12-03 15:48:20 -06:00
jvazquez-r7
fbea369043
Check nils before encoding
2014-12-03 15:06:28 -06:00
jvazquez-r7
0560cc2fe9
Fix typos
2014-12-03 14:59:38 -06:00
jvazquez-r7
268157d42f
Add support for Java Enums
2014-12-03 14:50:03 -06:00
jvazquez-r7
f0139d6aad
Fix some docu typos
2014-12-03 14:34:17 -06:00
jvazquez-r7
0cd51553ed
Raise error on unsupported ClassDesc
2014-12-03 14:00:10 -06:00
jvazquez-r7
6deb88af6b
Add support for arrays
2014-12-03 13:55:12 -06:00
jvazquez-r7
b9023e8fcc
Split ClassDescription into ClassDesc and NewClassDesc
2014-12-03 00:38:27 -06:00
jvazquez-r7
db45f4c620
Delete ClassDescription
2014-12-02 23:56:55 -06:00
jvazquez-r7
1f535a41ca
Move types to the Serialization module
2014-12-02 20:02:42 -06:00
jvazquez-r7
2c070c450b
Add support for ClassDescription
2014-12-02 17:31:53 -06:00
sinn3r
f6f0050f56
Fix #3886 - Backtrace for #check when session is invalid
...
If the user supplies an invalid session (as in not on the session
list), it will cause a backtrace, because the setup method from
Msf::PostMixin isn't actually called.
We have thought about implementing this in a new OptSession instead.
But you can't use or even pass framework to option_container.rb, so
this is NOT possible.
The original PR was #3956 .
2014-12-02 17:22:46 -06:00
jvazquez-r7
e9e584e107
Raise exceptions when unserialization isn't possible
2014-12-02 15:31:31 -06:00
Fernando Arias
fb439258b9
Land #4298 , arbitrary Ruby extension for replicant
...
MSP-11673
* Adds Msf::Module#register_extensions
* Extensions are arbitrary Ruby modules
* Allows overriding of psuedo callbacks
2014-12-02 14:59:37 -06:00
Luke Imhoff
f696a5ab0e
msfconsole --defer-module-loads
...
MSP-11671
Add command line option --defer-module-loads to msfconsole. It will
stop `Msf::Ui::Console::Driver` from calling
`framework.modules.init_module_paths` AND
`framework.modules.refresh_cache_from_database`. This flag is only
meant to speed up msfconsole boot when modules do not need to accessed,
such as during cucumber testing of command help or command line options.
2014-12-02 14:41:32 -06:00
Trevor Rosen
2a033861dc
Just use constants directly
...
MSP-11673
2014-12-02 13:12:53 -06:00
Trevor Rosen
784e138b14
Extend replicants via arbitrary Ruby code
...
MSP-11673
* Implements a #register_extensions method on Msf::Module
* Any registered Ruby modules will extend the cloned module returned by #replicant
2014-12-02 12:18:30 -06:00
Luke Imhoff
35ff82c9d8
Merge branch 'bug/MSP-11672/double-init-module-paths' into feature/MSP-11671/msfconsole-defer-module-loads
...
MSP-11671
2014-12-02 11:57:47 -06:00
HD Moore
fc96d011ab
Python reverse_http stager, lands #4225
2014-12-02 11:47:31 -06:00
jvazquez-r7
622a18bc22
Add support for annotations
2014-12-02 11:42:41 -06:00
Luke Imhoff
9272fe90ae
Merge branch 'master' into bug/MSP-11672/double-init-module-paths
...
MSP-11672
2014-12-02 11:23:51 -06:00
jvazquez-r7
a68540cfa2
Add support for Data Block Long
2014-12-02 10:49:15 -06:00
jvazquez-r7
9c5d7e66d4
Add block data support
2014-12-02 10:46:29 -06:00
Luke Imhoff
90c6764426
init_module_paths once in msfconsole
...
MSP-11672
Pass `'DeferModuleLoads' => false` to `Msf::Simple::Framework.create` so
that `framework.modules.init_module_paths` is only called once (directly
in `Msf::Ui::Console::Driver#initialize`) instead of twice (in
`Msf::Simple::Framework.create` and `Msf::Ui::Console::Driver#initialize).
2014-12-02 10:28:23 -06:00
Luke Imhoff
653c71e029
Fail if init_module_paths called more than once
...
MSP-11672
Calling init_module_paths takes 6 seconds on my machine even when there are no
files to that are changed just because it takes that long to walk the
directories and gather the mtime for each file. Therefore, calling it
more than once should be avoided. Also, there is no reason to call it
twice as to add paths later, `modules.add_module_paths` should be used.
2014-12-02 10:17:09 -06:00
jvazquez-r7
8923b87def
Don't redefine the static decode method
2014-12-02 09:02:24 -06:00
William Vu
bd3d63a155
Land #4270 , Msf::Author cleanup and improvements
2014-12-02 01:26:42 -06:00
jvazquez-r7
ef2bf5b935
Add support for long-utf
2014-12-01 19:50:33 -06:00
jvazquez-r7
705cd4c308
Add initial requiring file
2014-12-01 19:08:16 -06:00
jvazquez-r7
5f11c70d7f
Add initial support for Java serialization
2014-12-01 19:07:45 -06:00
Luke Imhoff
7e2b197f02
Document Msf::Simple::Framework.create
...
MSP-11671
2014-12-01 15:38:48 -06:00
Luke Imhoff
57cabb4f10
Document Msf::Simple::Framework.simplify
...
MSP-11671
2014-12-01 15:36:38 -06:00
William Vu
394d132d33
Land #2756 , tincd post-auth BOF exploit
2014-12-01 12:13:37 -06:00
sinn3r
c681654c10
Land #4252 - Rework meterpreter SSL & pass datastore to handle_connection()
2014-11-30 20:15:53 -06:00
HD Moore
f139795663
Rework queue handling and error reporting, close #4249
2014-11-28 14:56:02 -06:00
HD Moore
335d1ef287
Only cache auto-generated certificates
2014-11-26 21:23:08 -06:00
Joe Vennix
2bd7a67413
Restructure parts of Author, fix some doc bugs.
2014-11-26 13:54:23 -06:00
William Vu
a34e721353
Check for load errors in reload_all
2014-11-25 13:13:40 -06:00
Jon Hart
c0dab54925
Add minor missing doc
2014-11-25 07:37:49 -08:00
Jon Hart
bedf7ed44b
Doc cleanup
2014-11-24 14:34:20 -08:00
Jon Hart
0ed356f71c
Move Kademlia stuff to a more OO model, etc, per reviews
...
All of the work is done in rex. The msf mixin just prevents the
desire to call rex directly from the module
2014-11-24 14:03:43 -08:00
HD Moore
4dc1183ff5
Protecting it once seems like enough (typo)
2014-11-22 17:42:07 -06:00
HD Moore
8becf417a7
Qualify ::File to prevent a stacktrace
2014-11-22 17:16:13 -06:00
HD Moore
673e21cfaf
Rework meterpreter SSL & pass datastore to handle_connection()
...
This allows HandlerSSLCert to be used to pass a SSL certificate into the Meterpreter handler. The datastore has to be passed into handle_connection() for this to work, as SSL needs to be initialized on Session.new. This still doesn't pass the datastore into Meterpreter directly, but allows the Session::Meterpreter code to extract and pass down the :ssl_cert option if it was specified. This also fixes SSL certificate caching by expiring the cached cert from the class variables if the configuration has changed. A final change is to create a new SSL SessionID for each connection versus reusing the SSL context, which is incorrect and may lead to problems in the future (if not already).
2014-11-22 15:35:00 -06:00
HD Moore
823b4e259a
Make it clear SSLVersion is not advertised since it isn't used
2014-11-22 14:25:09 -06:00
HD Moore
842a7a38d8
Change SSLCert to HandlerSSLCert to avoid conflicts with modules
2014-11-22 14:23:56 -06:00
HD Moore
9ed8c59459
Bring options over from reverse_tcp (bind address, etc).
...
Also includes the SSLCert => HandlerSSLCert change
2014-11-22 14:22:54 -06:00
HD Moore
ba9c763f7e
Auto-generated SSL certs now match "snakeoil" defaults
...
This change emulates the auto-generated snakeoil certificate from Ubuntu 14.04. The main changes including moving to 2048-bit RSA, SHA256, a single name CN for subject/issuer, and the removal of most certificate extensions.
2014-11-21 18:25:04 -06:00
jvazquez-r7
90ae9a3ff8
Land #4173 , @wchen-r7's fix for SMB find_first
...
* Fixes #4119 , SMB find_first("\\*") does not return accurate results
* It missed initialization of sid
2014-11-21 09:51:57 -06:00
sinn3r
f2add929d7
Land #4239 - Support SSL intermediate certs
2014-11-21 02:09:40 -06:00
Jon Hart
e255db9429
Partial commit
2014-11-20 13:49:36 -08:00
Jon Hart
5d2c02f402
Initial commit of more OO version of Rex/Aux Kademlia support
2014-11-20 13:28:01 -08:00
Jon Hart
94e5ba13a4
YARD and spec cleanup
2014-11-20 13:28:01 -08:00
Jon Hart
df36ac910d
Mostly complete Kademlia PING / BOOTSTRAP scanner
2014-11-20 13:28:01 -08:00
Jon Hart
f5aa3ecb57
Add proper peer decoding
2014-11-20 13:28:01 -08:00
Jon Hart
ab49d01a1b
Add beginnings of Kademlia gather module and protocol support
2014-11-20 13:28:00 -08:00
HD Moore
2f92a83092
Change to example.com as the default domain
2014-11-20 14:53:36 -06:00
HD Moore
d530046164
Bugfix. Chrome is a liar (chain certs properly)
2014-11-19 16:08:03 -06:00
HD Moore
0d091f1c03
Support SSL intermediate certs, closes #4238
...
Note that this does not apply to reverse_tcp meterpreter clients yet, as
they do not allow certificates to be supplied. I abstracted out the SSL
certificate generation and parsing methods so that we can address this
next.
2014-11-19 15:56:49 -06:00
Meatballs
7004c501f8
Merge remote-tracking branch 'upstream/master' into psexec_refactor_round2
...
Conflicts:
modules/exploits/windows/smb/psexec.rb
2014-11-19 14:40:50 +00:00
jvazquez-r7
dff6af0747
Restore timeout
2014-11-18 12:17:10 -08:00
jvazquez-r7
4844447d17
Use 20 seconds as default timeout
...
* Because it's the default timeout on Rex::Proto::SunRPC::Client
2014-11-18 12:17:10 -08:00
jvazquez-r7
694561dd0f
Dont shadow methods with local variables, just in case...
2014-11-18 12:17:10 -08:00
Jon Hart
bfde6047d5
Introduce a user-controlled timeout for SunRPC stuff
2014-11-18 12:17:10 -08:00
Jon Hart
a9f9a8b116
Introduce new ::Rex::Proto::SunRPC::RPCError, making run_host cleaner
2014-11-18 12:17:10 -08:00
Trevor Rosen
d04441f638
Merge branch 'landing/4207' into upstream-master
...
Land #4207
* Ensure that `rake spec` doesn't create too many threads
2014-11-18 09:23:20 -06:00
Luke Imhoff
8249ef62c9
Merge branch 'master' into chore/MSP-11614/remove-msf-db-manager-sink
...
MSP-11614
Conflicts:
spec/lib/msf/core/task_manager_spec.rb
2014-11-18 08:54:14 -06:00
Trevor Rosen
fff36f5968
Merge branch 'landing/4189' into upstream-master
...
Land #4189
* Detect leaked threads during spec runs
* Manage threads before/after spec runs
2014-11-18 08:33:38 -06:00
jvazquez-r7
7daedac399
Land #3972 @jhart-r7's post gather module for remmina Remmina
...
* Gather credentials managed with Remmina
2014-11-17 16:44:41 -06:00
Tod Beardsley
286827c6e5
Land #4186 , Samsung KNOX exploit. Ty @jvennix-r7!
2014-11-17 13:29:39 -06:00
Spencer McIntyre
2b36c1bb43
Fix pymeterp bugs from testing in osx and python3
2014-11-17 14:04:30 -05:00
jvazquez-r7
cc8b37d619
Make directory mandatory
2014-11-17 12:15:33 -06:00
jvazquez-r7
15b7435c34
Make it YARD compliant documentation
2014-11-17 12:03:37 -06:00
Jon Hart
cd32f00ebc
Add dir doc
2014-11-17 09:15:08 -08:00
Jon Hart
98db8b5ad9
When not a meterpreter session, split dir/ls output to match meterpreter entries output
2014-11-17 09:10:03 -08:00
Jon Hart
5f1a1f8ed3
Use dir for Windows only, ls for the rest
2014-11-17 09:01:14 -08:00
Jon Hart
6519b0e2cb
Add dir and ls to Msf::Post::File
2014-11-17 09:01:14 -08:00
floyd
9243cfdbb7
Minor fixes to ruby style things
2014-11-17 17:12:17 +01:00
floyd
91aa5fa3cf
Some simple ruby convention changes that hopefully make ruby people happy
2014-11-17 16:48:52 +01:00
floyd
3c1ce5072c
Replaced camel case states with snail_case
2014-11-17 16:37:04 +01:00
Luke Imhoff
33b42389f0
Merge branch 'feature/MSP-11147/thread-leak-detection' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
2014-11-17 09:35:47 -06:00
Luke Imhoff
e3869ee1ae
Include Thread status when printing leaked threads
...
MSP-11147
Sometime travis-ci is showing leaked threads even when
'Msf::Framework#threads cleaner' is being used, so I'm adding the
`Thread#status` to the data printed about the Thread to see if the
sometimes leaked threads have an odd status. There's still a chance
that there will be a race-condition between when I call Thread.list and
I ask for each Thread's status that the VM could finish aborting a
Thread so that status I print isn't the same as the one that caused the
Thread to be returned in Thread.list.
2014-11-17 09:30:46 -06:00
Luke Imhoff
ba836f2383
Only calculate thread UUIDs if they are needed
...
MSP-11147
Only calculate thread UUIDs if the thread count exceeds
EXPECTED_THREAD_COUNT_AROUND_SUITE.
2014-11-17 09:17:44 -06:00
Luke Imhoff
024b449b55
Merge branch 'master' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
2014-11-17 08:50:33 -06:00
Joe Vennix
2a24151fa8
Remove BAP target, payload is flaky. Add warning.
2014-11-17 02:02:37 -06:00
Joe Vennix
105a28d8fd
Run the tests again.
2014-11-16 23:42:40 -06:00
Joe Vennix
a7aeac5df3
Fix APK signing on osx.
2014-11-16 23:29:54 -06:00
Spencer McIntyre
0bf93acf6b
Pymeterp http proxy and user agent support
2014-11-16 14:29:20 -05:00
Joe Vennix
7a62b71839
Some URL fixes from @jduck and exploit ideas from Andre Moulu.
...
The exploit works with the URLs fixed, installs the APK, but hangs at the Installing...
screen and never actually launches. We tried opening the APK in a setTimeout() intent
URI, but the previously launched intent seemed unresponsive. Andre had the bright
idea of re-opening the previously launched intent with invalid args, crashing it and
allow us to launch the payload.
2014-11-15 21:33:16 -06:00
William Vu
a521d469ed
Land #4194 , Quake protocol support
2014-11-15 17:44:19 -06:00
Spencer McIntyre
e562883ba9
Escape inserted vars and fix core_loadlib
2014-11-15 15:06:18 -05:00
sinn3r
d207345778
Land #4200 - report_note handling incorrect protocol names
2014-11-15 13:16:58 -06:00
Luke Imhoff
ceb7a63a5c
Merge branch 'master' into feature/MSP-11147/thread-leak-detection
...
MSP-11147
2014-11-14 18:20:55 -06:00
Spencer McIntyre
7c14e818f6
Patch pymeterp http settings
2014-11-14 17:12:23 -05:00
William Vu
0477c5f8fe
Land #4191 , merge_check_key update for Ruby 2.1.4
2014-11-14 15:33:47 -06:00
Trevor Rosen
3b558624f3
Merge branch 'landing/4129' into upstream-master
...
Landing #4129
* Detect leaked constants in spec runs
2014-11-14 12:55:56 -06:00
Luke Imhoff
43511e648a
Merge branch 'chore/MSP-11614/remove-msf-db-manager-sink' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
Conflicts:
spec/lib/msf/core/task_manager_spec.rb
2014-11-14 11:59:12 -06:00
Luke Imhoff
14fa1dba0b
Merge branch 'master' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
2014-11-14 11:58:16 -06:00
Luke Imhoff
5e6400a506
Remove Msf::TaskManager
...
MSP-11614
`Msf::TaskManager` was only used for `Msf::DBManager#sink`, which was
removed because it was unused, so `Msf::TaskManager` can also be
removed.
2014-11-14 11:15:05 -06:00
Luke Imhoff
55a8f6f339
Remove Msf::DBManager::Sink
...
MSP-11614
`Msf::DBManager::Sink` contains code for a `sink` that is a meant to
serialize database events, but it's unneeded because all database events
go directly through ActiveRecord, which handles threading.
2014-11-14 10:51:51 -06:00
Spencer McIntyre
6b2387b7fc
Prepare for a reverse_http stager
2014-11-14 11:15:22 -05:00
Jon Hart
57aef9a6f5
Land #4177 , @hmoore-r7's fix for #4169
2014-11-13 18:29:57 -08:00
Matt Buck
651beb9acb
Land #4192 , enable specifying mode for Rex output file
2014-11-13 14:57:48 -06:00
Julio Auto
812aa9bc1a
Reduce number of calls to to_s and downcase
2014-11-13 14:56:17 -06:00
Julio Auto
e72d9bd21f
Fix report_note handling incorrect protocol names
2014-11-13 14:30:43 -06:00
Luke Imhoff
eb3ff769a9
Msf::Framework#threads?
...
MSP-11605
`Msf::Framework#threads?` returns whether `Msf::Framework#threads` was
ever initialized. If `Msf::Framework#threads?` is true, then threads
need to be cleaned up, while if it is false then no threads need to be
cleaned up from the current framework.
2014-11-13 14:21:35 -06:00
Luke Imhoff
d9a25005a6
Wrap Msf::Framework#threads in Metasploit::Framework::ThreadFactoryProvider
...
MSP-11605
`Rex::ThreadFactory.provider` needs to be set in
`Msf::Framework#initialize`, but setting it directly to
`Msf::Framework#threads` eliminates the laziness of
`Msf::Framework#threads`. In order keep `framework.threads` lazy,
`framework` is wrapped in a
`Metasploit::Framework::ThreadFactoryProvider`, which responds to
`spawn`, which is needed by `Rex::ThreadFactory`, by calling
`framework.threads.spawn`, which lazily initialized `framework.threads`
when the first thread needs to be spawned.
2014-11-13 14:08:26 -06:00
Luke Imhoff
0bc27334c1
Thread-safe lazy Msf::Framework#db
...
MSP-11605
Switch `Msf:Framework#db` from being set in `#initialize` to a custom
method that uses `||=` to lazily initialize the `Msf::DBManager` inside
a `synchronize` block to make it thread safe.
2014-11-13 13:38:53 -06:00
Luke Imhoff
92adaa816f
Store Msf::Framework#initialize options
...
MSP-11605
Store options `Hash` passed to `Msf::Framework#new` in `#options` so
that lazily initialized children, such as DBManager, have access to
those options.
2014-11-13 13:23:17 -06:00
Luke Imhoff
bc181f0294
Thread-safe lazy Msf::Framework#sessions
...
MSP-11605
Switch `Msf::Framework#sessions` from being set in `#initialize` to a
custom method that uses `||=` to lazily initialize the
`Msf::SessionManager` inside a `synchronize` block to make it thread
safe.
2014-11-13 13:17:57 -06:00
Trevor Rosen
0959ef3d13
Fixes lack of support for MetasploitV5 tag
...
#4184
* Appears to have been overlooked somehow in the pre-BlackHat crunch
* V5 will not support credentials
* We are implementing full-workspace zip import/export for credentials
2014-11-13 13:01:55 -06:00
Luke Imhoff
216c3d01de
Thread-safe lazy Msf::Framework#threads
...
MSP-11605
Switch Msf::Framework#threads to a custom method that uses `||=` to
lazily initialize the `Msf::ThreadManager` inside a `synchronize` block
to make it thread safe.
2014-11-13 11:12:43 -06:00