globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

fix: LDAP backend connection error display

Browse source
This commit is contained in:
Éloi Rivard 2023-12-25 13:55:33 +01:00
parent d4712b7971
commit 95882c737b
No known key found for this signature in database
GPG key ID: 7EDA204EA57DD184
2 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
canaille/backends/ldap/backend.py
View file

@ -8,7 +8,6 @@ import ldif
from canaille.app import models
from canaille.app.configuration import ConfigurationException
from canaille.app.i18n import gettext as _
from canaille.app.themes import render_template
from canaille.backends import BaseBackend
from flask import current_app
from flask import request
@ -98,35 +97,19 @@ class Backend(BaseBackend):
self.config["BACKENDS"]["LDAP"]["BIND_PW"],
)
except ldap.SERVER_DOWN:
except ldap.SERVER_DOWN as exc:
message = _("Could not connect to the LDAP server '{uri}'").format(
uri=self.config["BACKENDS"]["LDAP"]["URI"]
)
logging.error(message)
return (
render_template(
"error.html",
error_code=500,
icon="database",
description=message,
),
500,
)
raise ConfigurationException(message) from exc
except ldap.INVALID_CREDENTIALS:
except ldap.INVALID_CREDENTIALS as exc:
message = _("LDAP authentication failed with user '{user}'").format(
user=self.config["BACKENDS"]["LDAP"]["BIND_DN"]
)
logging.error(message)
return (
render_template(
"error.html",
error_code=500,
icon="key",
description=message,
),
500,
)
raise ConfigurationException(message) from exc
def teardown(self):
try: # pragma: no cover

8
tests/backends/ldap/test_errors.py
View file

@ -14,10 +14,6 @@ def test_ldap_connection_remote_ldap_unreachable(configuration):
app.config["BACKENDS"]["LDAP"]["URI"] = "ldap://invalid-ldap.com"
app.config["DEBUG"] = True
res = testclient.get("/", status=500, expect_errors=True)
res.mustcontain("Could not connect to the LDAP server")
app.config["DEBUG"] = False
res = testclient.get("/", status=500, expect_errors=True)
res.mustcontain(no="Could not connect to the LDAP server")
@ -29,10 +25,6 @@ def test_ldap_connection_remote_ldap_wrong_credentials(configuration):
app.config["BACKENDS"]["LDAP"]["BIND_PW"] = "invalid-password"
app.config["DEBUG"] = True
res = testclient.get("/", status=500, expect_errors=True)
res.mustcontain("LDAP authentication failed with user")
app.config["DEBUG"] = False
res = testclient.get("/", status=500, expect_errors=True)
res.mustcontain(no="LDAP authentication failed with user")