Commit Graph

1940 Commits

Author SHA1 Message Date
James Lee b3f59ebd19 Whitespace 2016-06-22 10:15:23 -05:00
James Lee 07f7e5e148 Convert non-loginscanner MSSQL to rubyntlm 2016-06-22 10:15:22 -05:00
James Lee 4b3f6c5d29 Use rubyntlm for mssql login scanner 2016-06-22 10:15:22 -05:00
Metasploit fd4a51cadb Bump version of framework to 4.12.8 2016-06-10 10:01:27 -07:00
Metasploit 815685992a Bump version of framework to 4.12.7 2016-06-07 13:14:34 -07:00
Metasploit c35322ec3f Bump version of framework to 4.12.6 2016-05-30 22:34:13 -07:00
wchen-r7 4dcddb2399 Fix #4885, Support basic and form auth at the same time
When a module uses the HttpClient mixin but registers the USERNAME
and PASSWORD datastore options in order to perform a form auth,
it ruins the ability to also perform a basic auth (sometimes it's
possible to see both). To avoid option naming conflicts, basic auth
options are now HTTPUSERNAME and HTTPPASSWORD.

Fix #4885
2016-05-27 16:25:42 -05:00
Metasploit 54f4389d31 Bump version of framework to 4.12.5 2016-05-24 08:54:14 -07:00
Metasploit 100300c819 Bump version of framework to 4.12.4 2016-05-18 07:04:09 -07:00
Jenkins c9dd863085 Bump version of framework to 4.12.3 2016-05-17 10:18:08 -07:00
Jenkins 621a908b2d Bump version of framework to 4.12.2 2016-05-13 12:51:58 -07:00
David Maloney ba4bfca806 Revert "arg bad build, resetting version back one"
This reverts commit d86392e96b.
2016-05-13 14:48:35 -05:00
David Maloney d86392e96b arg bad build, resetting version back one 2016-05-13 14:44:02 -05:00
Jenkins b6a83f734d Bump version of framework to 4.12.1 2016-05-13 12:39:43 -07:00
David Maloney 31050a8da7 Rails upgrade to 4.2.6
lands all of the rails 4.2 upgrade work
Merge branch 'staging/rails-upgrade'
2016-05-13 14:34:50 -05:00
Jenkins 6c11054d5a Bump version of framework to 4.12.0 2016-05-13 11:46:03 -07:00
David Maloney 6142d2cef1 Merge branch 'master' into staging/rails-upgrade 2016-05-09 09:27:17 -05:00
Jenkins 805f98f599 Bump version of framework to 4.11.27 2016-05-06 11:32:46 -07:00
David Maloney 19af279ce9 Merge branch 'master' into staging/rails-upgrade 2016-05-05 10:46:12 -05:00
Jenkins e7ff4665e1 Bump version of framework to 4.11.26 2016-05-04 09:44:18 -07:00
Jenkins 7490ab1c78 Bump version of framework to 4.11.25 2016-05-03 17:09:07 -07:00
David Maloney fb5b228984 Merge branch 'master' into staging/rails-upgrade 2016-05-02 11:33:35 -05:00
Jenkins d4f1c78c5c Bump version of framework to 4.11.24 2016-04-29 13:38:06 -07:00
Jenkins d70dcbf4a4 Bump version of framework to 4.11.23 2016-04-22 09:34:10 -07:00
thao doan 5e36a3128c Fix #5197, Fixed yard doc errors
Fix #5197 Fixed issues that caused errors during yard doc generation
2016-04-21 13:06:00 -05:00
Metasploit d5085f6f0d Bump version of framework to 4.11.22 2016-04-16 09:09:23 -07:00
David Maloney c52f3dcb0e update to rails 4.2.6
fix lost dep unlocks and upgrade rails to 4.2.6

MS-1400
2016-04-15 11:45:43 -05:00
Metasploit 16c599866c Bump version of framework to 4.11.21 2016-04-08 16:23:33 -07:00
William Vu 22d08fdf39 Revert #6748, premature Gemfile* changes 2016-04-06 14:52:22 -05:00
David Maloney 8de58e4b80 Merge branch 'master' into staging/rails-upgrade 2016-04-04 09:30:01 -05:00
wchen-r7 545cb11736 Bring #6409 up to date with upstream-master 2016-03-31 17:00:56 -05:00
wchen-r7 5fdea91e93 Change naming 2016-03-31 17:00:29 -05:00
wchen-r7 797acd625d Land #6714, Kill defanged mode 2016-03-30 10:54:56 -05:00
Brent Cook b8d53dde4a Merge branch 'upstream-master' into staging/rails-upgrade 2016-03-29 15:56:50 -05:00
Metasploit b41ac10fe8 Bump version of framework to 4.11.20 2016-03-29 12:43:20 -07:00
wchen-r7 faaaf6b765 MS10-58 Call super in #set_sane_defaults for caidao login scanner
MS10-58
2016-03-29 13:40:51 -05:00
James Lee f1857d6350 Kill defanged mode 2016-03-28 09:02:07 -05:00
Metasploit 72bde63397 Bump version of framework to 4.11.19 2016-03-25 13:03:35 -07:00
Gregory Mikeska 7bd6d0c696 Merge branch 'master' into staging/rails-upgrade 2016-03-24 12:55:05 -05:00
Metasploit e7b0c60e5c Bump version of framework to 4.11.18 2016-03-23 07:55:29 -07:00
Metasploit 6e12e74e02 Bump version of framework to 4.11.17 2016-03-18 14:12:18 -07:00
Metasploit e059f42094 Bump version of framework to 4.11.16 2016-03-11 14:17:28 -08:00
David Maloney ca18996272 setup rails staging branch
rails 4.1 baby!
2016-03-09 15:35:00 -06:00
David Maloney 88697a5d3f Merge branch 'master' into staging/rails-upgrade 2016-03-08 15:22:04 -06:00
Metasploit a5cdd7e17f Bump version of framework to 4.11.15 2016-03-04 16:56:02 -08:00
Metasploit ce675330c0 Bump version of framework to 4.11.14 2016-03-04 14:49:55 -08:00
wchen-r7 2e268a25da Land #6596, Apache Karaf Login Utility 2016-02-25 14:39:51 -06:00
wchen-r7 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
darkbushido 2ec7149ae7 Logging deprecations to STDERR 2016-02-25 10:59:50 -06:00
Metasploit b32f474e99 Bump version of framework to 4.11.13 2016-02-24 11:37:42 -08:00