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
8c0610cb7a
Merge branch 'master' into feature/MSP-11671/test-optimization
...
MSP-11671
Conflicts:
.travis.yml
2014-12-08 08:46:22 -06:00
564da4446e
Add print friendly to_s
2014-12-07 17:52:09 -06:00
19effa7eb9
Fix feedback's review
2014-12-06 21:47:55 -06:00
21742b6469
Test #3729
2014-12-06 21:20:52 -06:00
2c290e2004
Use classes short name
2014-12-05 20:16:50 -06:00
8f403f3eea
Update documentation
2014-12-05 20:11:45 -06:00
03740df931
Support serialization
2014-12-05 19:55:52 -06:00
785006b684
Use references
2014-12-05 19:12:05 -06:00
ae608b1311
Add references to stream when possible
2014-12-05 17:35:38 -06:00
13d8058fe5
Fill stream attribute
2014-12-05 17:14:37 -06:00
39790a95a0
Land #4313 , @wchen-r7's fix for #4304
2014-12-05 15:08:35 -08:00
ca164cd99f
Support the stream attribute
2014-12-05 16:52:59 -06:00
90e2bbbff5
Refactor Contents
2014-12-05 16:05:35 -06:00
da92e4705c
Land #4319 , @wchen-r7's fix for #4307
2014-12-05 12:08:39 -08:00
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
2241653cb6
Delete self.stream initialization
2014-12-05 12:44:04 -06:00
f5a19b9b41
Add support to decode TC_REFERENCE
2014-12-05 12:42:27 -06:00
abf199f924
Remove junk code
2014-12-05 11:01:34 -06:00
1653101da4
Add support for Arrays of Objects
2014-12-04 20:31:38 -06:00
8e5dc27546
Support Objects with super classes
2014-12-04 19:19:42 -06:00
4b8bdad44b
Refactor contents serialization
2014-12-04 18:28:25 -06:00
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
743e9fca9d
Correctly set default SECRET
2014-12-04 14:06:22 -08:00
1e423f415e
Add missing opt ,
2014-12-04 14:05:17 -08:00
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
f22d7191cd
Test fix for #4305
2014-12-04 10:59:57 -08:00
9cc04e59eb
Fix #4304 - Blank password is tried when it shouldn't happen
...
Fix #4304
2014-12-04 12:59:51 -06:00
08f69da41a
Undo to_s methods
2014-12-04 12:48:05 -06:00
b80f6c34c0
Add tool to deserialize streams from files
2014-12-04 12:47:02 -06:00
d8b1401545
Test fix for #4306
2014-12-03 19:54:31 -08:00
08fe467452
Add Stream specs
2014-12-03 19:31:46 -06:00
2c8f66bba2
Add support for Reset
2014-12-03 18:50:56 -06:00
fb246ac943
Add support for (de)serialization of contents
2014-12-03 18:50:31 -06:00
3e8b8390dd
Add support for Java Streams
2014-12-03 17:59:00 -06:00
6cb6252914
Add YARD documentation for NewObject
2014-12-03 17:34:12 -06:00
d0fcbf2cdb
Add support for simple Objects really
2014-12-03 17:22:23 -06:00
2b91d5013e
Add support for simple Objects
2014-12-03 17:21:11 -06:00
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
fbea369043
Check nils before encoding
2014-12-03 15:06:28 -06:00
0560cc2fe9
Fix typos
2014-12-03 14:59:38 -06:00
268157d42f
Add support for Java Enums
2014-12-03 14:50:03 -06:00
f0139d6aad
Fix some docu typos
2014-12-03 14:34:17 -06:00
0cd51553ed
Raise error on unsupported ClassDesc
2014-12-03 14:00:10 -06:00
6deb88af6b
Add support for arrays
2014-12-03 13:55:12 -06:00
b9023e8fcc
Split ClassDescription into ClassDesc and NewClassDesc
2014-12-03 00:38:27 -06:00
db45f4c620
Delete ClassDescription
2014-12-02 23:56:55 -06:00
1f535a41ca
Move types to the Serialization module
2014-12-02 20:02:42 -06:00
2c070c450b
Add support for ClassDescription
2014-12-02 17:31:53 -06:00
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
e9e584e107
Raise exceptions when unserialization isn't possible
2014-12-02 15:31:31 -06:00
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
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
2a033861dc
Just use constants directly
...
MSP-11673
2014-12-02 13:12:53 -06:00
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
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
fc96d011ab
Python reverse_http stager, lands #4225
2014-12-02 11:47:31 -06:00
622a18bc22
Add support for annotations
2014-12-02 11:42:41 -06:00
9272fe90ae
Merge branch 'master' into bug/MSP-11672/double-init-module-paths
...
MSP-11672
2014-12-02 11:23:51 -06:00
a68540cfa2
Add support for Data Block Long
2014-12-02 10:49:15 -06:00
9c5d7e66d4
Add block data support
2014-12-02 10:46:29 -06:00
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
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
8923b87def
Don't redefine the static decode method
2014-12-02 09:02:24 -06:00
bd3d63a155
Land #4270 , Msf::Author cleanup and improvements
2014-12-02 01:26:42 -06:00
ef2bf5b935
Add support for long-utf
2014-12-01 19:50:33 -06:00
705cd4c308
Add initial requiring file
2014-12-01 19:08:16 -06:00
5f11c70d7f
Add initial support for Java serialization
2014-12-01 19:07:45 -06:00
7e2b197f02
Document Msf::Simple::Framework.create
...
MSP-11671
2014-12-01 15:38:48 -06:00
57cabb4f10
Document Msf::Simple::Framework.simplify
...
MSP-11671
2014-12-01 15:36:38 -06:00
394d132d33
Land #2756 , tincd post-auth BOF exploit
2014-12-01 12:13:37 -06:00
c681654c10
Land #4252 - Rework meterpreter SSL & pass datastore to handle_connection()
2014-11-30 20:15:53 -06:00
f139795663
Rework queue handling and error reporting, close #4249
2014-11-28 14:56:02 -06:00
335d1ef287
Only cache auto-generated certificates
2014-11-26 21:23:08 -06:00
2bd7a67413
Restructure parts of Author, fix some doc bugs.
2014-11-26 13:54:23 -06:00
a34e721353
Check for load errors in reload_all
2014-11-25 13:13:40 -06:00
c0dab54925
Add minor missing doc
2014-11-25 07:37:49 -08:00
bedf7ed44b
Doc cleanup
2014-11-24 14:34:20 -08:00
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
4dc1183ff5
Protecting it once seems like enough (typo)
2014-11-22 17:42:07 -06:00
8becf417a7
Qualify ::File to prevent a stacktrace
2014-11-22 17:16:13 -06:00
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
823b4e259a
Make it clear SSLVersion is not advertised since it isn't used
2014-11-22 14:25:09 -06:00
842a7a38d8
Change SSLCert to HandlerSSLCert to avoid conflicts with modules
2014-11-22 14:23:56 -06:00
9ed8c59459
Bring options over from reverse_tcp (bind address, etc).
...
Also includes the SSLCert => HandlerSSLCert change
2014-11-22 14:22:54 -06:00
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
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
f2add929d7
Land #4239 - Support SSL intermediate certs
2014-11-21 02:09:40 -06:00
e255db9429
Partial commit
2014-11-20 13:49:36 -08:00
5d2c02f402
Initial commit of more OO version of Rex/Aux Kademlia support
2014-11-20 13:28:01 -08:00
94e5ba13a4
YARD and spec cleanup
2014-11-20 13:28:01 -08:00
df36ac910d
Mostly complete Kademlia PING / BOOTSTRAP scanner
2014-11-20 13:28:01 -08:00
f5aa3ecb57
Add proper peer decoding
2014-11-20 13:28:01 -08:00
ab49d01a1b
Add beginnings of Kademlia gather module and protocol support
2014-11-20 13:28:00 -08:00
2f92a83092
Change to example.com as the default domain
2014-11-20 14:53:36 -06:00
d530046164
Bugfix. Chrome is a liar (chain certs properly)
2014-11-19 16:08:03 -06:00
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
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
dff6af0747
Restore timeout
2014-11-18 12:17:10 -08:00
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
Luke Imhoff
jvazquez-r7
Jon Hart
Tod Beardsley
sinn3r
James Lee
Fernando Arias
Trevor Rosen
HD Moore
William Vu
Joe Vennix
Meatballs