Merge branch 'fix/emudhra-ca-trust' (#77) into release/2.11
This commit is contained in:
commit
fc91131892
6 changed files with 100 additions and 4 deletions
|
|
@ -61,4 +61,33 @@ defmodule Pleroma.Emails.MailerTest do
|
|||
assert hackney_options[:ssl_options] ==
|
||||
Pleroma.HTTP.TLS.ssl_options()
|
||||
end
|
||||
|
||||
describe "put_mua_cacertfile/1" do
|
||||
test "makes Mua trust the CAStore bundle" do
|
||||
config = Mailer.put_mua_cacertfile(adapter: Swoosh.Adapters.Mua, relay: "mail.example.com")
|
||||
|
||||
assert config[:ssl] == [cacertfile: CAStore.file_path()]
|
||||
assert config[:relay] == "mail.example.com"
|
||||
end
|
||||
|
||||
test "keeps other ssl options" do
|
||||
config = Mailer.put_mua_cacertfile(adapter: Swoosh.Adapters.Mua, ssl: [depth: 3])
|
||||
|
||||
assert config[:ssl] == [cacertfile: CAStore.file_path(), depth: 3]
|
||||
end
|
||||
|
||||
test "keeps a CA that the admin set" do
|
||||
config = [adapter: Swoosh.Adapters.Mua, ssl: [cacertfile: "/etc/ssl/smtp.pem"]]
|
||||
assert Mailer.put_mua_cacertfile(config) == config
|
||||
|
||||
config = [adapter: Swoosh.Adapters.Mua, ssl: [cacerts: []]]
|
||||
assert Mailer.put_mua_cacertfile(config) == config
|
||||
end
|
||||
|
||||
test "leaves other adapters alone" do
|
||||
config = [adapter: Swoosh.Adapters.SMTP, relay: "mail.example.com"]
|
||||
|
||||
assert Mailer.put_mua_cacertfile(config) == config
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
34
test/pleroma/http/adapter_helper/tesla_adapter_test.exs
Normal file
34
test/pleroma/http/adapter_helper/tesla_adapter_test.exs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
# Pleroma: A lightweight social networking server
|
||||
# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
|
||||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
defmodule Pleroma.HTTP.AdapterHelper.TeslaAdapterTest do
|
||||
use ExUnit.Case, async: false
|
||||
|
||||
alias Pleroma.HTTP.AdapterHelper
|
||||
alias Pleroma.HTTP.TLS
|
||||
|
||||
setup do
|
||||
adapter = Application.get_env(:tesla, :adapter)
|
||||
on_exit(fn -> Application.put_env(:tesla, :adapter, adapter) end)
|
||||
end
|
||||
|
||||
test "adds the TLS options to Hackney" do
|
||||
Application.put_env(:tesla, :adapter, Tesla.Adapter.Hackney)
|
||||
|
||||
assert AdapterHelper.tesla_adapter() ==
|
||||
{Tesla.Adapter.Hackney, ssl_options: TLS.ssl_options()}
|
||||
end
|
||||
|
||||
test "turns on certificate checks for Gun" do
|
||||
Application.put_env(:tesla, :adapter, Tesla.Adapter.Gun)
|
||||
|
||||
assert AdapterHelper.tesla_adapter() == {Tesla.Adapter.Gun, certificates_verification: true}
|
||||
end
|
||||
|
||||
test "keeps other adapters" do
|
||||
Application.put_env(:tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch})
|
||||
|
||||
assert AdapterHelper.tesla_adapter() == {Tesla.Adapter.Finch, name: MyFinch}
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue