diff options
| -rw-r--r-- | changelog.d/deps-poison-test-only.skip | 0 | ||||
| -rw-r--r-- | changelog.d/ldap-error-logging.change | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/auth/ldap_authenticator.ex | 6 | ||||
| -rw-r--r-- | mix.exs | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/changelog.d/deps-poison-test-only.skip b/changelog.d/deps-poison-test-only.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/deps-poison-test-only.skip diff --git a/changelog.d/ldap-error-logging.change b/changelog.d/ldap-error-logging.change new file mode 100644 index 000000000..56f0e7fc3 --- /dev/null +++ b/changelog.d/ldap-error-logging.change @@ -0,0 +1 @@ +Improve error logging when LDAP authentication fails. diff --git a/lib/pleroma/web/auth/ldap_authenticator.ex b/lib/pleroma/web/auth/ldap_authenticator.ex index c2c5eb1e5..ea5620cf6 100644 --- a/lib/pleroma/web/auth/ldap_authenticator.ex +++ b/lib/pleroma/web/auth/ldap_authenticator.ex @@ -91,7 +91,8 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do end error -> - error + Logger.error("Could not bind LDAP user #{name}: #{inspect(error)}") + {:error, {:ldap_bind_error, error}} end end @@ -111,7 +112,8 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do try_register(name, attributes) error -> - error + Logger.error("Couldn't register user because LDAP search failed: #{inspect(error)}") + {:error, {:ldap_search_error, error}} end end @@ -152,7 +152,6 @@ defmodule Pleroma.Mixfile do {:html_entities, "~> 0.5", override: true}, {:calendar, "~> 1.0"}, {:cachex, "~> 3.2"}, - {:poison, "~> 3.0", override: true}, {:tesla, "~> 1.11"}, {:castore, "~> 0.1"}, {:cowlib, "~> 2.9", override: true}, @@ -205,6 +204,7 @@ defmodule Pleroma.Mixfile do ## dev & test {:phoenix_live_reload, "~> 1.3.3", only: :dev}, + {:poison, "~> 3.0", only: :test}, {:ex_doc, "~> 0.22", only: :dev, runtime: false}, {:ex_machina, "~> 2.4", only: :test}, {:credo, "~> 1.6", only: [:dev, :test], runtime: false}, |