Fix passing a URL with embedded basic auth (#1324)

.rubocop_todo.yml

@@ -32,7 +32,7 @@ Metrics/AbcSize:
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 226
+  Max: 230
 
 # Offense count: 12
 # Configuration parameters: IgnoredMethods.

lib/faraday/connection.rb

@@ -362,13 +362,18 @@ def url_prefix=(url, encoder = nil)
       uri.query = nil
 
       with_uri_credentials(uri) do |user, password|
-        basic_auth user, password
+        set_basic_auth(user, password)
         uri.user = uri.password = nil
       end
 
       @proxy = proxy_from_env(url) unless @manual_proxy
     end
 
+    def set_basic_auth(user, password)
+      header = Faraday::Utils.basic_header_from(user, password)
+      headers[Faraday::Request::Authorization::KEY] = header
+    end
+
     # Sets the path prefix and ensures that it always has a leading
     # slash.
     #

lib/faraday/request/authorization.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
-
 module Faraday
   class Request
     # Request middleware for the Authorization HTTP header
@@ -34,7 +32,7 @@ def on_request(env)
       # @return [String] a header value
       def header_from(type, *params)
         if type.to_s.casecmp('basic').zero? && params.size == 2
-          basic_header_from(*params)
+          Utils.basic_header_from(*params)
         elsif params.size != 1
           raise ArgumentError, "Unexpected params received (got #{params.size} instead of 1)"
         else
@@ -43,12 +41,6 @@ def header_from(type, *params)
           "#{type} #{value}"
         end
       end
-
-      def basic_header_from(login, pass)
-        value = Base64.encode64("#{login}:#{pass}")
-        value.delete!("\n")
-        "Basic #{value}"
-      end
     end
   end
 end

lib/faraday/utils.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'base64'
 require 'uri'
 require 'faraday/utils/headers'
 require 'faraday/utils/params_hash'
@@ -52,6 +53,12 @@ def default_params_encoder
       @default_params_encoder ||= NestedParamsEncoder
     end
 
+    def basic_header_from(login, pass)
+      value = Base64.encode64("#{login}:#{pass}")
+      value.delete!("\n")
+      "Basic #{value}"
+    end
+
     class << self
       attr_writer :default_params_encoder
     end

spec/faraday/connection_spec.rb

@@ -103,6 +103,12 @@
       it { expect(subject.params).to eq('a' => 3, 'b' => '2') }
     end
 
+    context 'with basic_auth in url' do
+      let(:url) { 'http://Aladdin:open%[email protected]/fish' }
+
+      it { expect(subject.headers['Authorization']).to eq('Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==') }
+    end
+
     context 'with custom headers' do
       let(:options) { { headers: { user_agent: 'Faraday' } } }