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

Refs #2165 -- Lock payment object while processing Stripe response

Browse Source
This commit is contained in:
Raphael Michel
2021-10-15 11:57:40 +02:00
parent b51e1cfc6f
commit aac67ebf83
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pretix/plugins/stripe/views.py
View File

@@ -273,7 +273,9 @@ def charge_webhook(event, event_json, charge_id, rso):
payment = None payment = None
with transaction.atomic(): with transaction.atomic():
if not payment: if payment:
payment = OrderPayment.objects.select_for_update().get(pk=payment.pk)
else:
payment = order.payments.filter( payment = order.payments.filter(
info__icontains=charge['id'], info__icontains=charge['id'],
provider__startswith='stripe', provider__startswith='stripe',
@@ -367,12 +369,14 @@ def source_webhook(event, event_json, source_id, rso):
return HttpResponse('Order not found', status=200) return HttpResponse('Order not found', status=200)
payment = None payment = None
if not payment: if payment:
payment = OrderPayment.objects.select_for_update().get(pk=payment.pk)
else:
payment = order.payments.filter( payment = order.payments.filter(
info__icontains=src['id'], info__icontains=src['id'],
provider__startswith='stripe', provider__startswith='stripe',
amount=prov._amount_to_decimal(src['amount']) if src['amount'] is not None else order.total, amount=prov._amount_to_decimal(src['amount']) if src['amount'] is not None else order.total,
).last() ).select_for_update().last()
if not payment: if not payment:
payment = order.payments.create( payment = order.payments.create(
state=OrderPayment.PAYMENT_STATE_CREATED, state=OrderPayment.PAYMENT_STATE_CREATED,
@@ -462,14 +466,13 @@ class StripeOrderView:
raise Http404('') raise Http404('')
else: else:
raise Http404('') raise Http404('')
self.payment = get_object_or_404(
self.order.payments,
pk=self.kwargs['payment'],
provider__startswith='stripe'
)
return super().dispatch(request, *args, **kwargs) return super().dispatch(request, *args, **kwargs)
@cached_property
def payment(self):
return get_object_or_404(self.order.payments,
pk=self.kwargs['payment'],
provider__startswith='stripe')
@cached_property @cached_property
def pprov(self): def pprov(self):
return self.request.event.get_payment_providers()[self.payment.provider] return self.request.event.get_payment_providers()[self.payment.provider]
@@ -506,7 +509,7 @@ class ReturnView(StripeOrderView, View):
with transaction.atomic(): with transaction.atomic():
self.order.refresh_from_db() self.order.refresh_from_db()
self.payment.refresh_from_db() self.payment = OrderPayment.objects.select_for_update().get(pk=self.payment.pk)
if self.payment.state == OrderPayment.PAYMENT_STATE_CONFIRMED: if self.payment.state == OrderPayment.PAYMENT_STATE_CONFIRMED:
if 'payment_stripe_token' in request.session: if 'payment_stripe_token' in request.session:
del request.session['payment_stripe_token'] del request.session['payment_stripe_token']