CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Faulty PDF variables should not crash checkins

Browse Source
This commit is contained in:
Raphael Michel
2021-04-30 13:44:30 +02:00
parent b17706410a
commit a3dc562d08
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pretix/api/serializers/order.py
View File

@@ -20,6 +20,7 @@
# <https://www.gnu.org/licenses/>. # <https://www.gnu.org/licenses/>.
# #
import json import json
import logging
from collections import Counter, defaultdict from collections import Counter, defaultdict
from decimal import Decimal from decimal import Decimal
@@ -59,6 +60,9 @@ from pretix.base.signals import register_ticket_outputs
from pretix.multidomain.urlreverse import build_absolute_uri from pretix.multidomain.urlreverse import build_absolute_uri
logger = logging.getLogger(__name__)
class CompatibleCountryField(serializers.Field): class CompatibleCountryField(serializers.Field):
def to_internal_value(self, data): def to_internal_value(self, data):
return {self.field_name: Country(data)} return {self.field_name: Country(data)}
@@ -315,7 +319,11 @@ class PdfDataSerializer(serializers.Field):
self.context['vars_images'] = get_images(self.context['request'].event) self.context['vars_images'] = get_images(self.context['request'].event)
for k, f in self.context['vars'].items(): for k, f in self.context['vars'].items():
res[k] = f['evaluate'](instance, instance.order, ev) try:
res[k] = f['evaluate'](instance, instance.order, ev)
except:
logger.exception('Evaluating PDF variable failed')
res[k] = '(error)'
if not hasattr(ev, '_cached_meta_data'): if not hasattr(ev, '_cached_meta_data'):
ev._cached_meta_data = ev.meta_data ev._cached_meta_data = ev.meta_data
@@ -332,10 +340,19 @@ class PdfDataSerializer(serializers.Field):
for k, f in self.context['vars_images'].items(): for k, f in self.context['vars_images'].items():
if 'etag' in f: if 'etag' in f:
has_image = etag = f['etag'](instance, instance.order, ev) try:
has_image = etag = f['etag'](instance, instance.order, ev)
except:
has_image = False
etag = None
logger.exception('Evaluating PDF variable failed')
else: else:
has_image = f['etag'](instance, instance.order, ev) try:
etag = None has_image = f['valuate'](instance, instance.order, ev)
etag = None
except:
has_image = False
logger.exception('Evaluating PDF variable failed')
if has_image: if has_image:
url = reverse('api-v1:orderposition-pdf_image', kwargs={ url = reverse('api-v1:orderposition-pdf_image', kwargs={
'organizer': instance.order.event.organizer.slug, 'organizer': instance.order.event.organizer.slug,