potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'mobilizon-fix-ldap'

Browse source
This commit is contained in:
Thomas Citharel 2023-01-16 10:07:15 +01:00
parent 402820bae0 ae05832cb5
commit 01bf7261cd
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/service/auth/ldap_authenticator.ex
View file

@ -132,9 +132,11 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticator do
) :: ) ::
String.t() | {:error, :ldap_registration_missing_attributes} | any() String.t() | {:error, :ldap_registration_missing_attributes} | any()
defp search_user(connection, ldap, base, uid, email, group) do defp search_user(connection, ldap, base, uid, email, group) do
Logger.debug("Searching for user")
# We may need to bind before performing the search # We may need to bind before performing the search
res = res =
if Keyword.get(ldap, :require_bind_for_search, true) do if Keyword.get(ldap, :require_bind_for_search, true) do
Logger.debug("Doing binding before search as it's required")
admin_field = Keyword.get(ldap, :bind_uid) admin_field = Keyword.get(ldap, :bind_uid)
admin_password = Keyword.get(ldap, :bind_password) admin_password = Keyword.get(ldap, :bind_password)
bind_user(connection, base, uid, admin_field, admin_password) bind_user(connection, base, uid, admin_field, admin_password)
@ -153,7 +155,8 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticator do
@spec do_search_user(any(), String.t(), String.t(), String.t(), String.t() | boolean()) :: @spec do_search_user(any(), String.t(), String.t(), String.t(), String.t() | boolean()) ::
String.t() | {:error, :ldap_registration_missing_attributes} | any() String.t() | {:error, :ldap_registration_missing_attributes} | any()
defp do_search_user(connection, base, uid, email, group) do defp do_search_user(connection, base, uid, email, group) do
with {:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _}} <- Logger.debug("Searching user")
with {:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _, _}} <-
:eldap.search(connection, [ :eldap.search(connection, [
{:base, to_charlist(base)}, {:base, to_charlist(base)},
{:filter, search_filter(email, group)}, {:filter, search_filter(email, group)},