mirror of
https://github.com/pretix/pretix.git
synced 2026-11-21 03:06:03 +00:00
Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae4d5c4838 | ||
|
|
06368344eb | ||
|
|
cc05c500e5 | ||
|
|
cb9c49f79b | ||
|
|
054045a0cc | ||
|
|
f7d258d09f | ||
|
|
918af24475 | ||
|
|
f60f6078e3 | ||
|
|
fc7b980266 | ||
|
|
d7d2fff58a | ||
|
|
46bd2caea2 | ||
|
|
dbb6a26a3a | ||
|
|
8eadb3b1c4 | ||
|
|
e243667c62 |
No files matched your search
@@ -19,4 +19,4 @@
|
||||
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
|
||||
# <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
__version__ = "2026.9.0"
|
||||
__version__ = "2026.9.3"
|
||||
@@ -155,7 +155,6 @@ class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
|
||||
('POST', 'api-v1:upload'),
|
||||
('POST', 'api-v1:checkinrpc.redeem'),
|
||||
('POST', 'api-v1:checkinrpc.annul'),
|
||||
('GET', 'api-v1:checkinrpc.search'),
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -156,6 +156,8 @@ class ExportFormDataField(serializers.Field):
|
||||
return JobRunSerializer(exporter=exporter).to_internal_value(data["export_form_data"])
|
||||
else:
|
||||
return data['export_form_data']
|
||||
else: # partial PATCH without export_form_data keeps it unchanged
|
||||
return self.parent.instance.export_form_data
|
||||
|
||||
|
||||
class ScheduledExportSerializer(serializers.ModelSerializer):
|
||||
@@ -188,6 +190,12 @@ class ScheduledExportSerializer(serializers.ModelSerializer):
|
||||
raise ValidationError('Please enter less than 25 recipients.')
|
||||
return d
|
||||
|
||||
def validate(self, attrs):
|
||||
attrs = super().validate(attrs)
|
||||
if self.instance and self.instance.pk and 'export_identifier' in attrs and self.instance.export_identifier != attrs['export_identifier']:
|
||||
raise ValidationError({"export_identifier": "export_identifier cannot be changed for existing exports."})
|
||||
return attrs
|
||||
|
||||
|
||||
class ScheduledEventExportSerializer(ScheduledExportSerializer):
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
#
|
||||
from datetime import timedelta
|
||||
|
||||
from celery.result import AsyncResult
|
||||
from django.conf import settings
|
||||
from django.db import transaction
|
||||
from django.http import Http404
|
||||
@@ -49,6 +48,7 @@ from pretix.base.services.export import (
|
||||
ExportError, export, init_event_exporters, init_organizer_exporters,
|
||||
multiexport,
|
||||
)
|
||||
from pretix.helpers.celery import get_task_result
|
||||
from pretix.helpers.http import ChunkBasedFileResponse
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ class ExportersMixin:
|
||||
status=status.HTTP_410_GONE
|
||||
)
|
||||
|
||||
res = AsyncResult(kwargs['asyncid'])
|
||||
res = get_task_result(kwargs['asyncid'], task_name=self.task)
|
||||
if res.failed():
|
||||
if isinstance(res.info, dict) and res.info['exc_type'] == 'ExportError':
|
||||
msg = res.info['exc_message']
|
||||
@@ -139,6 +139,7 @@ class ExportersMixin:
|
||||
|
||||
class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
|
||||
permission = None
|
||||
task = export
|
||||
|
||||
@cached_property
|
||||
def exporters(self):
|
||||
@@ -173,6 +174,7 @@ class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
|
||||
|
||||
class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
|
||||
permission = None
|
||||
task = multiexport
|
||||
|
||||
@cached_property
|
||||
def exporters(self):
|
||||
@@ -272,6 +274,8 @@ class ScheduledEventExportViewSet(ScheduledExportersViewSet):
|
||||
perm_holder = self.request.auth if isinstance(self.request.auth, (TeamAPIToken, Device)) else self.request.user
|
||||
if not perm_holder.has_event_permission(self.request.organizer, self.request.event, exporter.get_required_event_permission()):
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
# An additional check for the new config, such as on organizer level, is not necessary. Since the event is
|
||||
# fixed and the export_identifier is read-only, the update cannot include a meaningful change of permissions.
|
||||
|
||||
serializer.save(event=self.request.event)
|
||||
serializer.instance.compute_next_run()
|
||||
@@ -344,6 +348,41 @@ class ScheduledOrganizerExportViewSet(ScheduledExportersViewSet):
|
||||
))
|
||||
return {e.identifier: e for e in exporters}
|
||||
|
||||
def _check_permission_for_export(self, identifier, form_data):
|
||||
perm_holder = (
|
||||
self.request.auth if isinstance(self.request.auth, (Device, TeamAPIToken)) else self.request.user
|
||||
)
|
||||
exporter = self.exporters.get(identifier)
|
||||
if not exporter:
|
||||
raise PermissionDenied("No access to exporter.")
|
||||
if isinstance(exporter, OrganizerLevelExportMixin):
|
||||
if not perm_holder.has_organizer_permission(
|
||||
self.request.organizer, exporter.get_required_organizer_permission(), request=self.request,
|
||||
):
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
else:
|
||||
if form_data.get("all_events", False):
|
||||
if isinstance(self.request.auth, Device):
|
||||
if not self.request.auth.all_events:
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
elif isinstance(self.request.auth, TeamAPIToken):
|
||||
if not self.request.auth.team.all_events:
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
elif self.request.user.is_authenticated:
|
||||
if not self.request.user.teams.filter(
|
||||
TeamQuerySet.event_permission_q(exporter.get_required_event_permission()),
|
||||
organizer=self.request.organizer,
|
||||
all_events=True,
|
||||
).exists():
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
else:
|
||||
events_selected = form_data.get("events", [])
|
||||
events_permission = set(perm_holder.get_events_with_permission(
|
||||
exporter.get_required_event_permission(), request=self.request
|
||||
).values_list("pk", flat=True))
|
||||
if not all(e in events_permission for e in events_selected):
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
|
||||
@transaction.atomic()
|
||||
def perform_update(self, serializer):
|
||||
if not self.request.user.is_authenticated or self.request.user != serializer.instance.owner:
|
||||
@@ -351,37 +390,12 @@ class ScheduledOrganizerExportViewSet(ScheduledExportersViewSet):
|
||||
# user B has settings permission (= they can see the export configuration), but not enough permission
|
||||
# to run the export themselves. Without this check, user B could modify the export and add themselves
|
||||
# as a recipient. Thereby, user B would gain access to data they can't have.
|
||||
exporter = self.exporters.get(serializer.instance.export_identifier)
|
||||
if not exporter:
|
||||
raise PermissionDenied("No access to exporter.")
|
||||
perm_holder = (self.request.auth if isinstance(self.request.auth, (Device, TeamAPIToken))
|
||||
else self.request.user)
|
||||
if isinstance(exporter, OrganizerLevelExportMixin):
|
||||
if not perm_holder.has_organizer_permission(
|
||||
self.request.organizer, exporter.get_required_organizer_permission(), request=self.request,
|
||||
):
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
else:
|
||||
if serializer.instance.export_form_data.get("all_events", False):
|
||||
if isinstance(self.request.auth, Device):
|
||||
if not self.request.auth.all_events:
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
elif isinstance(self.request.auth, TeamAPIToken):
|
||||
if not self.request.auth.team.all_events:
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
elif self.request.user.is_authenticated:
|
||||
if not self.request.user.teams.filter(
|
||||
TeamQuerySet.event_permission_q(exporter.get_required_event_permission()),
|
||||
all_events=True,
|
||||
).exists():
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
else:
|
||||
events_selected = serializer.instance.export_form_data.get("events", [])
|
||||
events_permission = set(perm_holder.get_events_with_permission(
|
||||
exporter.get_required_event_permission(), request=self.request
|
||||
).values_list("pk", flat=True))
|
||||
if not all(e in events_permission for e in events_selected):
|
||||
raise PermissionDenied("No permission to edit exports you could not run.")
|
||||
self._check_permission_for_export(serializer.instance.export_identifier, serializer.instance.export_form_data)
|
||||
# After we checked that the API user can work with the original export, we also need to check that they can
|
||||
# work with the changed export, otherwise they could change e.g. from "some events" to "all events" and add
|
||||
# themselves as a recipient.
|
||||
if serializer.validated_data.get('export_form_data') is not None:
|
||||
self._check_permission_for_export(serializer.instance.export_identifier, serializer.validated_data['export_form_data'])
|
||||
|
||||
serializer.save(organizer=self.request.organizer)
|
||||
serializer.instance.compute_next_run()
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
#
|
||||
from datetime import timedelta
|
||||
|
||||
from celery.result import AsyncResult
|
||||
from django.conf import settings
|
||||
from django.http import Http404
|
||||
from django.shortcuts import get_object_or_404
|
||||
@@ -40,6 +39,7 @@ from pretix.api.serializers.shredders import (
|
||||
from pretix.base.models import CachedFile
|
||||
from pretix.base.services.shredder import export, shred
|
||||
from pretix.base.shredder import shred_constraints
|
||||
from pretix.helpers.celery import get_task_result
|
||||
from pretix.helpers.http import ChunkBasedFileResponse
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ class ShreddersMixin:
|
||||
status=status.HTTP_410_GONE
|
||||
)
|
||||
|
||||
res = AsyncResult(kwargs['asyncid'])
|
||||
res = get_task_result(kwargs['asyncid'], task_name=export)
|
||||
if res.failed():
|
||||
if isinstance(res.info, dict) and res.info['exc_type'] in ('ShredError', 'ExportError'):
|
||||
msg = res.info['exc_message']
|
||||
@@ -108,7 +108,7 @@ class ShreddersMixin:
|
||||
@action(detail=False, methods=['GET'], url_name='status', url_path='status/(?P<asyncid>[^/]+)/(?P<cfid>[^/]+)')
|
||||
def status(self, *args, **kwargs):
|
||||
if settings.HAS_CELERY:
|
||||
res = AsyncResult(kwargs['asyncid'])
|
||||
res = get_task_result(kwargs['asyncid'], task_name=shred)
|
||||
if res.failed():
|
||||
if isinstance(res.info, dict) and res.info['exc_type'] in ('ShredError', 'ExportError'):
|
||||
msg = res.info['exc_message']
|
||||
@@ -141,12 +141,17 @@ class ShreddersMixin:
|
||||
status=status.HTTP_410_GONE
|
||||
)
|
||||
|
||||
return Response(
|
||||
{
|
||||
'status': 'running' if res.state in ('PROGRESS', 'STARTED', 'SUCCESS') else 'waiting',
|
||||
},
|
||||
status=status.HTTP_409_CONFLICT
|
||||
)
|
||||
if settings.HAS_CELERY:
|
||||
return Response(
|
||||
{
|
||||
'status': 'running' if res.state in ('PROGRESS', 'STARTED', 'SUCCESS') else 'waiting',
|
||||
},
|
||||
status=status.HTTP_409_CONFLICT
|
||||
)
|
||||
else:
|
||||
# This can't happen for clients who follow the api spec. They would need have to constructed the url themselves
|
||||
# from a valid shredder cached file, e.g. by modifying the URL retured by `export`.
|
||||
raise Http404()
|
||||
|
||||
@action(detail=False, methods=['POST'], url_name='shred', url_path='shred/(?P<asyncid>[^/]+)/(?P<cfid>[^/]+)')
|
||||
def shred(self, *args, **kwargs):
|
||||
@@ -163,11 +168,10 @@ class ShreddersMixin:
|
||||
raise Http404()
|
||||
if cf.file:
|
||||
async_result = self.do_shred(cf)
|
||||
url_kwargs = {
|
||||
url_kwargs = self.kwargs | {
|
||||
'asyncid': str(async_result.id),
|
||||
'cfid': str(cf.id),
|
||||
}
|
||||
url_kwargs.update(self.kwargs)
|
||||
return Response({
|
||||
'status': reverse('api-v1:shredders-status', kwargs=url_kwargs, request=self.request),
|
||||
}, status=status.HTTP_202_ACCEPTED)
|
||||
@@ -177,7 +181,7 @@ class ShreddersMixin:
|
||||
status=status.HTTP_410_GONE
|
||||
)
|
||||
|
||||
res = AsyncResult(kwargs['asyncid'])
|
||||
res = get_task_result(kwargs['asyncid'], task_name=export)
|
||||
if res.failed():
|
||||
if isinstance(res.info, dict) and res.info['exc_type'] in ('ShredError', 'ExportError'):
|
||||
msg = res.info['exc_message']
|
||||
|
||||
@@ -173,11 +173,13 @@ class UploadedFileWidget(forms.ClearableFileInput):
|
||||
|
||||
@property
|
||||
def url(self):
|
||||
from pretix.base.templatetags.safelink import answer_url
|
||||
|
||||
token = get_token(self.request, self.answer)
|
||||
if self.request.resolver_match.namespace == 'control':
|
||||
return self.answer.backend_file_url + '?token=' + token
|
||||
else:
|
||||
return self.answer.frontend_file_url + '?token=' + token
|
||||
return answer_url(self.request, self.answer)
|
||||
|
||||
def get_context(self, name, value, attrs):
|
||||
# Browsers can't recognize that the server already has a file uploaded
|
||||
|
||||
@@ -1349,25 +1349,6 @@ class QuestionAnswer(models.Model):
|
||||
})
|
||||
return ""
|
||||
|
||||
@property
|
||||
def frontend_file_url(self):
|
||||
from pretix.multidomain.urlreverse import eventreverse
|
||||
|
||||
if self.file:
|
||||
if self.associated_order:
|
||||
url = eventreverse(self.associated_order.event, 'presale:event.order.download.answer', kwargs={
|
||||
'order': self.associated_order.code,
|
||||
'secret': self.associated_order.secret,
|
||||
'answer': self.pk,
|
||||
})
|
||||
else:
|
||||
url = eventreverse(self.event, 'presale:event.cart.download.answer', kwargs={
|
||||
'answer': self.pk,
|
||||
})
|
||||
|
||||
return url
|
||||
return ""
|
||||
|
||||
@property
|
||||
def is_image(self):
|
||||
return any(self.file.name.lower().endswith(e) for e in settings.FILE_UPLOAD_EXTENSIONS_QUESTION_IMAGE)
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
from django import template
|
||||
|
||||
from pretix.helpers.safedownload import get_token
|
||||
from pretix.multidomain.urlreverse import eventreverse
|
||||
|
||||
from ..views.redirect import safelink as sl
|
||||
|
||||
@@ -36,3 +37,19 @@ def safelink(url):
|
||||
@register.simple_tag
|
||||
def answer_token(request, answer):
|
||||
return get_token(request, answer)
|
||||
|
||||
|
||||
@register.simple_tag
|
||||
def answer_url(request, answer):
|
||||
if answer.file:
|
||||
if answer.associated_order:
|
||||
url = eventreverse(answer.associated_order.event, 'presale:event.download.answer', kwargs={
|
||||
'answer': answer.pk,
|
||||
})
|
||||
else:
|
||||
url = eventreverse(request.event, 'presale:event.cart.download.answer', kwargs={
|
||||
'answer': answer.pk,
|
||||
})
|
||||
|
||||
return url + "?token=" + get_token(request, answer)
|
||||
return ""
|
||||
@@ -28,7 +28,6 @@ from zoneinfo import ZoneInfo
|
||||
|
||||
import celery.exceptions
|
||||
from celery import states
|
||||
from celery.result import AsyncResult
|
||||
from django.conf import settings
|
||||
from django.contrib import messages
|
||||
from django.core.exceptions import (
|
||||
@@ -41,6 +40,7 @@ from django.shortcuts import render
|
||||
from django.test import RequestFactory
|
||||
from django.utils import timezone, translation
|
||||
from django.utils.datastructures import MultiValueDict
|
||||
from django.utils.functional import classproperty
|
||||
from django.utils.timezone import get_current_timezone, now
|
||||
from django.utils.translation import get_language, gettext as _
|
||||
from django.views import View
|
||||
@@ -50,6 +50,7 @@ from redis import ResponseError
|
||||
from pretix.base.models import CachedFile, User
|
||||
from pretix.base.services.tasks import ProfiledEventTask
|
||||
from pretix.celery_app import app
|
||||
from pretix.helpers.celery import get_task_result
|
||||
from pretix.helpers.http import redirect_to_url
|
||||
|
||||
logger = logging.getLogger('pretix.base.tasks')
|
||||
@@ -61,6 +62,10 @@ class AsyncMixin:
|
||||
error_url = None
|
||||
known_errortypes = []
|
||||
|
||||
@classproperty
|
||||
def task(self):
|
||||
raise NotImplementedError("Needs to be supplied by child class")
|
||||
|
||||
def get_success_url(self, value):
|
||||
return self.success_url
|
||||
|
||||
@@ -137,7 +142,8 @@ class AsyncMixin:
|
||||
raise BadRequest("No async_id given")
|
||||
if not RE_ASYNC_ID.match(request.GET.get('async_id')):
|
||||
raise BadRequest("Invalid async_id given")
|
||||
res = AsyncResult(request.GET.get('async_id'))
|
||||
|
||||
res = get_task_result(request.GET.get('async_id'), task_name=self.task)
|
||||
if 'ajax' in self.request.GET:
|
||||
return JsonResponse(self._return_ajax_result(res, timeout=0.25))
|
||||
else:
|
||||
@@ -317,6 +323,10 @@ class AsyncFormView(AsyncMixin, FormView):
|
||||
throws=cls.expected_exceptions
|
||||
)(async_execute)
|
||||
|
||||
@classproperty
|
||||
def task(cls): # noqa
|
||||
return cls.async_execute
|
||||
|
||||
def async_form_valid(self, task, form):
|
||||
pass
|
||||
|
||||
@@ -450,6 +460,10 @@ class AsyncPostView(AsyncMixin, View):
|
||||
def async_post(self, request, *args, **kwargs):
|
||||
pass
|
||||
|
||||
@classproperty
|
||||
def task(cls): # noqa
|
||||
return cls.async_execute
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
if 'async_id' in request.GET and settings.HAS_CELERY:
|
||||
return self.get_result(request)
|
||||
|
||||
@@ -578,13 +578,11 @@
|
||||
class="btn btn-xs btn-default">
|
||||
<span class="fa fa-qrcode"></span> {% trans "Ticket code" %}
|
||||
</button>
|
||||
{% if not line.addon_to %}
|
||||
<a href="{% eventurl request.event "presale:event.order.position" order=order.code secret=line.web_secret position=line.positionid %}"
|
||||
class="btn btn-xs btn-default" target="_blank">
|
||||
<span class="fa fa-eye"></span>
|
||||
{% trans "Ticket page" %}
|
||||
</a>
|
||||
{% endif %}
|
||||
<a href="{% eventurl request.event "presale:event.order.position" order=order.code secret=line.web_secret position=line.positionid %}"
|
||||
class="btn btn-xs btn-default" target="_blank">
|
||||
<span class="fa fa-eye"></span>
|
||||
{% trans "Ticket page" %}
|
||||
</a>
|
||||
{% eventsignal event "pretix.control.signals.order_position_buttons" order=order position=line request=request %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
@@ -43,7 +43,6 @@ from datetime import datetime, time, timedelta
|
||||
from decimal import Decimal, DecimalException
|
||||
from urllib.parse import quote, urlencode
|
||||
|
||||
from celery.result import AsyncResult
|
||||
from django import forms
|
||||
from django.conf import settings
|
||||
from django.contrib import messages
|
||||
@@ -136,6 +135,7 @@ from pretix.control.permissions import (
|
||||
from pretix.control.signals import order_search_forms
|
||||
from pretix.control.views import PaginationMixin
|
||||
from pretix.helpers import OF_SELF
|
||||
from pretix.helpers.celery import get_task_result
|
||||
from pretix.helpers.compat import CompatDeleteView
|
||||
from pretix.helpers.format import SafeFormatter, format_map
|
||||
from pretix.helpers.hierarkey import clean_filename
|
||||
@@ -2772,7 +2772,11 @@ class ExportMixin:
|
||||
@cached_property
|
||||
def scheduled_copy_from(self):
|
||||
if "scheduled_copy_from" in self.request.GET:
|
||||
return get_object_or_404(self.get_scheduled_queryset(), pk=self.request.GET.get("scheduled_copy_from"))
|
||||
return get_object_or_404(
|
||||
self.get_scheduled_queryset(),
|
||||
pk=self.request.GET.get("scheduled_copy_from"),
|
||||
export_identifier=self.request.GET.get("identifier") or self.request.POST.get("exporter") or self.request.GET.get("exporter"),
|
||||
)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
ctx = super().get_context_data(**kwargs)
|
||||
@@ -2924,6 +2928,10 @@ class ExportView(EventPermissionRequiredMixin, ExportMixin, ListView):
|
||||
if self.scheduled_copy_from:
|
||||
instance = copy.copy(self.scheduled_copy_from)
|
||||
instance.pk = None
|
||||
instance.owner = self.request.user
|
||||
instance.schedule_next_run = None
|
||||
instance.error_counter = 0
|
||||
instance.last_error = None
|
||||
else:
|
||||
instance = self.scheduled or ScheduledEventExport(
|
||||
event=self.request.event,
|
||||
@@ -3168,7 +3176,7 @@ class EventCancelConfirm(EventPermissionRequiredMixin, AsyncAction, FormView):
|
||||
|
||||
@cached_property
|
||||
def dryrun_result(self):
|
||||
res = AsyncResult(self.kwargs.get("task"))
|
||||
res = get_task_result(self.kwargs.get("task"), task_name=self.task)
|
||||
if not res.ready():
|
||||
raise Http404()
|
||||
if not res.successful():
|
||||
|
||||
@@ -2056,7 +2056,11 @@ class ExportMixin:
|
||||
@cached_property
|
||||
def scheduled_copy_from(self):
|
||||
if "scheduled_copy_from" in self.request.GET:
|
||||
return get_object_or_404(self.get_scheduled_queryset(), pk=self.request.GET.get("scheduled_copy_from"))
|
||||
return get_object_or_404(
|
||||
self.get_scheduled_queryset(),
|
||||
pk=self.request.GET.get("scheduled_copy_from"),
|
||||
export_identifier=self.request.GET.get("identifier") or self.request.POST.get("exporter") or self.request.GET.get("exporter"),
|
||||
)
|
||||
|
||||
|
||||
class ExportDoView(OrganizerPermissionRequiredMixin, ExportMixin, AsyncAction, TemplateView):
|
||||
@@ -2124,7 +2128,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
|
||||
@transaction.atomic()
|
||||
def post(self, request, *args, **kwargs):
|
||||
if request.POST.get("schedule") == "save":
|
||||
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled():
|
||||
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled(self.scheduled.export_form_data):
|
||||
messages.error(
|
||||
self.request,
|
||||
_(
|
||||
@@ -2143,6 +2147,16 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
|
||||
)
|
||||
return super().get(request, *args, **kwargs)
|
||||
elif self.exporter.form.is_valid() and self.rrule_form.is_valid() and self.schedule_form.is_valid():
|
||||
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled(self.exporter.form.cleaned_data):
|
||||
messages.error(
|
||||
self.request,
|
||||
_(
|
||||
"This report runs with the permissions of a different user and you do not have access to all "
|
||||
"events, therefore you cannot change it to cover additional events."
|
||||
)
|
||||
)
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
self.schedule_form.instance.export_identifier = self.exporter.identifier
|
||||
self.schedule_form.instance.export_form_data = self.exporter.form.cleaned_data
|
||||
self.schedule_form.instance.schedule_rrule = str(self.rrule_form.to_rrule())
|
||||
@@ -2196,6 +2210,10 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
|
||||
if self.scheduled_copy_from:
|
||||
instance = copy.copy(self.scheduled_copy_from)
|
||||
instance.pk = None
|
||||
instance.owner = self.request.user
|
||||
instance.schedule_next_run = None
|
||||
instance.error_counter = 0
|
||||
instance.last_error = None
|
||||
else:
|
||||
instance = self.scheduled or ScheduledOrganizerExport(
|
||||
organizer=self.request.organizer,
|
||||
@@ -2224,7 +2242,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
|
||||
def get_queryset(self):
|
||||
return self.get_scheduled_queryset()
|
||||
|
||||
def has_permission_to_edit_scheduled(self):
|
||||
def has_permission_to_edit_scheduled(self, export_form_data):
|
||||
# Exports can be edited by
|
||||
# - their owner
|
||||
# - any staff session user
|
||||
@@ -2249,15 +2267,16 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
|
||||
self.request.organizer, self.exporter.get_required_organizer_permission(), request=self.request
|
||||
)
|
||||
else:
|
||||
if self.scheduled.export_form_data.get("all_events", False):
|
||||
if export_form_data.get("all_events", False):
|
||||
# Test scenario 1/2 in test_organizer_edit_restrictions
|
||||
return self.request.user.teams.filter(
|
||||
TeamQuerySet.event_permission_q(self.exporter.get_required_event_permission()),
|
||||
organizer=self.request.organizer,
|
||||
all_events=True,
|
||||
).exists()
|
||||
else:
|
||||
# Test scenario 3/4 in test_organizer_edit_restrictions
|
||||
events_selected = self.scheduled.export_form_data.get("events", [])
|
||||
events_selected = export_form_data.get("events", [])
|
||||
events_permission = set(self.request.user.get_events_with_permission(
|
||||
self.exporter.get_required_event_permission(), request=self.request,
|
||||
).values_list("pk", flat=True))
|
||||
@@ -2285,7 +2304,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
|
||||
ctx['rrule_form'] = self.rrule_form
|
||||
ctx['scheduled_copy_from'] = self.scheduled_copy_from
|
||||
|
||||
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled() and self.exporter:
|
||||
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled(self.scheduled.export_form_data) and self.exporter:
|
||||
ctx['no_save'] = True
|
||||
for f in self.exporter.form.fields.values():
|
||||
f.disabled = True
|
||||
|
||||
@@ -19,7 +19,12 @@
|
||||
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
|
||||
# <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
from typing import Union
|
||||
|
||||
from celery import Task
|
||||
from celery.result import AsyncResult
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import SuspiciousOperation
|
||||
|
||||
THRESHOLD_DOWNGRADE_TO_MID = 50
|
||||
THRESHOLD_DOWNGRADE_TO_LOW = 250
|
||||
@@ -60,3 +65,27 @@ def get_task_priority(shard, organizer_id):
|
||||
return settings.PRIORITY_CELERY_MID
|
||||
else:
|
||||
return settings.PRIORITY_CELERY_HIGH
|
||||
|
||||
|
||||
class SafeAsyncResult(AsyncResult):
|
||||
def __init__(self, *args, expected_task_name, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.__expected_task_name = expected_task_name
|
||||
|
||||
def _maybe_set_cache(self, meta):
|
||||
if meta and meta['status'] != "PENDING":
|
||||
if meta.get('name') != self.__expected_task_name:
|
||||
raise SuspiciousOperation(
|
||||
f"Received task result for {meta.get('name')!r}, but expected '{self.__expected_task_name}'"
|
||||
)
|
||||
return super()._maybe_set_cache(meta)
|
||||
|
||||
|
||||
def get_task_result(task_id: str, task_name: Union[Task, str]) -> SafeAsyncResult:
|
||||
"""
|
||||
Returns an AsyncResult by it's ID in a safe way, i.e. do not return anything if the task
|
||||
name does not match the expected task.
|
||||
"""
|
||||
if isinstance(task_name, Task):
|
||||
task_name = task_name.name
|
||||
return SafeAsyncResult(task_id, expected_task_name=task_name)
|
||||
@@ -25,6 +25,7 @@ import types
|
||||
from datetime import datetime
|
||||
from http import cookies
|
||||
|
||||
from celery.backends.base import Backend
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import SuspiciousFileOperation
|
||||
from django.middleware.csrf import CsrfViewMiddleware as BaseCsrfMiddleware
|
||||
@@ -258,6 +259,26 @@ def monkeypatch_json_constants():
|
||||
del _CONSTANTS['NaN']
|
||||
|
||||
|
||||
def monkeypatch_celery_result_meta():
|
||||
"""
|
||||
We basically want `result_extended` from Celery to tie results to the tasks that created them,
|
||||
but just enabling `result_extended` will include full `args` and `kwargs` to the result which
|
||||
might contain large or sensitive data and we currently have no interest in storing them in the
|
||||
task backend without necessity.
|
||||
"""
|
||||
old__get_result_meta = Backend._get_result_meta
|
||||
|
||||
def new__get_result_meta(self, result, state, traceback, request, *args, **kwargs):
|
||||
meta = types.MethodType(old__get_result_meta, self)(
|
||||
result, state, traceback, request, *args, **kwargs,
|
||||
)
|
||||
if request and 'name' not in meta:
|
||||
meta['name'] = getattr(request, 'task', None)
|
||||
return meta
|
||||
|
||||
Backend._get_result_meta = new__get_result_meta
|
||||
|
||||
|
||||
def monkeypatch_all_at_ready():
|
||||
monkeypatch_vobject_performance()
|
||||
monkeypatch_pillow_safer()
|
||||
@@ -267,3 +288,4 @@ def monkeypatch_all_at_ready():
|
||||
monkeypatch_reportlab_imagereader()
|
||||
monkeypatch_csrf_middleware()
|
||||
monkeypatch_json_constants()
|
||||
monkeypatch_celery_result_meta()
|
||||
@@ -31,13 +31,13 @@ class SafeDownloadSigner(TimestampSigner):
|
||||
def get_token(request, answer):
|
||||
if not request.session.session_key:
|
||||
request.session.create()
|
||||
payload = '{}:{}'.format(request.session.session_key, answer.pk)
|
||||
payload = '{}:{}:{}'.format(request.session.session_key, answer.pk, answer.file.name)
|
||||
signer = SafeDownloadSigner()
|
||||
return signer.sign(hashlib.sha1(payload.encode()).hexdigest())
|
||||
|
||||
|
||||
def check_token(request, answer, token):
|
||||
payload = hashlib.sha1('{}:{}'.format(request.session.session_key, answer.pk).encode()).hexdigest()
|
||||
payload = hashlib.sha1('{}:{}:{}'.format(request.session.session_key, answer.pk, answer.file.name).encode()).hexdigest()
|
||||
signer = SafeDownloadSigner()
|
||||
try:
|
||||
return payload == signer.unsign(token, max_age=3600 * 24)
|
||||
|
||||
@@ -24,14 +24,13 @@ from django.urls import include, re_path
|
||||
from pretix.multidomain import event_url
|
||||
|
||||
from .views import (
|
||||
OrganizerSettingsFormView, ReturnView, ScaReturnView, ScaView,
|
||||
oauth_disconnect, oauth_return, webhook,
|
||||
OrganizerSettingsFormView, ScaReturnView, ScaView, oauth_disconnect,
|
||||
oauth_return, webhook,
|
||||
)
|
||||
|
||||
event_patterns = [
|
||||
re_path(r'^stripe/', include([
|
||||
event_url(r'^webhook/$', webhook, name='webhook', require_live=False),
|
||||
re_path(r'^return/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ReturnView.as_view(), name='return'),
|
||||
re_path(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ScaView.as_view(), name='sca'),
|
||||
re_path(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/return/$',
|
||||
ScaReturnView.as_view(), name='sca.return'),
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
#
|
||||
# This file is part of pretix (Community Edition).
|
||||
#
|
||||
# Copyright (C) 2014-2020 Raphael Michel and contributors
|
||||
# Copyright (C) 2020-today pretix GmbH and contributors
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
|
||||
# Public License as published by the Free Software Foundation in version 3 of the License.
|
||||
#
|
||||
# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
|
||||
# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
|
||||
# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
|
||||
# this file, see <https://pretix.eu/about/en/license>.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
|
||||
# details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
|
||||
# <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
@@ -175,60 +175,51 @@ def oauth_return(request, *args, **kwargs):
|
||||
@require_POST
|
||||
@scopes_disabled()
|
||||
def webhook(request, *args, **kwargs):
|
||||
event_json = json.loads(request.body.decode('utf-8'))
|
||||
untrusted_json = json.loads(request.body.decode('utf-8'))
|
||||
untrusted_obj = untrusted_json['data']['object']
|
||||
|
||||
# We do not check for the event type as we are not interested in the event it self,
|
||||
# we just use it as a trigger to look the charge up to be absolutely sure.
|
||||
# Another reason for this is that stripe events are not authenticated, so they could
|
||||
# come from anywhere.
|
||||
|
||||
if event_json['data']['object']['object'] == "charge":
|
||||
func = charge_webhook
|
||||
objid = event_json['data']['object']['id']
|
||||
lookup_ids = [
|
||||
objid,
|
||||
(event_json['data']['object'].get('source') or {}).get('id')
|
||||
]
|
||||
elif event_json['data']['object']['object'] == "dispute":
|
||||
func = charge_webhook
|
||||
objid = event_json['data']['object']['charge']
|
||||
lookup_ids = [objid]
|
||||
elif event_json['data']['object']['object'] == "source":
|
||||
func = source_webhook
|
||||
objid = event_json['data']['object']['id']
|
||||
lookup_ids = [objid]
|
||||
elif event_json['data']['object']['object'] == "payment_intent":
|
||||
func = paymentintent_webhook
|
||||
objid = event_json['data']['object']['id']
|
||||
lookup_ids = [objid]
|
||||
rso_qs = ReferencedStripeObject.objects.select_related('order', 'order__event')
|
||||
|
||||
if untrusted_obj['object'] == "payment_intent":
|
||||
pi_id = untrusted_obj['id']
|
||||
try:
|
||||
rso = rso_qs.get(reference=pi_id)
|
||||
except ReferencedStripeObject.DoesNotExist:
|
||||
return HttpResponse("Unable to detect event", status=200)
|
||||
else:
|
||||
return paymentintent_webhook(untrusted_json, pi_id, rso)
|
||||
|
||||
elif untrusted_obj['object'] == "charge":
|
||||
charge_id = untrusted_obj['id']
|
||||
elif untrusted_obj['object'] == "dispute":
|
||||
charge_id = untrusted_obj['charge']
|
||||
else:
|
||||
return HttpResponse("Not interested in this data type", status=200)
|
||||
|
||||
rso = ReferencedStripeObject.objects.select_related('order', 'order__event').filter(
|
||||
reference__in=[lid for lid in lookup_ids if lid]
|
||||
).first()
|
||||
if rso:
|
||||
return func(rso.order.event, event_json, objid, rso)
|
||||
else:
|
||||
if event_json['data']['object']['object'] == "charge" and 'payment_intent' in event_json['data']['object']:
|
||||
rso = None
|
||||
try:
|
||||
rso = rso_qs.get(reference=charge_id)
|
||||
except ReferencedStripeObject.DoesNotExist:
|
||||
if 'payment_intent' in untrusted_obj:
|
||||
# If we receive a charge webhook *before* the payment intent webhook, we don't know the charge ID yet
|
||||
# and can't match it -- but we know the payment intent ID!
|
||||
# and can't match it -- but we know the payment intent ID! In charge_webhook, we validate that the
|
||||
# RSO's pi_id actually matches the pi_id returned by stripe API for the charge.
|
||||
try:
|
||||
rso = ReferencedStripeObject.objects.select_related('order', 'order__event').get(
|
||||
reference=event_json['data']['object']['payment_intent']
|
||||
)
|
||||
return func(rso.order.event, event_json, objid, rso)
|
||||
rso = rso_qs.get(reference=untrusted_obj['payment_intent'])
|
||||
except ReferencedStripeObject.DoesNotExist:
|
||||
return HttpResponse("Unable to detect event", status=200)
|
||||
elif hasattr(request, 'event') and func != paymentintent_webhook:
|
||||
# This is a legacy integration from back when didn't have ReferencedStripeObject. This can't happen for
|
||||
# payment intents or charges connected with payment intents since they didn't exist back then. Our best
|
||||
# hope is to go for request.event and see if we can find the order ID.
|
||||
return func(request.event, event_json, objid, None)
|
||||
else:
|
||||
# Okay, this is probably not an event that concerns us, maybe other applications talk to the same stripe
|
||||
# account
|
||||
return HttpResponse("Unable to detect event", status=200)
|
||||
pass
|
||||
|
||||
if rso:
|
||||
return charge_webhook(untrusted_json, charge_id, rso)
|
||||
else:
|
||||
# Okay, this is probably not an event that concerns us, maybe other applications talk to the same stripe
|
||||
# account
|
||||
return HttpResponse("Unable to detect event", status=200)
|
||||
|
||||
|
||||
SOURCE_TYPES = {
|
||||
@@ -243,12 +234,12 @@ SOURCE_TYPES = {
|
||||
}
|
||||
|
||||
|
||||
def charge_webhook(event, event_json, charge_id, rso):
|
||||
def charge_webhook(untrusted_json, charge_id, rso):
|
||||
import stripe
|
||||
|
||||
from pretix.plugins.stripe.payment import StripeCC
|
||||
|
||||
prov = StripeCC(event)
|
||||
prov = StripeCC(rso.order.event)
|
||||
prov._init_api()
|
||||
|
||||
try:
|
||||
@@ -258,51 +249,34 @@ def charge_webhook(event, event_json, charge_id, rso):
|
||||
**prov.api_kwargs
|
||||
)
|
||||
except stripe.error.StripeError:
|
||||
logger.exception('Stripe error on webhook. Event data: %s' % str(event_json))
|
||||
logger.exception('Stripe error on webhook. Event data: %s' % str(untrusted_json))
|
||||
return HttpResponse('Charge not found', status=500)
|
||||
|
||||
metadata = charge['metadata']
|
||||
if 'event' not in metadata:
|
||||
return HttpResponse('Event not given in charge metadata', status=200)
|
||||
|
||||
if int(metadata['event']) != event.pk:
|
||||
if int(metadata['event']) != rso.order.event.pk:
|
||||
return HttpResponse('Not interested in this event', status=200)
|
||||
|
||||
if rso and rso.payment:
|
||||
order = rso.payment.order
|
||||
payment = rso.payment
|
||||
elif rso:
|
||||
order = rso.order
|
||||
payment = None
|
||||
else:
|
||||
try:
|
||||
order = event.orders.get(id=metadata['order'])
|
||||
except Order.DoesNotExist:
|
||||
return HttpResponse('Order not found', status=200)
|
||||
payment = None
|
||||
# Check the charge we fetched from stripe actually matches our RSO, and as such our own payment and order objects
|
||||
allowed_references = [charge.id]
|
||||
if getattr(charge, "payment_intent", None):
|
||||
allowed_references.append(charge.payment_intent.id)
|
||||
if rso.reference not in allowed_references:
|
||||
return HttpResponse('Charge mismatched', status=200)
|
||||
|
||||
order = rso.payment.order
|
||||
payment = rso.payment
|
||||
|
||||
with transaction.atomic():
|
||||
if payment:
|
||||
payment = OrderPayment.objects.select_for_update(of=OF_SELF).get(pk=payment.pk)
|
||||
else:
|
||||
payment = order.payments.filter(
|
||||
info__icontains=charge['id'],
|
||||
provider__startswith='stripe',
|
||||
amount=prov._amount_to_decimal(charge['amount']),
|
||||
).select_for_update(of=OF_SELF).last()
|
||||
if not payment:
|
||||
payment = order.payments.create(
|
||||
state=OrderPayment.PAYMENT_STATE_CREATED,
|
||||
provider=SOURCE_TYPES.get(charge['source'].get('type', charge['source'].get('object', 'card')), 'stripe'),
|
||||
amount=prov._amount_to_decimal(charge['amount']),
|
||||
info=str(charge),
|
||||
)
|
||||
payment = OrderPayment.objects.select_for_update(of=OF_SELF).get(pk=payment.pk)
|
||||
|
||||
if payment.provider != prov.identifier:
|
||||
prov = payment.payment_provider
|
||||
prov._init_api()
|
||||
|
||||
order.log_action('pretix.plugins.stripe.event', data=event_json)
|
||||
order.log_action('pretix.plugins.stripe.event', data=untrusted_json)
|
||||
|
||||
is_refund = charge['amount_refunded'] or charge['refunds']['total_count'] or charge['dispute']
|
||||
if is_refund:
|
||||
@@ -350,91 +324,18 @@ def charge_webhook(event, event_json, charge_id, rso):
|
||||
return HttpResponse(status=200)
|
||||
|
||||
|
||||
def source_webhook(event, event_json, source_id, rso):
|
||||
def paymentintent_webhook(untrusted_json, paymentintent_id, rso):
|
||||
import stripe
|
||||
|
||||
from pretix.plugins.stripe.payment import StripeCC
|
||||
|
||||
prov = StripeCC(event)
|
||||
prov._init_api()
|
||||
try:
|
||||
src = stripe.Source.retrieve(source_id, **prov.api_kwargs)
|
||||
except stripe.error.StripeError:
|
||||
logger.exception('Stripe error on webhook. Event data: %s' % str(event_json))
|
||||
return HttpResponse('Charge not found', status=500)
|
||||
|
||||
metadata = src['metadata']
|
||||
if 'event' not in metadata:
|
||||
return HttpResponse('Event not given in charge metadata', status=200)
|
||||
|
||||
if int(metadata['event']) != event.pk:
|
||||
return HttpResponse('Not interested in this event', status=200)
|
||||
|
||||
with transaction.atomic():
|
||||
if rso and rso.payment:
|
||||
order = rso.payment.order
|
||||
payment = rso.payment
|
||||
elif rso:
|
||||
order = rso.order
|
||||
payment = None
|
||||
else:
|
||||
try:
|
||||
order = event.orders.get(id=metadata['order'])
|
||||
except Order.DoesNotExist:
|
||||
return HttpResponse('Order not found', status=200)
|
||||
payment = None
|
||||
|
||||
if payment:
|
||||
payment = OrderPayment.objects.select_for_update(of=OF_SELF).get(pk=payment.pk)
|
||||
else:
|
||||
payment = order.payments.filter(
|
||||
info__icontains=src['id'],
|
||||
provider__startswith='stripe',
|
||||
amount=prov._amount_to_decimal(src['amount']) if src['amount'] is not None else order.total,
|
||||
).select_for_update(of=OF_SELF).last()
|
||||
if not payment:
|
||||
payment = order.payments.create(
|
||||
state=OrderPayment.PAYMENT_STATE_CREATED,
|
||||
provider=SOURCE_TYPES.get(src['type'], 'stripe'),
|
||||
amount=prov._amount_to_decimal(src['amount']) if src['amount'] is not None else order.total,
|
||||
info=str(src),
|
||||
)
|
||||
|
||||
if payment.provider != prov.identifier:
|
||||
prov = payment.payment_provider
|
||||
prov._init_api()
|
||||
|
||||
order.log_action('pretix.plugins.stripe.event', data=event_json)
|
||||
go = (event_json['type'] == 'source.chargeable' and
|
||||
payment.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED) and
|
||||
src.status == 'chargeable')
|
||||
if go:
|
||||
try:
|
||||
prov._charge_source(None, source_id, payment)
|
||||
except PaymentException:
|
||||
logger.exception('Webhook error')
|
||||
elif src.status == 'failed':
|
||||
payment.fail(info=str(src))
|
||||
elif src.status == 'canceled' and payment.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED):
|
||||
payment.info = str(src)
|
||||
payment.state = OrderPayment.PAYMENT_STATE_CANCELED
|
||||
payment.save()
|
||||
|
||||
return HttpResponse(status=200)
|
||||
|
||||
|
||||
def paymentintent_webhook(event, event_json, paymentintent_id, rso):
|
||||
import stripe
|
||||
|
||||
from pretix.plugins.stripe.payment import StripeCC
|
||||
|
||||
prov = StripeCC(event)
|
||||
prov = StripeCC(rso.order.event)
|
||||
prov._init_api()
|
||||
|
||||
try:
|
||||
paymentintent = stripe.PaymentIntent.retrieve(paymentintent_id, expand=["latest_charge"], **prov.api_kwargs)
|
||||
except stripe.error.StripeError:
|
||||
logger.exception('Stripe error on webhook. Event data: %s' % str(event_json))
|
||||
logger.exception('Stripe error on webhook. Event data: %s' % str(untrusted_json))
|
||||
return HttpResponse('Charge not found', status=500)
|
||||
|
||||
if paymentintent.latest_charge:
|
||||
@@ -443,8 +344,10 @@ def paymentintent_webhook(event, event_json, paymentintent_id, rso):
|
||||
defaults={'order': rso.payment.order, 'payment': rso.payment}
|
||||
)
|
||||
|
||||
if event_json["type"] == "payment_intent.payment_failed":
|
||||
rso.payment.fail(info=event_json)
|
||||
# We consider the risk acceptable that someone who knows the payment intent ID can
|
||||
# mark a pending payment as failed, therefore we 'trust' the event type here:
|
||||
if untrusted_json["type"] == "payment_intent.payment_failed":
|
||||
rso.payment.fail(info=str(paymentintent), log_data=untrusted_json)
|
||||
|
||||
return HttpResponse(status=200)
|
||||
|
||||
@@ -496,59 +399,6 @@ class StripeOrderView:
|
||||
}) + ('?paid=yes' if self.order.status == Order.STATUS_PAID else ''))
|
||||
|
||||
|
||||
@method_decorator(xframe_options_exempt, 'dispatch')
|
||||
class ReturnView(StripeOrderView, View):
|
||||
def get(self, request, *args, **kwargs):
|
||||
import stripe
|
||||
|
||||
prov = self.pprov
|
||||
prov._init_api()
|
||||
try:
|
||||
src = stripe.Source.retrieve(request.GET.get('source'), **prov.api_kwargs)
|
||||
except stripe.error.InvalidRequestError:
|
||||
logger.exception('Could not retrieve source')
|
||||
messages.error(self.request, _('Sorry, there was an error in the payment process. Please check the link '
|
||||
'in your emails to continue.'))
|
||||
return redirect_to_url(eventreverse(self.request.event, 'presale:event.index'))
|
||||
|
||||
if src.client_secret != request.GET.get('client_secret'):
|
||||
messages.error(self.request, _('Sorry, there was an error in the payment process. Please check the link '
|
||||
'in your emails to continue.'))
|
||||
return redirect_to_url(eventreverse(self.request.event, 'presale:event.index'))
|
||||
|
||||
with transaction.atomic():
|
||||
self.order.refresh_from_db()
|
||||
self.payment = OrderPayment.objects.select_for_update(of=OF_SELF).get(pk=self.payment.pk)
|
||||
if self.payment.state == OrderPayment.PAYMENT_STATE_CONFIRMED:
|
||||
if 'payment_stripe_token' in request.session:
|
||||
del request.session['payment_stripe_token']
|
||||
return self._redirect_to_order()
|
||||
|
||||
if src.status == 'chargeable':
|
||||
try:
|
||||
prov._charge_source(request, src.id, self.payment)
|
||||
except PaymentException as e:
|
||||
messages.error(request, str(e))
|
||||
return self._redirect_to_order()
|
||||
finally:
|
||||
if 'payment_stripe_token' in request.session:
|
||||
del request.session['payment_stripe_token']
|
||||
elif src.status == 'consumed':
|
||||
# Webhook was faster, wow! ;)
|
||||
if 'payment_stripe_token' in request.session:
|
||||
del request.session['payment_stripe_token']
|
||||
return self._redirect_to_order()
|
||||
elif src.status == 'pending':
|
||||
self.payment.state = OrderPayment.PAYMENT_STATE_PENDING
|
||||
self.payment.info = str(src)
|
||||
self.payment.save()
|
||||
else: # failed or canceled
|
||||
self.payment.fail(info=str(src))
|
||||
messages.error(self.request, _('We had trouble authorizing your card payment. Please try again and '
|
||||
'get in touch with us if this problem persists.'))
|
||||
return self._redirect_to_order()
|
||||
|
||||
|
||||
@method_decorator(xframe_options_exempt, 'dispatch')
|
||||
class ScaView(StripeOrderView, View):
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
#
|
||||
from datetime import timedelta
|
||||
|
||||
from celery.result import AsyncResult
|
||||
from django.conf import settings
|
||||
from django.db import transaction
|
||||
from django.db.models import QuerySet
|
||||
@@ -38,6 +37,7 @@ from rest_framework.reverse import reverse
|
||||
|
||||
from pretix.api.serializers.i18n import I18nAwareModelSerializer
|
||||
from pretix.api.serializers.order import CompatibleJSONField
|
||||
from pretix.helpers.celery import get_task_result
|
||||
|
||||
from ...api.serializers.fields import UploadedFileField
|
||||
from ...base.models import CachedFile, OrderPosition, SalesChannel
|
||||
@@ -111,6 +111,7 @@ class TicketLayoutViewSet(viewsets.ModelViewSet):
|
||||
serializer_class = TicketLayoutSerializer
|
||||
queryset = TicketLayout.objects.none()
|
||||
lookup_field = 'id'
|
||||
write_permission = 'event.settings.general:write'
|
||||
|
||||
def get_queryset(self):
|
||||
return self.request.event.ticket_layouts.all()
|
||||
@@ -244,7 +245,7 @@ class TicketRendererViewSet(viewsets.ViewSet):
|
||||
status=status.HTTP_410_GONE
|
||||
)
|
||||
|
||||
res = AsyncResult(kwargs['asyncid'])
|
||||
res = get_task_result(kwargs['asyncid'], task_name=bulk_render)
|
||||
if res.failed():
|
||||
if isinstance(res.info, dict) and res.info['exc_type'] == 'ExportError':
|
||||
msg = res.info['exc_message']
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
<div role="cell" class="download-desktop">
|
||||
{% if line in tickets_with_download %}
|
||||
{% for b in download_buttons %}
|
||||
<form action="{% if position_page and line.addon_to %}{% eventurl event "presale:event.order.position.download" secret=line.addon_to.web_secret order=order.code output=b.identifier pid=line.pk position=line.addon_to.positionid %}{% elif position_page %}{% eventurl event "presale:event.order.position.download" secret=line.web_secret order=order.code output=b.identifier pid=line.pk position=line.positionid %}{% else %}{% eventurl event "presale:event.order.download" secret=order.secret order=order.code output=b.identifier position=line.pk %}{% endif %}"
|
||||
<form action="{% if position_page %}{% eventurl event "presale:event.order.position.download" secret=position_page.web_secret order=order.code output=b.identifier pid=line.pk position=position_page.positionid %}{% else %}{% eventurl event "presale:event.order.download" secret=order.secret order=order.code output=b.identifier position=line.pk %}{% endif %}"
|
||||
method="post" data-asynctask data-asynctask-download class="download-btn-form{% if b.javascript_required %} requirejs{% endif %}">
|
||||
{% csrf_token %}
|
||||
<button type="submit"
|
||||
@@ -364,7 +364,7 @@
|
||||
<code>{{ gc.secret }}</code>
|
||||
<strong>{% trans "Current value:" %}</strong>
|
||||
{{ gc.value|money:gc.currency }}
|
||||
<a href="{% if position_page and line.addon_to %}{% eventurl event "presale:event.order.position.giftcard" secret=line.addon_to.web_secret order=order.code pk=gc.pk position=line.addon_to.positionid %}{% elif position_page %}{% eventurl event "presale:event.order.position.giftcard" secret=line.web_secret order=order.code pk=gc.pk position=line.positionid %}{% else %}{% eventurl event "presale:event.order.giftcard" secret=order.secret order=order.code pk=gc.pk %}{% endif %}"
|
||||
<a href="{% if position_page %}{% eventurl event "presale:event.order.position.giftcard" secret=position_page.web_secret order=order.code pk=gc.pk position=line.positionid %}{% else %}{% eventurl event "presale:event.order.giftcard" secret=order.secret order=order.code pk=gc.pk %}{% endif %}"
|
||||
class="btn btn-default btn-sm">
|
||||
<span class="fa fa-eye" aria-hidden="true"></span>
|
||||
{% trans "Details" %}
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
{% elif tickets_with_download|length == 1 %}
|
||||
<div>
|
||||
{% for b in download_buttons %}
|
||||
<form action="{% if position_page and tickets_with_download.0.addon_to %}{% eventurl event "presale:event.order.position.download" secret=tickets_with_download.0.addon_to.web_secret order=order.code output=b.identifier pid=tickets_with_download.0.pk position=tickets_with_download.0.addon_to.positionid %}{% elif position_page %}{% eventurl event "presale:event.order.position.download" secret=tickets_with_download.0.web_secret order=order.code output=b.identifier pid=tickets_with_download.0.pk position=tickets_with_download.0.positionid %}{% else %}{% eventurl event "presale:event.order.download" secret=order.secret order=order.code output=b.identifier position=tickets_with_download.0.pk %}{% endif %}"
|
||||
<form action="{% if position_page %}{% eventurl event "presale:event.order.position.download" secret=position_page.web_secret order=order.code output=b.identifier pid=tickets_with_download.0.pk position=position_page.positionid %}{% else %}{% eventurl event "presale:event.order.download" secret=order.secret order=order.code output=b.identifier position=tickets_with_download.0.pk %}{% endif %}"
|
||||
method="post" data-asynctask data-asynctask-download
|
||||
class="download-btn-form{% if b.javascript_required %} requirejs{% endif %}">
|
||||
{% csrf_token %}
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
{% if answer %}
|
||||
{% if answer.file %}
|
||||
<span class="fa fa-file" aria-hidden="true"></span>
|
||||
<a href="{{ answer.frontend_file_url }}?token={% answer_token request answer %}">
|
||||
<a href="{% answer_url request answer %}">
|
||||
{{ answer.file_name }}
|
||||
</a>
|
||||
{% if answer.is_image %}
|
||||
<br>
|
||||
<a href="{{ answer.frontend_file_url }}?token={% answer_token request answer %}" data-lightbox="order"
|
||||
<a href="{% answer_url request answer %}" data-lightbox="order"
|
||||
class="answer-thumb">
|
||||
<img src="{{ answer.frontend_file_url }}?token={% answer_token request answer %}" alt="{% trans "The image you previously uploaded" %}">
|
||||
<img src="{% answer_url request answer %}" alt="{% trans "The image you previously uploaded" %}">
|
||||
</a>
|
||||
{% endif %}
|
||||
{% elif question.type == "M" %}
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<dd class="text-muted">{% include "pretixpresale/event/fragment_order_status.html" with order=order event=request.event %}</dd>
|
||||
</dl>
|
||||
{% eventsignal event "pretix.presale.signals.position_info_top" order=order position=position request=request %}
|
||||
{% include "pretixpresale/event/fragment_downloads.html" with position_page=True %}
|
||||
{% include "pretixpresale/event/fragment_downloads.html" with position_page=position %}
|
||||
<div class="panel panel-primary cart">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">
|
||||
@@ -38,7 +38,7 @@
|
||||
</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
{% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event download=can_download position_page=True editable=False hide_prices=request.event.settings.hide_prices_from_attendees %}
|
||||
{% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event download=can_download position_page=position editable=False hide_prices=request.event.settings.hide_prices_from_attendees %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel panel-primary">
|
||||
|
||||
@@ -135,9 +135,6 @@ event_patterns = [
|
||||
re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/change',
|
||||
pretix.presale.views.order.OrderPayChangeMethod.as_view(),
|
||||
name='event.order.pay.change'),
|
||||
re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/answer/(?P<answer>[^/]+)/$',
|
||||
pretix.presale.views.order.AnswerDownload.as_view(),
|
||||
name='event.order.download.answer'),
|
||||
re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/download/(?P<output>[^/]+)$',
|
||||
pretix.presale.views.order.OrderDownload.as_view(),
|
||||
name='event.order.download.combined'),
|
||||
@@ -167,6 +164,9 @@ event_patterns = [
|
||||
pretix.presale.views.order.OrderPositionModify.as_view(),
|
||||
name='event.order.position.modify'),
|
||||
|
||||
re_path(r'^answer/(?P<answer>[^/]+)/$',
|
||||
pretix.presale.views.order.AnswerDownload.as_view(),
|
||||
name='event.download.answer'),
|
||||
re_path(r'^ical/?$',
|
||||
pretix.presale.views.event.EventIcalDownload.as_view(),
|
||||
name='event.ical.download'),
|
||||
|
||||
@@ -247,7 +247,28 @@ def _items_from_post_data(request, warn_if_empty=True):
|
||||
|
||||
items = []
|
||||
if 'raw' in request.POST:
|
||||
items += json.loads(request.POST.get("raw"))
|
||||
for obj in json.loads(request.POST.get("raw")):
|
||||
try:
|
||||
amount = int(obj['count'])
|
||||
if amount <= 0:
|
||||
continue
|
||||
items.append({
|
||||
'item': int(obj['item']),
|
||||
'variation': int(obj['variation']) if obj.get('variation') else None,
|
||||
'count': amount,
|
||||
'seat': obj.get('seat'),
|
||||
'price': obj.get('price', ''),
|
||||
'voucher': obj.get('voucher'),
|
||||
'voucher_ignore_if_redeemed': obj.get('voucher_ignore_if_redeemed'),
|
||||
'subevent': int(obj['subevent']) if obj.get('subevent') else None,
|
||||
})
|
||||
except ValueError:
|
||||
messages.error(request, _('Please enter numbers only.'))
|
||||
return
|
||||
except KeyError:
|
||||
messages.error(request, _('Your input was not valid.'))
|
||||
return
|
||||
|
||||
for key, values in req_items:
|
||||
for value in values:
|
||||
try:
|
||||
@@ -262,6 +283,7 @@ def _items_from_post_data(request, warn_if_empty=True):
|
||||
if len(items) == 0 and warn_if_empty:
|
||||
messages.warning(request, _('You did not select any products.'))
|
||||
return []
|
||||
|
||||
return items
|
||||
|
||||
|
||||
|
||||
@@ -1156,25 +1156,23 @@ class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View):
|
||||
|
||||
|
||||
@method_decorator(xframe_options_exempt, 'dispatch')
|
||||
class AnswerDownload(EventViewMixin, OrderDetailMixin, View):
|
||||
class AnswerDownload(EventViewMixin, View):
|
||||
def get(self, request, *args, **kwargs):
|
||||
answid = kwargs.get('answer')
|
||||
token = request.GET.get('token', '')
|
||||
|
||||
answer = get_object_or_404(
|
||||
QuestionAnswer,
|
||||
Q(orderposition__order=self.order) | Q(order=self.order),
|
||||
Q(orderposition__order__event=self.request.event) | Q(order__event=self.request.event),
|
||||
id=answid,
|
||||
)
|
||||
if not answer.file:
|
||||
raise Http404()
|
||||
if not check_token(request, answer, token):
|
||||
if not answer.file or not check_token(request, answer, token):
|
||||
raise Http404(_("This link is no longer valid. Please go back, refresh the page, and try again."))
|
||||
|
||||
ftype, ignored = mimetypes.guess_type(answer.file.name)
|
||||
resp = FileResponse(answer.file, content_type=ftype or 'application/binary')
|
||||
resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}"'.format(
|
||||
self.request.event.slug.upper(), self.order.code,
|
||||
self.request.event.slug.upper(), answer.associated_order.code,
|
||||
answer.orderposition.positionid if answer.orderposition else '',
|
||||
os.path.basename(answer.file.name).split('.', 1)[1]
|
||||
)
|
||||
|
||||
+11
-1
@@ -37,6 +37,7 @@ import configparser
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
import warnings
|
||||
from json import loads
|
||||
from pathlib import Path
|
||||
from urllib.parse import urlparse
|
||||
@@ -383,6 +384,7 @@ if HAS_CELERY:
|
||||
CELERY_RESULT_BACKEND_TRANSPORT_OPTIONS = loads(config.get('celery', 'backend_transport_options'))
|
||||
CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True
|
||||
|
||||
_redis_types = ("redis://", "rediss://", "sentinel://", "redis+socket://")
|
||||
if CELERY_BROKER_URL.startswith("amqp://"):
|
||||
# https://docs.celeryq.dev/en/latest/userguide/routing.html#routing-options-rabbitmq-priorities
|
||||
# Enable priorities for all queues
|
||||
@@ -395,7 +397,9 @@ if HAS_CELERY:
|
||||
PRIORITY_CELERY_HIGHEST_FUNC = max
|
||||
# Set default
|
||||
CELERY_TASK_DEFAULT_PRIORITY = PRIORITY_CELERY_MID
|
||||
elif CELERY_BROKER_URL.startswith("redis://"):
|
||||
warnings.warn("pretix only officially supports running with redis as a celery task broker. "
|
||||
"Unexpected behavior might occur.")
|
||||
elif any(CELERY_BROKER_URL.startswith(p) for p in _redis_types):
|
||||
# https://docs.celeryq.dev/en/latest/userguide/routing.html#redis-message-priorities
|
||||
CELERY_BROKER_TRANSPORT_OPTIONS.update({
|
||||
"queue_order_strategy": "priority",
|
||||
@@ -417,6 +421,12 @@ if HAS_CELERY:
|
||||
PRIORITY_CELERY_HIGH = 0
|
||||
PRIORITY_CELERY_LOWEST_FUNC = min
|
||||
PRIORITY_CELERY_HIGHEST_FUNC = max
|
||||
warnings.warn("pretix only officially supports running with redis as a celery task broker. "
|
||||
"Unexpected behavior might occur.")
|
||||
|
||||
if not any(CELERY_RESULT_BACKEND.startswith(p) for p in _redis_types):
|
||||
warnings.warn("pretix only officially supports running with redis as a celery task backend. "
|
||||
"Unexpected behavior might occur.")
|
||||
else:
|
||||
CELERY_TASK_ALWAYS_EAGER = True
|
||||
PRIORITY_CELERY_LOW = 0
|
||||
|
||||
@@ -42,7 +42,8 @@ from django.utils.timezone import now
|
||||
from rest_framework.test import APIClient
|
||||
|
||||
from pretix.base.models import (
|
||||
CachedFile, Event, ScheduledEventExport, ScheduledOrganizerExport, User,
|
||||
CachedFile, Event, Organizer, ScheduledEventExport,
|
||||
ScheduledOrganizerExport, User,
|
||||
)
|
||||
|
||||
SAMPLE_EXPORTER_CONFIG = {
|
||||
@@ -469,6 +470,22 @@ def test_event_scheduled_export_update_token(token_client, organizer, event, use
|
||||
assert created.export_form_data == {"_format": "xlsx", "date_range": "month_this", "items": []}
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_event_scheduled_export_update_identifier_readonly(token_client, organizer, event, user, event_scheduled_export):
|
||||
resp = token_client.patch(
|
||||
'/api/v1/organizers/{}/events/{}/scheduled_exports/{}/'.format(
|
||||
organizer.slug, event.slug, event_scheduled_export.pk,
|
||||
),
|
||||
data={
|
||||
"export_identifier": "transactions",
|
||||
"export_form_data": {"_format": "xlsx", "date_range": "month_this"},
|
||||
},
|
||||
format='json'
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
assert resp.data == {"export_identifier": ["export_identifier cannot be changed for existing exports."]}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def org_scheduled_export(organizer, user):
|
||||
e = organizer.scheduled_exports.create(
|
||||
@@ -637,6 +654,23 @@ def test_org_scheduled_export_update_token(token_client, organizer, user, org_sc
|
||||
assert created.timezone == "America/New_York"
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_org_scheduled_export_update_identifier_readonly(token_client, organizer, user, org_scheduled_export):
|
||||
resp = token_client.patch(
|
||||
'/api/v1/organizers/{}/scheduled_exports/{}/'.format(
|
||||
organizer.slug, org_scheduled_export.pk,
|
||||
),
|
||||
data={
|
||||
"export_identifier": "transactions",
|
||||
"export_form_data": {"_format": "xlsx", "date_range": "month_this"},
|
||||
"timezone": "America/New_York"
|
||||
},
|
||||
format='json'
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
assert resp.data == {"export_identifier": ["export_identifier cannot be changed for existing exports."]}
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_org_scheduled_export_validate_identifier(user_client, organizer, user):
|
||||
resp = user_client.post(
|
||||
@@ -885,6 +919,10 @@ def test_organizer_edit_restrictions(client, event, organizer, user, team):
|
||||
team1.limit_events.add(event1)
|
||||
team1.members.add(user)
|
||||
|
||||
organizer2 = Organizer.objects.create(name='Dummy2', slug='dummy2')
|
||||
org2_team = organizer2.teams.create(all_events=True, all_event_permissions=True, name="Admins")
|
||||
org2_team.members.add(user)
|
||||
|
||||
t = team.tokens.create(name='Foo')
|
||||
client.credentials(HTTP_AUTHORIZATION='Token ' + t.token)
|
||||
|
||||
@@ -1012,6 +1050,87 @@ def _get_and_patch_event_export(client, scheduled, can_see=True, can_edit=True):
|
||||
return True
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_organizer_edit_restrictions_event_expansion(client, event, organizer, user, team):
|
||||
# This tests the prevention of a possible privilege escalation where user A creates a scheduled export and
|
||||
# user B has settings permission (= they can see the export configuration), and enough permission
|
||||
# to run the export themselves, but not enough permission to add events. Without this check, user B could
|
||||
# modify the export and add themselves as a recipient. Thereby, user B would gain access to data they can't have.
|
||||
user1_client = APIClient()
|
||||
user1_client.force_authenticate(user=user)
|
||||
user2 = User.objects.create_user("dummy2@dummy.dummy", "dummy")
|
||||
user2_client = APIClient()
|
||||
user2_client.force_authenticate(user=user2)
|
||||
|
||||
event1 = event
|
||||
event2 = Event.objects.create(
|
||||
organizer=organizer, name="Dummy", slug="dummy2",
|
||||
date_from=now(), plugins="pretix.plugins.banktransfer,pretix.plugins.stripe,tests.testdummy"
|
||||
)
|
||||
|
||||
# Team 1 has access only to one event
|
||||
team1 = team
|
||||
team1.all_organizer_permissions = False
|
||||
team1.all_event_permissions = False
|
||||
team1.all_events = False
|
||||
team1.limit_organizer_permissions = {"organizer.settings.general:write": True}
|
||||
team1.limit_event_permissions = {"event.orders:read": True, "event.settings.general:write": True}
|
||||
team1.save()
|
||||
team1.limit_events.add(event1)
|
||||
team1.members.add(user)
|
||||
|
||||
# Team 2 has full admin access
|
||||
team2 = organizer.teams.create(
|
||||
all_organizer_permissions=True, all_event_permissions=True, all_events=True,
|
||||
)
|
||||
team2.members.add(user2)
|
||||
|
||||
s1 = ScheduledOrganizerExport.objects.create(
|
||||
organizer=organizer,
|
||||
owner=user2,
|
||||
export_identifier="dummy_orders",
|
||||
export_form_data={"all_events": False, "events": [event1.pk]},
|
||||
mail_subject="Test",
|
||||
mail_template="Test",
|
||||
locale="en",
|
||||
schedule_rrule="DTSTART:20230118T000000\nRRULE:FREQ=DAILY;INTERVAL=1;WKST=MO",
|
||||
schedule_rrule_time=time(2, 30, 0)
|
||||
)
|
||||
# User 1 can change …
|
||||
response = user1_client.patch(
|
||||
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
|
||||
data={"mail_subject": "Hello"},
|
||||
format='json',
|
||||
)
|
||||
assert response.status_code == 200
|
||||
# … but not expand scope
|
||||
response = user1_client.patch(
|
||||
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
|
||||
data={"export_form_data": {"all_events": False, "events": [event1.slug, event2.slug], "_format": "xlsx", "date_range": "year_this", "items": []}},
|
||||
format='json',
|
||||
)
|
||||
assert response.status_code == 400
|
||||
response = user1_client.patch(
|
||||
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
|
||||
data={"export_form_data": {"all_events": True, "events": [], "_format": "xlsx", "date_range": "year_this", "items": []}},
|
||||
format='json',
|
||||
)
|
||||
assert response.status_code == 403
|
||||
# User 2 can expand
|
||||
response = user2_client.patch(
|
||||
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
|
||||
data={"export_form_data": {"all_events": True, "events": [], "_format": "xlsx", "date_range": "year_this", "items": []}},
|
||||
format='json',
|
||||
)
|
||||
assert response.status_code == 200
|
||||
response = user2_client.patch(
|
||||
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
|
||||
data={"export_form_data": {"all_events": False, "events": [event1.slug, event2.slug], "_format": "xlsx", "date_range": "year_this", "items": []}},
|
||||
format='json',
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_event_edit_restrictions(client, event, organizer, user, team):
|
||||
# This tests the prevention of a possible privilege escalation where user A creates a scheduled export and
|
||||
|
||||
@@ -107,29 +107,34 @@ def test_run_success(token_client, order, organizer, team, event):
|
||||
event.date_from = now() - timedelta(days=91)
|
||||
event.date_to = now() - timedelta(days=90)
|
||||
event.save()
|
||||
resp = token_client.post(
|
||||
export_resp = token_client.post(
|
||||
'/api/v1/organizers/{}/events/{}/shredders/export/'.format(organizer.slug, event.slug),
|
||||
data={
|
||||
'shredders': ['order_emails']
|
||||
}, format='json'
|
||||
)
|
||||
assert resp.status_code == 202
|
||||
assert "download" in resp.data
|
||||
assert "shred" in resp.data
|
||||
assert export_resp.status_code == 202
|
||||
assert "download" in export_resp.data
|
||||
assert "shred" in export_resp.data
|
||||
|
||||
resp2 = token_client.get("/" + resp.data["download"].split("/", 3)[3])
|
||||
assert resp2.status_code == 200
|
||||
assert resp2["Content-Type"] == "application/zip"
|
||||
download_resp = token_client.get("/" + export_resp.data["download"].split("/", 3)[3])
|
||||
assert download_resp.status_code == 200
|
||||
assert download_resp["Content-Type"] == "application/zip"
|
||||
|
||||
resp3 = token_client.post("/" + resp.data["shred"].split("/", 3)[3])
|
||||
assert resp3.status_code == 202
|
||||
assert "status" in resp3.data
|
||||
status_resp = token_client.get("/" + export_resp.data["shred"].split("/", 3)[3].replace("/shred/", "/status/"))
|
||||
assert status_resp.status_code == 404 # cannot get the status of a shred task that does not exists
|
||||
|
||||
resp4 = token_client.get("/" + resp3.data["status"].split("/", 3)[3])
|
||||
assert resp4.status_code == 410 # because we have no celery
|
||||
shred_resp = token_client.post("/" + export_resp.data["shred"].split("/", 3)[3])
|
||||
assert shred_resp.status_code == 202
|
||||
assert "status" in shred_resp.data
|
||||
|
||||
resp2 = token_client.get("/" + resp.data["download"].split("/", 3)[3])
|
||||
assert resp2.status_code == 404 # shredded now
|
||||
assert export_resp.data['shred'].split("/")[11] != shred_resp.data['status'].split("/")[11] # shredding should have a different task id than exporting
|
||||
|
||||
status_resp = token_client.get("/" + shred_resp.data["status"].split("/", 3)[3])
|
||||
assert status_resp.status_code == 410 # because we have no celery
|
||||
|
||||
download_resp = token_client.get("/" + export_resp.data["download"].split("/", 3)[3])
|
||||
assert download_resp.status_code == 404 # shredded now
|
||||
|
||||
order.refresh_from_db()
|
||||
assert not order.email
|
||||
|
||||
@@ -162,6 +162,32 @@ def test_event_export_schedule(client, env):
|
||||
assert env[0].scheduled_exports.count() == 0
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_event_export_schedule_copy_new_owner(client, env):
|
||||
env[2].all_events = True
|
||||
env[2].save()
|
||||
user2 = User.objects.create_user("dummy2@dummy.dummy", "dummy")
|
||||
|
||||
s1 = ScheduledEventExport(event=env[0], owner=user2, export_identifier="itemdata")
|
||||
s1.schedule_rrule = "DTSTART:20230118T000000\nRRULE:FREQ=DAILY;INTERVAL=1;WKST=MO"
|
||||
s1.schedule_rrule_time = datetime.time(2, 30, 0)
|
||||
s1.error_counter = 5
|
||||
s1.mail_subject = "RULE1"
|
||||
s1.mail_template = "RULE1 Text"
|
||||
s1.save()
|
||||
|
||||
client.login(email="dummy@dummy.dummy", password="dummy")
|
||||
response = client.get(f"/control/event/dummy/dummy/orders/export/?identifier=itemdata&scheduled_copy_from={s1.pk}")
|
||||
doc = BeautifulSoup(response.content, "lxml")
|
||||
form_data = extract_form_fields(doc.select("form[data-asynctask]")[0])
|
||||
form_data["schedule"] = "save"
|
||||
|
||||
client.post(f"/control/event/dummy/dummy/orders/export/?identifier=itemdata&scheduled_copy_from={s1.pk}", form_data)
|
||||
new = ScheduledEventExport.objects.get(pk__gt=s1.pk)
|
||||
assert new.owner == env[1]
|
||||
assert new.error_counter == 0
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_event_limited_permission(client, env):
|
||||
env[2].all_event_permissions = False
|
||||
@@ -330,6 +356,33 @@ def test_organizer_export_schedule(client, env):
|
||||
assert env[0].organizer.scheduled_exports.count() == 0
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_organizer_export_schedule_copy_new_owner(client, env):
|
||||
env[2].all_organizer_permissions = True
|
||||
env[2].save()
|
||||
user2 = User.objects.create_user("dummy2@dummy.dummy", "dummy")
|
||||
|
||||
s1 = ScheduledOrganizerExport(organizer=env[0].organizer, owner=user2, export_identifier="eventdata")
|
||||
s1.schedule_rrule = "DTSTART:20230118T000000\nRRULE:FREQ=DAILY;INTERVAL=1;WKST=MO"
|
||||
s1.schedule_rrule_time = datetime.time(2, 30, 0)
|
||||
s1.error_counter = 5
|
||||
s1.mail_subject = "RULE1"
|
||||
s1.mail_template = "RULE1 Text"
|
||||
s1.export_form_data = {"all_events": True}
|
||||
s1.save()
|
||||
|
||||
client.login(email="dummy@dummy.dummy", password="dummy")
|
||||
response = client.get(f"/control/organizer/dummy/export/?identifier=eventdata&scheduled_copy_from={s1.pk}")
|
||||
doc = BeautifulSoup(response.content, "lxml")
|
||||
form_data = extract_form_fields(doc.select("form[data-asynctask]")[0])
|
||||
form_data["schedule"] = "save"
|
||||
|
||||
client.post(f"/control/organizer/dummy/export/?identifier=eventdata&scheduled_copy_from={s1.pk}", form_data)
|
||||
new = ScheduledOrganizerExport.objects.get(pk__gt=s1.pk)
|
||||
assert new.owner == env[1]
|
||||
assert new.error_counter == 0
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_organizer_limited_permission(client, env):
|
||||
env[2].all_organizer_permissions = False
|
||||
@@ -506,6 +559,99 @@ def test_organizer_edit_restrictions(client, env):
|
||||
assert _can_see_but_not_edit_org_export(client, user1, s2)
|
||||
|
||||
|
||||
def _patch_org_export(client, user, scheduled, data):
|
||||
client.login(email=user.email, password="dummy")
|
||||
|
||||
response = client.get("/control/organizer/dummy/export/")
|
||||
assert f"export/{scheduled.pk}/delete".encode() in response.content
|
||||
response = client.get(f"/control/organizer/dummy/export/?identifier={scheduled.export_identifier}&scheduled={scheduled.pk}")
|
||||
if response.status_code == 404:
|
||||
return False
|
||||
|
||||
assert response.status_code == 200
|
||||
doc = BeautifulSoup(response.content, "lxml")
|
||||
form_data = extract_form_fields(doc.select("form[data-asynctask]")[0])
|
||||
form_data["schedule"] = "save"
|
||||
for k, v in data.items():
|
||||
if v is None:
|
||||
form_data.pop(k, None)
|
||||
else:
|
||||
form_data[k] = v
|
||||
|
||||
response = client.post(f"/control/organizer/dummy/export/?identifier={scheduled.export_identifier}&scheduled={scheduled.pk}",
|
||||
data=form_data, follow=True)
|
||||
assert response.status_code == 200
|
||||
|
||||
return b"alert-success" in response.content and b"therefore you cannot" not in response.content
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_organizer_edit_restrictions_event_expansion(client, env):
|
||||
# This tests the prevention of a possible privilege escalation where user A creates a scheduled export and
|
||||
# user B has settings permission (= they can see the export configuration), and enough permission
|
||||
# to run the export themselves, but not enough permission to add events. Without this check, user B could
|
||||
# modify the export and add themselves as a recipient. Thereby, user B would gain access to data they can't have.
|
||||
user = env[1]
|
||||
user2 = User.objects.create_user("dummy2@dummy.dummy", "dummy")
|
||||
event1 = env[0]
|
||||
event2 = Event.objects.create(
|
||||
organizer=env[0].organizer, name="Dummy", slug="dummy2",
|
||||
date_from=now(), plugins="pretix.plugins.banktransfer,pretix.plugins.stripe,tests.testdummy"
|
||||
)
|
||||
|
||||
# Team 1 has access only to one event
|
||||
team1 = env[2]
|
||||
team1.all_organizer_permissions = False
|
||||
team1.all_event_permissions = False
|
||||
team1.all_events = False
|
||||
team1.limit_organizer_permissions = {"organizer.settings.general:write": True}
|
||||
team1.limit_event_permissions = {"event.orders:read": True, "event.settings.general:write": True}
|
||||
team1.save()
|
||||
team1.limit_events.add(event1)
|
||||
team1.members.add(user)
|
||||
|
||||
# Team 2 has full admin access
|
||||
team2 = env[0].organizer.teams.create(
|
||||
all_organizer_permissions=True, all_event_permissions=True, all_events=True,
|
||||
)
|
||||
team2.members.add(user2)
|
||||
|
||||
s1 = ScheduledOrganizerExport.objects.create(
|
||||
organizer=env[0].organizer,
|
||||
owner=user2,
|
||||
export_identifier="dummy_orders",
|
||||
export_form_data={"all_events": False, "events": [event1.pk]},
|
||||
mail_subject="Test",
|
||||
mail_template="Test",
|
||||
locale="en",
|
||||
schedule_rrule="DTSTART:20230118T000000\nRRULE:FREQ=DAILY;INTERVAL=1;WKST=MO",
|
||||
schedule_rrule_time=datetime.time(2, 30, 0)
|
||||
)
|
||||
# User 1 can change …
|
||||
assert _patch_org_export(
|
||||
client, user, s1,
|
||||
{"schedule-mail_subject": "Hello"},
|
||||
)
|
||||
# … but not expand scope
|
||||
assert not _patch_org_export(
|
||||
client, user, s1,
|
||||
{"dummy_orders-events": [event1.pk, event2.pk]},
|
||||
)
|
||||
assert not _patch_org_export(
|
||||
client, user, s1,
|
||||
{"dummy_orders-all_events": "on", "dummy_orders-events": None},
|
||||
)
|
||||
# User 2 can expand
|
||||
assert _patch_org_export(
|
||||
client, user2, s1,
|
||||
{"dummy_orders-all_events": "on", "dummy_orders-events": None},
|
||||
)
|
||||
assert _patch_org_export(
|
||||
client, user2, s1,
|
||||
{"dummy_orders-events": [event1.pk, event2.pk]},
|
||||
)
|
||||
|
||||
|
||||
def _can_see_but_not_edit_event_export(client, user, scheduled):
|
||||
client.login(email=user.email, password="dummy")
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ from decimal import Decimal
|
||||
import pytest
|
||||
from django.utils.timezone import now
|
||||
from django_scopes import scopes_disabled
|
||||
from stripe import StripeObject
|
||||
|
||||
from pretix.base.models import (
|
||||
Event, Order, OrderPayment, OrderRefund, Organizer, Team, User,
|
||||
@@ -55,7 +56,7 @@ def env():
|
||||
|
||||
|
||||
def get_test_charge(order: Order):
|
||||
return {
|
||||
return StripeObject.construct_from({
|
||||
"id": "ch_18TY6GGGWE2Is8TZHanef25",
|
||||
"object": "charge",
|
||||
"amount": 1337,
|
||||
@@ -90,35 +91,59 @@ def get_test_charge(order: Order):
|
||||
"total_count": 0
|
||||
},
|
||||
"shipping": None,
|
||||
"source": {
|
||||
"id": "card_18TY5wGGWE2Ias8Td38PjyPy",
|
||||
"object": "card",
|
||||
"address_city": None,
|
||||
"address_country": None,
|
||||
"address_line1": None,
|
||||
"address_line1_check": None,
|
||||
"address_line2": None,
|
||||
"address_state": None,
|
||||
"address_zip": None,
|
||||
"address_zip_check": None,
|
||||
"brand": "Visa",
|
||||
"country": "US",
|
||||
"customer": None,
|
||||
"cvc_check": "pass",
|
||||
"dynamic_last4": None,
|
||||
"exp_month": 12,
|
||||
"exp_year": 2016,
|
||||
"fingerprint": "FNbGTMaFvhRU2Y0E",
|
||||
"funding": "credit",
|
||||
"last4": "4242",
|
||||
"metadata": {},
|
||||
"name": "Carl Cardholder",
|
||||
"tokenization_method": None,
|
||||
"payment_intent": {
|
||||
"id": "pi_123456",
|
||||
# Rest is ignored
|
||||
},
|
||||
"payment_method": "pm_654321",
|
||||
"payment_method_details": {
|
||||
"card": {
|
||||
"amount_authorized": 3500,
|
||||
"authorization_code": "12345",
|
||||
"brand": "visa",
|
||||
"checks": {
|
||||
"address_line1_check": None,
|
||||
"address_postal_code_check": "pass",
|
||||
"cvc_check": "pass"
|
||||
},
|
||||
"country": "US",
|
||||
"exp_month": 12,
|
||||
"exp_year": 2034,
|
||||
"extended_authorization": {
|
||||
"status": "disabled"
|
||||
},
|
||||
"fingerprint": "ABCDE",
|
||||
"funding": "credit",
|
||||
"incremental_authorization": {
|
||||
"status": "unavailable"
|
||||
},
|
||||
"installments": None,
|
||||
"last4": "4242",
|
||||
"mandate": None,
|
||||
"multicapture": {
|
||||
"status": "unavailable"
|
||||
},
|
||||
"network": "visa",
|
||||
"network_token": {
|
||||
"used": False
|
||||
},
|
||||
"network_transaction_id": "12345",
|
||||
"overcapture": {
|
||||
"maximum_amount_capturable": 3500,
|
||||
"status": "unavailable"
|
||||
},
|
||||
"regulated_status": "unregulated",
|
||||
"three_d_secure": None,
|
||||
"transaction_link_id": None,
|
||||
"wallet": None
|
||||
},
|
||||
"type": "card"
|
||||
},
|
||||
"source": None,
|
||||
"source_transfer": None,
|
||||
"statement_descriptor": None,
|
||||
"status": "succeeded"
|
||||
}
|
||||
}, None)
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
@@ -206,7 +231,7 @@ def test_webhook_partial_refund(env, client, monkeypatch):
|
||||
payment = env[1].payments.create(
|
||||
provider='stripe', amount=env[1].total, info=json.dumps(charge)
|
||||
)
|
||||
ReferencedStripeObject.objects.create(order=env[1], reference="ch_18TY6GGGWE2Ias8TZHanef25",
|
||||
ReferencedStripeObject.objects.create(order=env[1], reference="ch_18TY6GGGWE2Is8TZHanef25",
|
||||
payment=payment)
|
||||
|
||||
charge['refunds'] = {
|
||||
@@ -217,7 +242,7 @@ def test_webhook_partial_refund(env, client, monkeypatch):
|
||||
"object": "refund",
|
||||
"amount": "12300",
|
||||
"balance_transaction": "txn_18otImGGWE2Ias8T4fLOxesC",
|
||||
"charge": "ch_18TY6GGGWE2Ias8TZHanef25",
|
||||
"charge": "ch_18TY6GGGWE2Is8TZHanef25",
|
||||
"created": 1472729052,
|
||||
"currency": "eur",
|
||||
"metadata": {},
|
||||
@@ -230,7 +255,7 @@ def test_webhook_partial_refund(env, client, monkeypatch):
|
||||
}
|
||||
monkeypatch.setattr("stripe.Charge.retrieve", lambda *args, **kwargs: charge)
|
||||
|
||||
client.post('/dummy/dummy/stripe/webhook/', json.dumps(
|
||||
r = client.post('/dummy/dummy/stripe/webhook/', json.dumps(
|
||||
{
|
||||
"id": "evt_18otImGGWE2Ias8TUyVRDB1G",
|
||||
"object": "event",
|
||||
@@ -238,8 +263,9 @@ def test_webhook_partial_refund(env, client, monkeypatch):
|
||||
"created": 1472729052,
|
||||
"data": {
|
||||
"object": {
|
||||
"id": "ch_18TY6GGGWE2Ias8TZHanef25",
|
||||
"id": "ch_18TY6GGGWE2Is8TZHanef25",
|
||||
"object": "charge",
|
||||
"payment_intent": "pi_123456",
|
||||
# Rest of object is ignored anway
|
||||
}
|
||||
},
|
||||
@@ -249,6 +275,7 @@ def test_webhook_partial_refund(env, client, monkeypatch):
|
||||
"type": "charge.refunded"
|
||||
}
|
||||
), content_type='application_json')
|
||||
print(r.content)
|
||||
|
||||
order = env[1]
|
||||
order.refresh_from_db()
|
||||
@@ -275,7 +302,7 @@ def test_webhook_global(env, client, monkeypatch):
|
||||
payment = order.payments.create(
|
||||
provider='stripe', amount=order.total, info=json.dumps(charge), state=OrderPayment.PAYMENT_STATE_CREATED
|
||||
)
|
||||
ReferencedStripeObject.objects.create(order=order, reference="ch_18TY6GGGWE2Ias8TZHanef25",
|
||||
ReferencedStripeObject.objects.create(order=order, reference="ch_18TY6GGGWE2Is8TZHanef25",
|
||||
payment=payment)
|
||||
ReferencedStripeObject.objects.create(order=order, reference="pi_123456",
|
||||
payment=payment)
|
||||
@@ -288,7 +315,7 @@ def test_webhook_global(env, client, monkeypatch):
|
||||
"created": 1472729052,
|
||||
"data": {
|
||||
"object": {
|
||||
"id": "ch_18TY6GGGWE2Ias8TZHanef25",
|
||||
"id": "ch_18TY6GGGWE2Is8TZHanef25",
|
||||
"object": "charge",
|
||||
"payment_intent": "pi_123456",
|
||||
"metadata": {
|
||||
@@ -306,50 +333,3 @@ def test_webhook_global(env, client, monkeypatch):
|
||||
|
||||
order.refresh_from_db()
|
||||
assert order.status == Order.STATUS_PAID
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_webhook_global_legacy_reference(env, client, monkeypatch):
|
||||
order = env[1]
|
||||
order.status = Order.STATUS_PENDING
|
||||
order.save()
|
||||
|
||||
charge = get_test_charge(env[1])
|
||||
charge["amount_refunded"] = 0
|
||||
monkeypatch.setattr("stripe.Charge.retrieve", lambda *args, **kwargs: charge)
|
||||
|
||||
with scopes_disabled():
|
||||
payment = order.payments.create(
|
||||
provider='stripe', amount=order.total, info=json.dumps(charge), state=OrderPayment.PAYMENT_STATE_CREATED
|
||||
)
|
||||
ReferencedStripeObject.objects.create(order=order, reference="ch_18TY6GGGWE2Ias8TZHanef25")
|
||||
ReferencedStripeObject.objects.create(order=order, reference="pi_123456")
|
||||
|
||||
client.post('/_stripe/webhook/', json.dumps(
|
||||
{
|
||||
"id": "evt_18otImGGWE2Ias8TUyVRDB1G",
|
||||
"object": "event",
|
||||
"api_version": "2016-03-07",
|
||||
"created": 1472729052,
|
||||
"data": {
|
||||
"object": {
|
||||
"id": "ch_18TY6GGGWE2Ias8TZHanef25",
|
||||
"object": "charge",
|
||||
"payment_intent": "pi_123456",
|
||||
"metadata": {
|
||||
"event": order.event_id,
|
||||
}
|
||||
# Rest of object is ignored anway
|
||||
}
|
||||
},
|
||||
"livemode": True,
|
||||
"pending_webhooks": 1,
|
||||
"request": "req_977XOWC8zk51Z9",
|
||||
"type": "charge.succeeded"
|
||||
}
|
||||
), content_type='application_json')
|
||||
|
||||
order.refresh_from_db()
|
||||
assert order.status == Order.STATUS_PAID
|
||||
with scopes_disabled():
|
||||
assert list(order.payments.all()) == [payment]
|
||||
@@ -327,3 +327,22 @@ def test_renderer_batch_invalid(env, token_client, position):
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
assert resp.data == {"parts": ["Please do not submit more than 1000 parts."]}
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_api_permission(env, token_client):
|
||||
t = env[0].organizer.teams.get()
|
||||
t.limit_event_permissions = {"event.orders:read": True}
|
||||
t.all_event_permissions = False
|
||||
t.save()
|
||||
resp = token_client.patch(
|
||||
'/api/v1/organizers/{}/events/{}/ticketlayouts/{}/'.format(env[0].slug, env[0].slug, env[1].pk),
|
||||
{
|
||||
"name": "Bar",
|
||||
"layout": [
|
||||
{"type": "barcodearea", "left": "7.00", "bottom": "11.15", "size": "45.00", "content": "secret"}
|
||||
]
|
||||
},
|
||||
format='json'
|
||||
)
|
||||
assert resp.status_code == 403
|
||||
@@ -1786,15 +1786,13 @@ class OrdersTest(BaseOrdersTest):
|
||||
assert match
|
||||
|
||||
response = self.client.get(
|
||||
'/%s/%s/order/%s/%s/answer/%s/?token=%s' % (self.orga.slug, self.event.slug, self.order.code,
|
||||
self.order.secret, a.pk, match.group(1))
|
||||
'/%s/%s/answer/%s/?token=%s' % (self.orga.slug, self.event.slug, a.pk, match.group(1))
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
client2 = self.client_class()
|
||||
response = client2.get(
|
||||
'/%s/%s/order/%s/%s/answer/%s/?token=%s' % (self.orga.slug, self.event.slug, self.order.code,
|
||||
self.order.secret, a.pk, match.group(1))
|
||||
'/%s/%s/answer/%s/?token=%s' % (self.orga.slug, self.event.slug, a.pk, match.group(1))
|
||||
)
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
Reference in new issue
Block a user