diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-12-14 19:49:16 +0900 |
---|---|---|
committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-12-15 16:41:10 +0900 |
commit | 38002a8adbd98266426940d829429a30af0622a4 (patch) | |
tree | db01bcc2653ba0230a07345c4a3c877246dfe473 /lib/bundler/uri_credentials_filter.rb | |
parent | e2b192f7d5b4f0e2133bb6cf03cfc609258826be (diff) |
Prepare to release bundler-2.1.0
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2753
Diffstat (limited to 'lib/bundler/uri_credentials_filter.rb')
-rw-r--r-- | lib/bundler/uri_credentials_filter.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/bundler/uri_credentials_filter.rb b/lib/bundler/uri_credentials_filter.rb index ee3692268c..9b9e9c2799 100644 --- a/lib/bundler/uri_credentials_filter.rb +++ b/lib/bundler/uri_credentials_filter.rb @@ -7,7 +7,11 @@ module Bundler def credential_filtered_uri(uri_to_anonymize) return uri_to_anonymize if uri_to_anonymize.nil? uri = uri_to_anonymize.dup - uri = URI(uri.to_s) unless uri.is_a?(URI) + if uri.is_a?(String) + require_relative "vendored_uri" + uri = Bundler::URI(uri) + end + if uri.userinfo # oauth authentication if uri.password == "x-oauth-basic" || uri.password == "x" @@ -17,9 +21,9 @@ module Bundler end uri.password = nil end - return uri if uri_to_anonymize.is_a?(URI) return uri.to_s if uri_to_anonymize.is_a?(String) - rescue URI::InvalidURIError # uri is not canonical uri scheme + uri + rescue Bundler::URI::InvalidURIError # uri is not canonical uri scheme uri end |