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

..

afp

Fix #4592, print_* methods used in LoginScanner modules

2015-02-20 22:46:21 -06:00

api

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

command

Kill defanged mode

2016-03-28 09:02:07 -05:00

core

use and include git hash of Framework as part of the version

2015-07-10 18:03:37 -05:00

database

Restore backup database.yml when retesting after interrupt

2014-08-28 15:20:53 -05:00

ftp

Pass the framework/module down into LoginScanner

2015-02-07 11:50:30 -06:00

jtr

Changes to support framework as a gem

2015-12-30 11:00:45 -06:00

login_scanner

Fix #4885, Support basic and form auth at the same time

2016-05-27 16:25:42 -05:00

mssql

killing threads and closing sockets more elegantly

2016-01-07 17:57:32 -06:00

ntds

move ntds from priv to extapi

2015-06-22 09:04:08 -05:00

parsed_options

Kill defanged mode

2016-03-28 09:02:07 -05:00

spec

Fix #5197, Fixed yard doc errors

2016-04-21 13:06:00 -05:00

tcp

Update Metasploit::Framework::Tcp::Client to have SSLVerifyMode and SSLCipher into account

2015-09-28 13:57:08 -05:00

telnet

Fix telnet

2014-10-21 11:08:41 -05:00

api.rb

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

command.rb

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

common_engine.rb

Logging deprecations to STDERR

2016-02-25 10:59:50 -06:00

community_string_collection.rb

Fix #5197, Fixed yard doc errors

2016-04-21 13:06:00 -05:00

core.rb

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

credential_collection.rb

Correct YARD doc comments

2015-04-02 16:14:25 +05:00

credential.rb

account for public only credentials in #to_s

2015-05-18 13:42:15 -05:00

database.rb

Fix #5197, Fixed yard doc errors

2016-04-21 13:06:00 -05:00

engine.rb

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

login_scanner.rb

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

parsed_options.rb

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

rails_version_constraint.rb

update to rails 4.2.6

2016-04-15 11:45:43 -05:00

require.rb

revert file check

2016-01-21 20:21:41 +01:00

spec.rb

Merge branch 'feature/MSP-11130/metasploit-framework-spec-constants' into feature/MSP-11147/thread-leak-detection

2014-11-05 15:47:59 -06:00

thread_factory_provider.rb

Fix #5197, Fixed yard doc errors

2016-04-21 13:06:00 -05:00

version.rb

Bump version of framework to 4.12.5

2016-05-24 08:54:14 -07:00