diff --git a/src/pretix/control/templates/pretixcontrol/global_settings.html b/src/pretix/control/templates/pretixcontrol/global_settings.html
index 49bc37454..59961d8bf 100644
--- a/src/pretix/control/templates/pretixcontrol/global_settings.html
+++ b/src/pretix/control/templates/pretixcontrol/global_settings.html
@@ -1,10 +1,8 @@
-{% extends "pretixcontrol/base.html" %}
+{% extends "pretixcontrol/global_settings_base.html" %}
{% load i18n %}
{% load bootstrap3 %}
-{% block title %}{% trans "Global settings" %}{% endblock %}
-{% block content %}
-
{% trans "Global settings" %}
+{% block inner %}
+{% endblock %}
diff --git a/src/pretix/control/urls.py b/src/pretix/control/urls.py
index 9c3a6b759..3d7df7277 100644
--- a/src/pretix/control/urls.py
+++ b/src/pretix/control/urls.py
@@ -14,9 +14,10 @@ urlpatterns = [
url(r'^forgot$', auth.Forgot.as_view(), name='auth.forgot'),
url(r'^forgot/recover$', auth.Recover.as_view(), name='auth.forgot.recover'),
url(r'^$', dashboards.user_index, name='index'),
- url(r'^global/settings/$', global_settings.GlobalSettingsView.as_view(), name='global-settings'),
+ url(r'^global/settings/$', global_settings.GlobalSettingsView.as_view(), name='global.settings'),
+ url(r'^global/update/$', global_settings.UpdateCheckView.as_view(), name='global.update'),
url(r'^reauth/$', user.ReauthView.as_view(), name='user.reauth'),
- url(r'^settings$', user.UserSettings.as_view(), name='user.settings'),
+ url(r'^settings/?$', user.UserSettings.as_view(), name='user.settings'),
url(r'^settings/2fa/$', user.User2FAMainView.as_view(), name='user.settings.2fa'),
url(r'^settings/history/$', user.UserHistoryView.as_view(), name='user.settings.history'),
url(r'^settings/2fa/add$', user.User2FADeviceAddView.as_view(), name='user.settings.2fa.add'),
diff --git a/src/pretix/control/views/global_settings.py b/src/pretix/control/views/global_settings.py
index 5ca1bda22..a143c241f 100644
--- a/src/pretix/control/views/global_settings.py
+++ b/src/pretix/control/views/global_settings.py
@@ -1,9 +1,13 @@
from django.contrib import messages
-from django.shortcuts import reverse
+from django.shortcuts import redirect, reverse
from django.utils.translation import ugettext_lazy as _
from django.views.generic import FormView
-from pretix.control.forms.global_settings import GlobalSettingsForm
+from pretix.base.services.update_check import check_result_table, update_check
+from pretix.base.settings import GlobalSettingsObject
+from pretix.control.forms.global_settings import (
+ GlobalSettingsForm, UpdateSettingsForm,
+)
from pretix.control.permissions import AdministratorPermissionRequiredMixin
@@ -21,4 +25,34 @@ class GlobalSettingsView(AdministratorPermissionRequiredMixin, FormView):
return super().form_invalid(form)
def get_success_url(self):
- return reverse('control:global-settings')
+ return reverse('control:global.settings')
+
+
+class UpdateCheckView(AdministratorPermissionRequiredMixin, FormView):
+ template_name = 'pretixcontrol/global_update.html'
+ form_class = UpdateSettingsForm
+
+ def post(self, request, *args, **kwargs):
+ if 'trigger' in request.POST:
+ update_check.apply()
+ return redirect(self.get_success_url())
+ return super().post(request, *args, **kwargs)
+
+ def form_valid(self, form):
+ form.save()
+ messages.success(self.request, _('Your changes have been saved.'))
+ return super().form_valid(form)
+
+ def form_invalid(self, form):
+ messages.error(self.request, _('Your changes have not been saved, see below for errors.'))
+ return super().form_invalid(form)
+
+ def get_context_data(self, **kwargs):
+ ctx = super().get_context_data()
+ ctx['gs'] = GlobalSettingsObject()
+ ctx['gs'].settings.set('update_check_ack', True)
+ ctx['tbl'] = check_result_table()
+ return ctx
+
+ def get_success_url(self):
+ return reverse('control:global.update')
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index 1936bab06..4dd6eb9d8 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -27,6 +27,10 @@ nav.navbar {
display: inline;
}
+nav.navbar .danger, nav.navbar .danger:hover, nav.navbar .danger:active {
+ background: $brand-danger !important;
+}
+
.navbar-header .navbar-events {
color: white;
padding-top: 6px;
diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt
index 6f2cb7cec..83edac0f1 100644
--- a/src/requirements/dev.txt
+++ b/src/requirements/dev.txt
@@ -13,3 +13,4 @@ isort
pytest-mock
pytest-rerunfailures
pytest-warnings
+responses
diff --git a/src/setup.py b/src/setup.py
index 5ddb07984..a3595b45e 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -115,7 +115,8 @@ setup(
'isort',
'pytest-mock',
'pytest-rerunfailures',
- 'pytest-warnings'
+ 'pytest-warnings',
+ 'responses'
],
'memcached': ['pylibmc'],
'mysql': ['mysqlclient'],
diff --git a/src/tests/base/test_updatecheck.py b/src/tests/base/test_updatecheck.py
new file mode 100644
index 000000000..7ef066208
--- /dev/null
+++ b/src/tests/base/test_updatecheck.py
@@ -0,0 +1,189 @@
+import json
+from datetime import timedelta
+
+import pytest
+import responses
+from django.core import mail as djmail
+from django.utils.timezone import now
+
+from pretix import __version__
+from pretix.base.services import update_check
+from pretix.base.settings import GlobalSettingsObject
+
+
+def request_callback_updatable(request):
+ json_data = json.loads(request.body.decode())
+ resp_body = {
+ 'status': 'ok',
+ 'version': {
+ 'latest': '1000.0.0',
+ 'yours': json_data.get('version'),
+ 'updatable': True
+ },
+ 'plugins': {}
+ }
+ return 200, {'Content-Type': 'text/json'}, json.dumps(resp_body)
+
+
+def request_callback_not_updatable(request):
+ json_data = json.loads(request.body.decode())
+ resp_body = {
+ 'status': 'ok',
+ 'version': {
+ 'latest': '1.0.0',
+ 'yours': json_data.get('version'),
+ 'updatable': False
+ },
+ 'plugins': {}
+ }
+ return 200, {'Content-Type': 'text/json'}, json.dumps(resp_body)
+
+
+def request_callback_disallowed(request):
+ pytest.fail("Request issued even though none should be issued.")
+
+
+@pytest.mark.django_db
+@responses.activate
+def test_update_check_disabled():
+ gs = GlobalSettingsObject()
+ gs.settings.update_check_perform = False
+
+ responses.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_disallowed,
+ content_type='application/json',
+ )
+ update_check.update_check.apply(throw=True)
+
+
+@pytest.mark.django_db
+@responses.activate
+def test_update_check_sent_no_updates():
+ responses.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_not_updatable,
+ content_type='application/json',
+ )
+ update_check.update_check.apply(throw=True)
+ gs = GlobalSettingsObject()
+ assert not gs.settings.update_check_result_warning
+ storeddata = gs.settings.update_check_result
+ assert not storeddata['version']['updatable']
+
+
+@pytest.mark.django_db
+@responses.activate
+def test_update_check_sent_updates():
+ responses.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_updatable,
+ content_type='application/json',
+ )
+ update_check.update_check.apply(throw=True)
+ gs = GlobalSettingsObject()
+ assert gs.settings.update_check_result_warning
+ storeddata = gs.settings.update_check_result
+ assert storeddata['version']['updatable']
+
+
+@pytest.mark.django_db
+@responses.activate
+def test_update_check_mail_sent():
+ gs = GlobalSettingsObject()
+ gs.settings.update_check_email = 'test@example.org'
+
+ responses.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_updatable,
+ content_type='application/json',
+ )
+ update_check.update_check.apply(throw=True)
+
+ assert len(djmail.outbox) == 1
+ assert djmail.outbox[0].to == ['test@example.org']
+ assert 'update' in djmail.outbox[0].subject
+
+
+@pytest.mark.django_db
+@responses.activate
+def test_update_check_mail_sent_only_after_change():
+ gs = GlobalSettingsObject()
+ gs.settings.update_check_email = 'test@example.org'
+
+ with responses.RequestsMock() as rsps:
+ rsps.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_updatable,
+ content_type='application/json',
+ )
+
+ update_check.update_check.apply(throw=True)
+ assert len(djmail.outbox) == 1
+
+ update_check.update_check.apply(throw=True)
+ assert len(djmail.outbox) == 1
+
+ with responses.RequestsMock() as rsps:
+ rsps.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_not_updatable,
+ content_type='application/json',
+ )
+
+ update_check.update_check.apply(throw=True)
+ assert len(djmail.outbox) == 1
+
+ with responses.RequestsMock() as rsps:
+ rsps.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_updatable,
+ content_type='application/json',
+ )
+
+ update_check.update_check.apply(throw=True)
+ assert len(djmail.outbox) == 2
+
+
+@pytest.mark.django_db
+def test_update_cron_interval(monkeypatch):
+ called = False
+
+ def callee():
+ nonlocal called
+ called = True
+
+ monkeypatch.setattr(update_check.update_check, 'apply_async', callee)
+
+ gs = GlobalSettingsObject()
+ gs.settings.update_check_email = 'test@example.org'
+
+ gs.settings.update_check_last = now() - timedelta(hours=14)
+ update_check.run_update_check(None)
+ assert not called
+
+ gs.settings.update_check_last = now() - timedelta(hours=24)
+ update_check.run_update_check(None)
+ assert called
+
+
+@pytest.mark.django_db
+def test_result_table_empty():
+ assert update_check.check_result_table() == {
+ 'error': 'no_result'
+ }
+
+
+@responses.activate
+@pytest.mark.django_db
+def test_result_table_up2date():
+ responses.add_callback(
+ responses.POST, 'https://pretix.eu/.update_check/',
+ callback=request_callback_not_updatable,
+ content_type='application/json',
+ )
+ update_check.update_check.apply(throw=True)
+ tbl = update_check.check_result_table()
+ assert tbl[0] == ('pretix', __version__, '1.0.0', False)
+ assert tbl[1][0].startswith('Plugin: ')
+ assert tbl[1][2] == '?'
diff --git a/src/tests/control/test_updatecheck.py b/src/tests/control/test_updatecheck.py
new file mode 100644
index 000000000..d838a82a8
--- /dev/null
+++ b/src/tests/control/test_updatecheck.py
@@ -0,0 +1,58 @@
+import pytest
+
+from pretix.base.models import User
+from pretix.base.settings import GlobalSettingsObject
+
+
+@pytest.fixture
+def user():
+ user = User.objects.create_user('dummy@dummy.dummy', 'dummy')
+ return user
+
+
+@pytest.mark.django_db
+def test_update_notice_displayed(client, user):
+ client.login(email='dummy@dummy.dummy', password='dummy')
+
+ r = client.get('/control/')
+ assert 'pretix automatically checks for updates in the background' not in r.content.decode()
+
+ user.is_superuser = True
+ user.save()
+ r = client.get('/control/')
+ assert 'pretix automatically checks for updates in the background' in r.content.decode()
+
+ client.get('/control/global/update/') # Click it
+ r = client.get('/control/')
+ assert 'pretix automatically checks for updates in the background' not in r.content.decode()
+
+
+@pytest.mark.django_db
+def test_settings(client, user):
+ user.is_superuser = True
+ user.save()
+ client.login(email='dummy@dummy.dummy', password='dummy')
+
+ client.post('/control/global/update/', {'update_check_email': 'test@example.org', 'update_check_perform': 'on'})
+ gs = GlobalSettingsObject()
+ gs.settings._flush()
+ assert gs.settings.update_check_perform
+ assert gs.settings.update_check_email
+
+ client.post('/control/global/update/', {'update_check_email': '', 'update_check_perform': ''})
+ gs.settings._flush()
+ assert not gs.settings.update_check_perform
+ assert not gs.settings.update_check_email
+
+
+@pytest.mark.django_db
+def test_trigger(client, user):
+ user.is_superuser = True
+ user.save()
+ client.login(email='dummy@dummy.dummy', password='dummy')
+
+ gs = GlobalSettingsObject()
+ assert not gs.settings.update_check_last
+ client.post('/control/global/update/', {'trigger': 'on'})
+ gs.settings._flush()
+ assert gs.settings.update_check_last