This commit is contained in:
Alexandre Aubin 2021-03-23 00:24:33 +01:00
parent b17a6fa627
commit e22aac9af0
3 changed files with 15 additions and 3 deletions

View file

@ -14,7 +14,12 @@ from importlib import import_module
from moulinette import m18n, msignals from moulinette import m18n, msignals
from moulinette.cache import open_cachefile from moulinette.cache import open_cachefile
from moulinette.globals import init_moulinette_env from moulinette.globals import init_moulinette_env
from moulinette.core import MoulinetteError, MoulinetteLock, MoulinetteAuthenticationError, MoulinetteValidationError from moulinette.core import (
MoulinetteError,
MoulinetteLock,
MoulinetteAuthenticationError,
MoulinetteValidationError,
)
from moulinette.interfaces import BaseActionsMapParser, GLOBAL_SECTION, TO_RETURN_PROP from moulinette.interfaces import BaseActionsMapParser, GLOBAL_SECTION, TO_RETURN_PROP
from moulinette.utils.log import start_action_logging from moulinette.utils.log import start_action_logging
@ -207,7 +212,9 @@ class PatternParameter(_ExtraParameter):
if msg == message: if msg == message:
msg = m18n.g(message) msg = m18n.g(message)
raise MoulinetteValidationError("invalid_argument", argument=arg_name, error=msg) raise MoulinetteValidationError(
"invalid_argument", argument=arg_name, error=msg
)
return arg_value return arg_value
@staticmethod @staticmethod

View file

@ -10,7 +10,11 @@ import time
import ldap.modlist as modlist import ldap.modlist as modlist
from moulinette import m18n from moulinette import m18n
from moulinette.core import MoulinetteError, MoulinetteAuthenticationError, MoulinetteLdapIsDownError from moulinette.core import (
MoulinetteError,
MoulinetteAuthenticationError,
MoulinetteLdapIsDownError,
)
from moulinette.authenticators import BaseAuthenticator from moulinette.authenticators import BaseAuthenticator
logger = logging.getLogger("moulinette.authenticator.ldap") logger = logging.getLogger("moulinette.authenticator.ldap")

View file

@ -545,6 +545,7 @@ class _ActionsMapPlugin(object):
# HTTP Responses ------------------------------------------------------- # HTTP Responses -------------------------------------------------------
def moulinette_error_to_http_response(error): def moulinette_error_to_http_response(error):
content = error.content() content = error.content()