lib/diaspora_federation.rb

@@ -128,16 +128,6 @@ module DiasporaFederation
     # @return [String] user agent
     attr_reader :http_user_agent
 
-    # Outbound HTTP proxy
-    #
-    # @overload http_proxy
-    #   @return [String] http proxy
-    # @overload http_proxy=
-    #   @example
-    #     config.http_proxy = AppConfig.environment.http_proxy
-    #   @param [String] value http proxy
-    attr_accessor :http_proxy
-
     # Configure the federation library
     #
     # @example

lib/diaspora_federation/federation/sender/hydra_wrapper.rb

@@ -20,8 +20,7 @@ module DiasporaFederation
             method:         :post,
             verbose:        DiasporaFederation.http_verbose,
             cainfo:         DiasporaFederation.certificate_authorities,
-            forbid_reuse:   true,
-            proxy:          DiasporaFederation.http_proxy
+            forbid_reuse:   true
           }
         end
 

lib/diaspora_federation/http_client.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require "typhoeus"
+require "faraday"
+require "faraday/follow_redirects"
 
 module DiasporaFederation
-  # HTTP GET wrapper
+  # A wrapper for {https://github.com/lostisland/faraday Faraday}
   #
   # @see Discovery::Discovery
   # @see Federation::Fetcher
@@ -11,21 +12,32 @@ module DiasporaFederation
     # Perform a GET request
     #
     # @param [String] uri the URI
-    # @return [Typhoeus::Response] the response
+    # @return [Faraday::Response] the response
     def self.get(uri)
-      opts = {
-        followlocation: false,
-        timeout:        DiasporaFederation.http_timeout,
-        method:         :get,
-        verbose:        DiasporaFederation.http_verbose,
-        cainfo:         DiasporaFederation.certificate_authorities,
-        forbid_reuse:   true,
-        proxy:          DiasporaFederation.http_proxy,
-        headers:        {"User-Agent" => DiasporaFederation.http_user_agent}
+      connection.get(uri)
+    end
+
+    # Gets the Faraday connection
+    #
+    # @return [Faraday::Connection] the response
+    def self.connection
+      create_default_connection unless @connection
+      @connection.dup
+    end
+
+    private_class_method def self.create_default_connection
+      options = {
+        request: {timeout: DiasporaFederation.http_timeout},
+        ssl:     {ca_file: DiasporaFederation.certificate_authorities}
       }
-      req = Typhoeus::Request.new(uri, opts)
-      req.run
-      req.response
+
+      @connection = Faraday::Connection.new(options) do |builder|
+        builder.use Faraday::FollowRedirects::Middleware, limit: DiasporaFederation.http_redirect_limit
+
+        builder.adapter Faraday.default_adapter
+      end
+
+      @connection.headers["User-Agent"] = DiasporaFederation.http_user_agent
     end
   end
 end

spec/lib/diaspora_federation/http_client_spec.rb

@@ -34,7 +34,7 @@ module DiasporaFederation
           .to_return(status: 302, headers: {"Location" => "http://www.example.com"})
 
         expect { HttpClient.get("http://www.example.com") }
-          .to_return(success: false, return_code: :too_many_redirects)
+          .to raise_error Faraday::FollowRedirects::RedirectLimitReached
       end
 
       it "uses the gem name as User-Agent" do
@@ -44,5 +44,16 @@ module DiasporaFederation
         HttpClient.get("http://www.example.com")
       end
     end
+
+    describe ".connection" do
+      it "returns a new connection every time" do
+        expect(HttpClient.connection).to be_a Faraday::Connection
+      end
+
+      it "returns a new connection every time" do
+        connection1 = HttpClient.connection
+        expect(HttpClient.connection).to_not be(connection1)
+      end
+    end
   end
 end