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

Remove LDAP mail attribute as a requirement for registering an account

Browse Source
This commit is contained in:
Mark Felder 2020-08-05 08:15:57 -05:00
parent b1b6a7dfa8
commit f7146583e5
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,13 +105,10 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do
{:base, to_charlist(base)},
{:filter, :eldap.equalityMatch(to_charlist(uid), to_charlist(name))},
{:scope, :eldap.wholeSubtree()},
{:attributes, ['mail', 'email']},
{:timeout, @search_timeout}
]) do
{:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _}} ->
with {_, [mail]} <- List.keyfind(attributes, 'mail', 0) do
{:ok, {:eldap_search_result, [{:eldap_entry, _, _}], _}} ->
params = %{
email: :erlang.list_to_binary(mail),
name: name,
nickname: name,
password: password,
@ -124,11 +121,6 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do
{:ok, user} -> user
error -> error
end
else
_ ->
Logger.error("Could not find LDAP attribute mail: #{inspect(attributes)}")
{:error, :ldap_registration_missing_attributes}
end
error ->
error

4
test/web/oauth/ldap_authorization_test.exs
View File

@ -72,9 +72,7 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
equalityMatch: fn _type, _value -> :ok end,
wholeSubtree: fn -> :ok end,
search: fn _connection, _options ->
{:ok,
{:eldap_search_result, [{:eldap_entry, '', [{'mail', [to_charlist(user.email)]}]}],
[]}}
{:ok, {:eldap_search_result, [{:eldap_entry, '', []}], []}}
end,
close: fn _connection ->
send(self(), :close_connection)