c4c5944b25
Merge branch 'staging/rails-upgrade' into staging/MS-888/engines-is-deprecated
...
Conflicts:
Gemfile.lock
metasploit-framework.gemspec
2016-02-26 15:35:34 -06:00
7acba69e37
Land #6577 , add controls for Android ringer
2016-02-26 07:02:49 -06:00
5899b8afc8
make help show up when things are not specified correctly
2016-02-26 06:09:05 -06:00
9010dac7bc
Wrap up the current WIP, still not functional
2016-02-26 05:36:40 +00:00
5bf308e720
WIP checkin
2016-02-26 05:36:40 +00:00
d891e27cdd
Land #6597 , prefer Timeout.timeout since Object#timeout is deprecated
2016-02-25 22:17:49 -06:00
83fad3e328
Add Fortinet backdoor
2016-02-25 21:29:08 -06:00
a87cf02b50
Land #6524 , fix reverse_http to try binding to LHOST first
2016-02-25 20:25:02 -06:00
2e268a25da
Land #6596 , Apache Karaf Login Utility
2016-02-25 14:39:51 -06:00
7e25c7b87b
Handle OpenSSL::Cipher::CipherError
...
Our current net/ssh is petty outdated, so it is possible not being
able to connect to certain SSH servers.
2016-02-25 14:35:37 -06:00
cbc5b296e4
implement engines method locally instead of adding refinement
2016-02-25 11:05:17 -06:00
2ec7149ae7
Logging deprecations to STDERR
2016-02-25 10:59:50 -06:00
58ad2175b8
Raise when no network connection
2016-02-24 18:57:40 -06:00
b32f474e99
Bump version of framework to 4.11.13
2016-02-24 11:37:42 -08:00
d7ba37d2e6
Msf::Exploit::Remote::HttpServer print_* fix
...
Exploit::Remote::HttpServer and every descendant utilizes the
print_prefix method which checks whether the module which mixes in
these modules is aggressive. This is done in a proc context most
of the time since its a callback on the underlying Rex HTTP server.
When modules do not define :aggressive? the resulting exceptions
are quietly swallowed, and requestors get an empty response as the
client object dies off.
Add check for response to :aggressive? in :print_prefix to address
this issue.
2016-02-21 20:20:22 -05:00
3e22de116f
Changes to fix peer and style as recommended by jhart-r7.
2016-02-20 13:53:32 -08:00
cef1b77e26
fixes for android set_audio_mode
2016-02-20 12:01:10 +00:00
b868f7cc89
Bump version of framework to 4.11.12
2016-02-19 20:19:43 -08:00
24530e2734
Scrollable list, tab name change, print_status
2016-02-19 20:46:39 -06:00
72a69fcd16
Fixed timeout warning
2016-02-19 21:14:54 +00:00
9ba82453f8
Land #6584 , cidr notation addition for route command
2016-02-19 12:20:00 -06:00
af33980b72
Load hinfo support, fix broken hinfo code
2016-02-18 23:22:17 -08:00
b409b2237d
update to use the common bind_addresses method
2016-02-18 18:17:56 -06:00
4c716a268d
Set some flags
2016-02-18 16:11:34 -06:00
1e58b1574a
Land #6502 , add -x flag for showing extended sessions info
2016-02-18 15:37:41 -06:00
d316609fef
put extra columns under the -x flag
2016-02-18 15:36:43 -06:00
3beaeceb0e
Special-case bap2
2016-02-18 15:19:39 -06:00
e5ad6fa781
Support "knowledge base"
2016-02-18 15:02:24 -06:00
02834d4251
Add API documentation
2016-02-18 11:44:14 -06:00
68703e1955
Break down DocumenGenerator, fix a bug when opening local md
2016-02-18 10:25:40 -06:00
b5ae4c0322
remove the sleep
2016-02-18 08:33:44 -06:00
a5f3bddfc8
Support RPC API
2016-02-18 00:39:12 -06:00
089d6985b6
Add more demo templates
2016-02-18 00:17:32 -06:00
1bfe1ad140
More demos
2016-02-17 19:04:06 -06:00
76f2c917ee
Allow no GITHUB_OAUTH_TOKEN, and gsub for demo
2016-02-17 15:38:30 -06:00
0b095cf08a
Remove unwanted variable
2016-02-17 15:25:31 -06:00
8b267efa2d
No need to gsub the first 12 spaces anymore
2016-02-17 14:29:33 -06:00
714106174e
Do external erb template
2016-02-17 14:27:29 -06:00
d5c005d948
HTML-escape some fields
2016-02-17 13:56:03 -06:00
5339bb50d8
Support targets
2016-02-17 13:48:24 -06:00
28e6d8ef9e
Allow CIDR notation for the route command
2016-02-17 09:44:32 -06:00
08dff6541d
rm junk code
2016-02-16 23:29:08 -06:00
509a1e8de1
Add manual for demo purposes
2016-02-16 23:18:29 -06:00
b0cfb4aacf
Add info -d to show module documentation in .md
2016-02-16 22:44:03 -06:00
35e0a433ea
Make error output more useful
2016-02-16 14:45:00 -06:00
aff118a3a5
don't send a response on invalid UUID
2016-02-16 09:19:45 -06:00
95484c81fd
Land #6526 , fix browser exploit server spec
2016-02-15 16:23:04 -06:00
1f58ad15ac
Browser::Exploit::Server needs to have vprint*
2016-02-15 16:21:24 -06:00
3d1861b3f4
Land #6526 , integrate {peer} string into logging by default
2016-02-15 15:19:26 -06:00
c5469be59e
Add Android ringer change mode command
2016-02-15 15:07:48 -06:00
Fernando Arias