Merge branch 'fix/emudhra-ca-trust' (#77) into release/2.11

# Conflicts:
#	lib/pleroma/http/adapter_helper/hackney.ex
#	mix.lock

test/pleroma/emails/mailer_test.exs

@@ -52,4 +52,13 @@ defmodule Pleroma.Emails.MailerTest do
       subject: "Pleroma test email"
     )
   end
+
+  test "keeps certificate checks for HTTP API adapters" do
+    Mailer.deliver(@email)
+
+    assert_received {:email, %Swoosh.Email{private: %{hackney_options: hackney_options}}}
+
+    assert hackney_options[:ssl_options] ==
+             Pleroma.HTTP.TLS.ssl_options()
+  end
 end

test/pleroma/http/adapter_helper/hackney_test.exs

@@ -46,5 +46,20 @@ defmodule Pleroma.HTTP.AdapterHelper.HackneyTest do
       assert opts[:b] == 1
       refute Keyword.has_key?(opts, :proxy)
     end
+
+    test "trusts the CAStore bundle", %{uri: uri} do
+      opts = Hackney.options([], uri)
+
+      assert opts[:ssl_options] == Pleroma.HTTP.TLS.ssl_options()
+    end
+
+    test "keeps the CAStore bundle with configured ssl_options", %{uri: uri} do
+      clear_config([:http, :adapter], ssl_options: [versions: [:"tlsv1.2"]])
+
+      opts = Hackney.options([], uri)
+
+      assert opts[:ssl_options][:versions] == [:"tlsv1.2"]
+      assert opts[:ssl_options][:cacertfile] == CAStore.file_path()
+    end
   end
 end

test/pleroma/http/tls_test.exs

@@ -0,0 +1,53 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.HTTP.TLSTest do
+  use ExUnit.Case, async: true
+
+  alias Pleroma.HTTP.TLS
+
+  describe "ssl_options/1" do
+    test "verifies peers against the CAStore bundle" do
+      opts = TLS.ssl_options()
+
+      assert opts[:verify] == :verify_peer
+      assert opts[:cacertfile] == CAStore.file_path()
+      assert [match_fun: match_fun] = opts[:customize_hostname_check]
+      assert is_function(match_fun, 2)
+    end
+
+    test "does not accept certificates from the peer chain as trust anchors" do
+      partial_chain = TLS.ssl_options()[:partial_chain]
+
+      assert partial_chain.([:certificate]) == :unknown_ca
+    end
+
+    test "keeps the CA bundle when other options are given" do
+      opts = TLS.ssl_options(versions: [:"tlsv1.2"])
+
+      assert opts[:versions] == [:"tlsv1.2"]
+      assert opts[:cacertfile] == CAStore.file_path()
+      assert opts[:verify] == :verify_peer
+    end
+  end
+
+  describe "put_hackney_ssl_options/1" do
+    test "adds the TLS options" do
+      opts = TLS.put_hackney_ssl_options(pool: :media)
+
+      assert opts[:pool] == :media
+      assert opts[:ssl_options] == TLS.ssl_options()
+    end
+
+    test "merges given ssl_options into the TLS options" do
+      opts = TLS.put_hackney_ssl_options(ssl_options: [versions: [:"tlsv1.2"]])
+
+      assert opts[:ssl_options] == TLS.ssl_options(versions: [:"tlsv1.2"])
+    end
+
+    test "leaves insecure requests alone" do
+      assert TLS.put_hackney_ssl_options(insecure: true) == [insecure: true]
+    end
+  end
+end

test/pleroma/user_test.exs

@@ -531,9 +531,9 @@ defmodule Pleroma.UserTest do
       ObanHelpers.perform_all()
 
       Pleroma.Emails.UserEmail.account_confirmation_email(registered_user)
-      # temporary hackney fix until hackney max_connections bug is fixed
-      # https://git.pleroma.social/pleroma/pleroma/-/issues/2101
-      |> Swoosh.Email.put_private(:hackney_options, ssl_options: [versions: [:"tlsv1.2"]])
+      |> Swoosh.Email.put_private(:hackney_options,
+        ssl_options: Pleroma.HTTP.TLS.ssl_options()
+      )
       |> assert_email_sent()
     end
 

test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs

@@ -1042,9 +1042,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
       ObanHelpers.perform_all()
 
       Pleroma.Emails.UserEmail.account_confirmation_email(first_user)
-      # temporary hackney fix until hackney max_connections bug is fixed
-      # https://git.pleroma.social/pleroma/pleroma/-/issues/2101
-      |> Swoosh.Email.put_private(:hackney_options, ssl_options: [versions: [:"tlsv1.2"]])
+      |> Swoosh.Email.put_private(:hackney_options,
+        ssl_options: Pleroma.HTTP.TLS.ssl_options()
+      )
       |> assert_email_sent()
     end