Skip to content

Commit

Permalink
Use explicit ssl peer verification when connecting to LDAP
Browse files Browse the repository at this point in the history
  • Loading branch information
mbklein committed Sep 27, 2023
1 parent 282024e commit 2f073c7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
22 changes: 14 additions & 8 deletions app/lib/meadow/accounts/ldap.ex
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,26 @@ defmodule Meadow.Accounts.Ldap do
@connect_timeout 1500
@retries 3
@ldap_matching_rule_in_chain "1.2.840.113556.1.4.1941"
@sslopts [cacertfile: :certifi.cacertfile(), verify: :verify_peer]

def connection(force_new \\ false) do
if force_new, do: Meadow.Cache |> Cachex.del(:ldap_address)

settings =
with config <- Application.get_env(:exldap, :settings) do
Keyword.put(config, :server, connection_address(config))
end

case {Exldap.connect(settings, @connect_timeout), force_new} do
case {connection_settings() |> Exldap.connect(@connect_timeout), force_new} do
{{:ok, result}, _} -> result
{_, false} -> connection(true)
{other, true} -> other
end
end

def connection_settings do
with config <- Application.get_env(:exldap, :settings) |> address_to_ip() do
if Keyword.get(config, :ssl, false),
do: Keyword.put(config, :sslopts, @sslopts),
else: config
end
end

@doc "Find a user entry by its common name (NetID)"
def find_user(cn) do
find_user_func = fn ->
Expand Down Expand Up @@ -172,7 +176,7 @@ defmodule Meadow.Accounts.Ldap do

@doc "Add a member to a group"
def add_member(group_dn, member_dn) do
with operation <- :eldap.mod_add('member', [to_charlist(member_dn)]) do
with operation <- :eldap.mod_add(~c"member", [to_charlist(member_dn)]) do
case modify_entry(group_dn, operation) do
{:ok, _} -> :ok
{:exists, _} -> :exists
Expand All @@ -183,7 +187,7 @@ defmodule Meadow.Accounts.Ldap do

@doc "Remove a member from a group"
def remove_member(group_dn, member_dn) do
with operation <- :eldap.mod_delete('member', [to_charlist(member_dn)]) do
with operation <- :eldap.mod_delete(~c"member", [to_charlist(member_dn)]) do
case modify_entry(group_dn, operation) do
{:ok, _} -> :ok
other -> other
Expand All @@ -207,6 +211,8 @@ defmodule Meadow.Accounts.Ldap do
end
end

defp address_to_ip(config), do: Keyword.put(config, :server, connection_address(config))

defp connection_address(config) do
find_connection = fn tuple ->
case tuple |> :gen_tcp.connect(config[:port], [:inet]) do
Expand Down
2 changes: 1 addition & 1 deletion app/lib/mix/tasks/pipeline.ex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defmodule Mix.Tasks.Meadow.Pipeline.Setup do
@shortdoc @moduledoc
def run(_) do
if Meadow.Config.environment?(:prod) or System.get_env("AWS_DEV_ENVIRONMENT") do
Logger.warn("Not in localstack environment – queue creation skipped")
Logger.warning("Not in localstack environment – queue creation skipped")
else
[:ex_aws, :hackney] |> Enum.each(&Application.ensure_all_started/1)

Expand Down

0 comments on commit 2f073c7

Please sign in to comment.