Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix automatic LDAP account registration on OTP 24.3+

Browse Source
This commit is contained in:
Mark Felder 2024-07-01 15:58:15 -04:00
parent e1981264a3
commit 3127c5f0af
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/pleroma/web/auth/ldap_authenticator.ex
View File

@ -102,7 +102,20 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do
{:scope, :eldap.wholeSubtree()},
{:timeout, @search_timeout}
]) do
{:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _}} ->
# The :eldap_search_result record structure changed in OTP 24.3 and added a controls field
# https://github.com/erlang/otp/pull/5538
{:ok, {:eldap_search_result, [{:eldap_entry, _object, attributes}], _referrals}} ->
try_register(name, attributes)
{:ok, {:eldap_search_result, [{:eldap_entry, _object, attributes}], _referrals, _controls}} ->
try_register(name, attributes)
error ->
error
end
end
defp try_register(name, attributes) do
params = %{
name: name,
nickname: name,
@ -121,9 +134,5 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do
{:ok, user} -> user
error -> error
end
error ->
error
end
end
end