mirror of
https://github.com/pretix/pretix.git
synced 2026-11-18 02:36:03 +00:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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.2"
|
||||
@@ -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):
|
||||
|
||||
|
||||
@@ -272,6 +272,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 +346,40 @@ 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()),
|
||||
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 +387,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()
|
||||
|
||||
@@ -2124,7 +2124,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 +2143,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())
|
||||
@@ -2224,7 +2234,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,7 +2259,7 @@ 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()),
|
||||
@@ -2257,7 +2267,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
|
||||
).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 +2295,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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -469,6 +469,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 +653,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(
|
||||
@@ -1012,6 +1045,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
|
||||
|
||||
@@ -506,6 +506,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")
|
||||
|
||||
|
||||
@@ -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
|
||||
Reference in new issue
Block a user