Merge branch 'fix/ldap' into 'develop'

Fix LDAP support

See merge request pleroma/pleroma!4168

changelog.d/ldap.fix

@@ -0,0 +1 @@
+Fix LDAP support

lib/pleroma/web/auth/ldap_authenticator.ex

@@ -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

mix.exs

@@ -80,7 +80,8 @@ defmodule Pleroma.Mixfile do
           :comeonin,
           :fast_sanitize,
           :os_mon,
-          :ssl
+          :ssl,
+          :eldap
         ] ++ logger_application(),
       included_applications: [:ex_syslogger]
     ]