Luke Imhoff
88839e841a
Extract 'all modules with module type can be instantiated' shared example
...
MSP-11145
Extracted so it can be used by pro.
2014-10-23 09:31:44 -05:00
Joshua Smith
f19b093529
cleans & DRYs exploit/exe & util/exe & msfpayload
2014-10-23 01:10:38 -05:00
Jon Hart
83df08aaa7
Properly encode body and catch invalid configs
2014-10-22 22:43:06 -07:00
Jon Hart
c765100efd
Land #4004 , @martinvigo's LastPass master password extraction module
2014-10-22 16:34:54 -07:00
Jon Hart
29b61984c5
Update to use correctly joined path
2014-10-22 16:34:17 -07:00
sinn3r
42cd288bc0
Land #4057 - Bring back TCP::max_send_size and TCP::send_delay options
...
Fix #3967
2014-10-22 16:23:15 -05:00
sinn3r
0ea03c00a5
Use print_brute instead of print_good for format consistency
2014-10-22 16:14:45 -05:00
James Lee
a5a84886ee
Make sure vnc closes the socket
2014-10-22 15:53:05 -05:00
HD Moore
e479a6308c
Update session.shell_upgrade to match #3401 , lands #4058
2014-10-22 15:26:33 -05:00
Tim Wright
7f7f257426
fix session.shell_upgrade after #3401
2014-10-22 21:22:10 +01:00
Tim Wright
c488e40959
Land #3401 , shell to meterpreter upgrade by @TomSellers
...
Merge branch 'landing-3401' into upstream-master
2014-10-22 20:51:18 +01:00
Tim Wright
6d04c46897
delete the old script
2014-10-22 20:49:21 +01:00
Tim Wright
b8c3fadb9e
python 3 is supported now too :)
2014-10-22 20:10:48 +01:00
Tim Wright
8c3c73a72d
inline the error message
2014-10-22 20:08:14 +01:00
Tim Wright
2ab73688dc
use framework.threads to launch cleanup thread
2014-10-22 19:40:29 +01:00
Tim Wright
22fc6496ac
Merge branch 'pr/3401' into landing-3401
2014-10-22 19:23:01 +01:00
Jon Hart
ce8a9941ea
Cleanup. Sanity check in setup. vprint
2014-10-22 10:36:24 -07:00
Jon Hart
7b33ff1363
Land #3767 , @jvazquez-r7's specs for Rex::Encoder::XDR
2014-10-22 09:22:53 -07:00
James Lee
bb119b840a
Move Tcp specs into their own shared example
...
All the Tcp options formerly in RexSocket got moved, this just brings
the specs in line with the new reality.
2014-10-22 09:16:14 -05:00
James Lee
46acf08e2d
Merge remote-tracking branch 'upstream/master' into bug/msp-11497/loginscanner-tcp-evasions
2014-10-22 09:09:34 -05:00
nstarke
ee3dd3a2ac
More Fixes for WD MyBook Live Scanner
...
Fixes include removing deregistered options
from credentials collection object and adding proof
when there is no response
2014-10-22 03:06:21 +00:00
James Lee
0fcd1ac4f6
Restore tcp evasions to smb_login
2014-10-21 18:59:11 -05:00
James Lee
e1a7e902d6
Re-enable tcp evasions for more LoginScanners
...
Untested since I don't have targets for these.
2014-10-21 18:58:28 -05:00
jvazquez-r7
3bffd24e61
Land #4056 , @wchen-r7's fix for Loginscanner specs
2014-10-21 17:37:30 -05:00
sinn3r
49b088d112
Use be_a
2014-10-21 17:15:54 -05:00
sinn3r
9de1c95b22
It's Connection timed out
2014-10-21 16:53:47 -05:00
sinn3r
d1881108cf
Fix db2 rspec
2014-10-21 16:35:20 -05:00
sinn3r
b5d536d165
Fix mysql rspec
2014-10-21 16:34:10 -05:00
sinn3r
ebbfa56f24
Land #4052 - Fix Proxies datastore option for LoginScanners
...
Fixes #3836
Fixes #3959
Fixes #3963
2014-10-21 15:43:22 -05:00
sinn3r
6d11ec8477
These mods support Proxies, so make the option visible for the user
2014-10-21 15:39:24 -05:00
Luke Imhoff
f66c714105
Clear log/untested-payloads.log
...
MSP-11145
Delete log/untested-payloads.log when all payloads are tested so that
`rake spec` does not exist 1 when it should exit 0.
2014-10-21 13:53:48 -05:00
sinn3r
db7c420d8d
Merge the latest changes
2014-10-21 13:49:42 -05:00
Luke Imhoff
da450f49a4
Fail rake spec if untested payloads
...
MSP-11145
Add action to spec task that will cause spec to exit(1) if
log/untested-payloads.log exists. The untested payloads are then
printed with instructions of which spec to update.
2014-10-21 13:46:39 -05:00
James Lee
f9f8c413a8
Derp, ssh modules don't include Tcp for #proxies
2014-10-21 13:28:13 -05:00
Luke Imhoff
003d8547c4
Failing with untested payloads to log
...
MSP-11145
Log untested payloads to log/untested-payloads.log.
2014-10-21 13:23:15 -05:00
sinn3r
79d393c5aa
Resolve merge conflicts
...
Conflicts:
lib/msf/core/exploit/smb.rb
lib/msf/core/exploit/tcp.rb
modules/auxiliary/scanner/http/axis_login.rb
2014-10-21 13:06:35 -05:00
Luke Imhoff
8f3e064e0b
Connect actual_ancestor_reference_names to tests
...
MSP-11145
2014-10-21 12:56:59 -05:00
Luke Imhoff
653c5ccf4a
Log untested payloads to stderr
...
MSP-11145
This commit is a proof that the logger works. It does no connect the
adding tested payloads reference names to the
actual_ancestor_reference_name_set to show that the logger is working.
2014-10-21 12:44:01 -05:00
James Lee
83b1d270cd
Fix ftp and mssql
2014-10-21 11:09:39 -05:00
James Lee
8b2dcac730
Fix telnet
2014-10-21 11:08:41 -05:00
James Lee
4705aeb762
Restore tcp evasions to ftp, pop3, vnc
2014-10-21 11:06:55 -05:00
Luke Imhoff
162c62f205
Fix ancestor reference names in spec
...
MSP-11145
ancestor_reference_name derivation was using the source_location of
initialize, but that didn't work for payload modules whose #initialize
was only in mixin Modules.
2014-10-21 10:26:28 -05:00
James Lee
7d150ce0dd
Add tcp evasions to mysql
2014-10-21 10:05:18 -05:00
James Lee
2fcb1004fb
Move tcp options to Tcp::Client out of RexSocket
2014-10-21 09:59:26 -05:00
James Lee
e76ee294a1
Restore tcp evasions to telnet
2014-10-21 09:44:55 -05:00
Luke Imhoff
9dfbbbde7d
Add missing require
...
MSP-11145
2014-10-21 09:39:31 -05:00
Luke Imhoff
556bf361a2
Failing payloads spec
...
MSP-11145
Spec fails due to missing requires.
2014-10-21 09:33:01 -05:00
James Lee
cb9a77c06b
Fix NoMethodError when unable to connect
...
Derp.
2014-10-21 08:58:45 -05:00
James Lee
6f3b26f5e9
Remove tcp evasions from Http
...
Can't use 'em anyway
2014-10-21 08:27:29 -05:00
nstarke
82b74d5f3c
Fixes to MyBook Live Module
...
This commit contains three fixes as requested on PR
#4003 . Those include:
+ Removing extraneous puts statement
+ Checking for valid response
+ SSL support.
2014-10-21 00:50:40 +00:00