summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2024-09-18 11:16:16 -0400
committerMark Felder <feld@feld.me>2024-09-18 11:58:52 -0400
commit73204c1bca740dbca5c780891fc720ac728c11a6 (patch)
tree481a871e2d6608c583425229b3ea96c5b955e6f7
parent8776d31794b2a6523dd07a950f355920d2ec1192 (diff)
downloadpleroma-73204c1bca740dbca5c780891fc720ac728c11a6.tar.gz
pleroma-73204c1bca740dbca5c780891fc720ac728c11a6.zip
LDAP: fix compile warning
Sometimes the compile will emit the following warning, so we'll just avoid it by making it call a function in the LDAP module which will never have this problem. warning: :GenServer.call/2 is undefined (module :GenServer is not available or is yet to be defined)
-rw-r--r--changelog.d/ldap-warning.skip0
-rw-r--r--lib/pleroma/ldap.ex4
-rw-r--r--lib/pleroma/web/auth/ldap_authenticator.ex3
3 files changed, 6 insertions, 1 deletions
diff --git a/changelog.d/ldap-warning.skip b/changelog.d/ldap-warning.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/ldap-warning.skip
diff --git a/lib/pleroma/ldap.ex b/lib/pleroma/ldap.ex
index cd84dee02..46a2d0c17 100644
--- a/lib/pleroma/ldap.ex
+++ b/lib/pleroma/ldap.ex
@@ -94,6 +94,10 @@ defmodule Pleroma.LDAP do
:ok
end
+ def bind_user(name, password) do
+ GenServer.call(__MODULE__, {:bind_user, name, password})
+ end
+
defp connect do
ldap = Config.get(:ldap, [])
host = Keyword.get(ldap, :host, "localhost")
diff --git a/lib/pleroma/web/auth/ldap_authenticator.ex b/lib/pleroma/web/auth/ldap_authenticator.ex
index c420c8bc3..7eb06183d 100644
--- a/lib/pleroma/web/auth/ldap_authenticator.ex
+++ b/lib/pleroma/web/auth/ldap_authenticator.ex
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Auth.LDAPAuthenticator do
+ alias Pleroma.LDAP
alias Pleroma.User
import Pleroma.Web.Auth.Helpers, only: [fetch_credentials: 1]
@@ -19,7 +20,7 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do
def get_user(%Plug.Conn{} = conn) do
with {:ldap, true} <- {:ldap, Pleroma.Config.get([:ldap, :enabled])},
{:ok, {name, password}} <- fetch_credentials(conn),
- %User{} = user <- GenServer.call(Pleroma.LDAP, {:bind_user, name, password}) do
+ %User{} = user <- LDAP.bind_user(name, password) do
{:ok, user}
else
{:ldap, _} ->