trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

core: broaden error catching for propertymappings

Browse source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-07-21 22:50:39 +02:00
parent e62f5a75e4
commit b3da94bbb8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
authentik/core/models.py
View file

@ -491,8 +491,8 @@ class PropertyMapping(SerializerModel, ManagedModel):
evaluator.set_context(user, request, self, **kwargs) evaluator.set_context(user, request, self, **kwargs)
try: try:
return evaluator.evaluate(self.expression) return evaluator.evaluate(self.expression)
except (ValueError, SyntaxError) as exc: except Exception as exc:
raise PropertyMappingExpressionException from exc raise PropertyMappingExpressionException(str(exc)) from exc
def __str__(self): def __str__(self):
return f"Property Mapping {self.name}" return f"Property Mapping {self.name}"

4
authentik/core/tests/test_property_mapping.py
View file

@ -31,7 +31,7 @@ class TestPropertyMappings(TestCase):
"""Test expression error""" """Test expression error"""
expr = "return aaa" expr = "return aaa"
mapping = PropertyMapping.objects.create(name="test", expression=expr) mapping = PropertyMapping.objects.create(name="test", expression=expr)
with self.assertRaises(NameError): with self.assertRaises(PropertyMappingExpressionException):
mapping.evaluate(None, None) mapping.evaluate(None, None)
events = Event.objects.filter( events = Event.objects.filter(
action=EventAction.PROPERTY_MAPPING_EXCEPTION, context__expression=expr action=EventAction.PROPERTY_MAPPING_EXCEPTION, context__expression=expr
@ -44,7 +44,7 @@ class TestPropertyMappings(TestCase):
expr = "return aaa" expr = "return aaa"
request = self.factory.get("/") request = self.factory.get("/")
mapping = PropertyMapping.objects.create(name="test", expression=expr) mapping = PropertyMapping.objects.create(name="test", expression=expr)
with self.assertRaises(NameError): with self.assertRaises(PropertyMappingExpressionException):
mapping.evaluate(get_anonymous_user(), request) mapping.evaluate(get_anonymous_user(), request)
events = Event.objects.filter( events = Event.objects.filter(
action=EventAction.PROPERTY_MAPPING_EXCEPTION, context__expression=expr action=EventAction.PROPERTY_MAPPING_EXCEPTION, context__expression=expr