infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restores proper -u usage

bug/bundler_fix
Joshua Smith 2015-05-28 11:42:33 -05:00 committed by Spencer McIntyre
parent 7d896ba5d2
commit b236187e3f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/request.rb
View File

@ -127,7 +127,12 @@ class Plugin::Requests < Msf::Plugin
when '-o' when '-o'
options[:output_file] = File.expand_path(val) options[:output_file] = File.expand_path(val)
when '-u' when '-u'
options[:auth_username] = val val = val.split(':', 2) # only split on first ':' as per curl:
# from curl man page: "The user name and passwords are split up on the
# first colon, which makes it impossible to use a colon in the user
# name with this option. The password can, still.
options[:auth_username] = val.first
options[:auth_password] = val.last
when '-p' when '-p'
options[:auth_password] = val options[:auth_password] = val
when '-X' when '-X'
@ -186,8 +191,6 @@ class Plugin::Requests < Msf::Plugin
print_error('The connection was reset by the peer') print_error('The connection was reset by the peer')
rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error
print_error('Encountered an error') print_error('Encountered an error')
#rescue ::Exception => ex
# print_line("An error of type #{ex.class} happened, message is #{ex.message}")
ensure ensure
http_client.close http_client.close
end end