Allow to use a custom domain per event (#1617)

* Drop support for maindomain_urls/subdomain_urls in plugins * Allow to use a custom domain per event * Fix bug when manually saving domains * Fix custom domains in debugging * Fix middleware * Fix middleware again, update docs
2026-05-03 14:54:04 +00:00 · 2020-03-23 13:03:14 +01:00
parent ac2fc2de5c
commit 7e9c9beace
19 changed files with 386 additions and 89 deletions
--- a/src/tests/multidomain/test_middlewares.py
+++ b/src/tests/multidomain/test_middlewares.py
@@ -26,6 +26,11 @@ def test_control_only_on_main_domain(env, client):
    assert r.status_code == 302
    assert r['Location'] == 'http://example.com/control/login'

+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    r = client.get('/control/login', HTTP_HOST='barfoo')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://example.com/control/login'
+

@pytest.mark.django_db
 def test_append_slash(env, client):
@@ -41,21 +46,30 @@ def test_unknown_domain(env, client):


@pytest.mark.django_db
-def test_event_on_custom_domain(env, client):
+def test_event_on_org_domain(env, client):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    r = client.get('/2015/', HTTP_HOST='foobar')
    assert r.status_code == 200
+    assert b'<meta property="og:title" content="MRMCD2015" />' in r.content


@pytest.mark.django_db
-def test_path_without_trailing_slash_on_custom_domain(env, client):
+def test_event_on_custom_domain(env, client):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], event=env[1])
+    r = client.get('/', HTTP_HOST='foobar')
+    assert r.status_code == 200
+    assert b'<meta property="og:title" content="MRMCD2015" />' in r.content
+
+
+@pytest.mark.django_db
+def test_path_without_trailing_slash_on_org_domain(env, client):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    r = client.get('/widget/product_list', HTTP_HOST='foobar')
    assert r.status_code == 200


@pytest.mark.django_db
-def test_event_with_custom_domain_on_main_domain(env, client):
+def test_event_with_org_domain_on_main_domain(env, client):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    r = client.get('/mrmcd/2015/', HTTP_HOST='example.com')
    assert r.status_code == 302
@@ -63,7 +77,24 @@ def test_event_with_custom_domain_on_main_domain(env, client):


@pytest.mark.django_db
-def test_organizer_with_custom_domain_on_main_domain(env, client):
+def test_event_with_custom_domain_on_main_domain(env, client):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], event=env[1])
+    r = client.get('/mrmcd/2015/', HTTP_HOST='example.com')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://foobar'
+
+
+@pytest.mark.django_db
+def test_event_with_custom_domain_on_org_domain(env, client):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    r = client.get('/2015/', HTTP_HOST='foobar')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://barfoo'
+
+
+@pytest.mark.django_db
+def test_organizer_with_org_domain_on_main_domain(env, client):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    r = client.get('/mrmcd/', HTTP_HOST='example.com')
    assert r.status_code == 302
@@ -71,7 +102,7 @@ def test_organizer_with_custom_domain_on_main_domain(env, client):


@pytest.mark.django_db
-def test_event_on_custom_domain_only_with_wrong_organizer(env, client):
+def test_event_on_org_domain_only_with_wrong_organizer(env, client):
    organizer2 = Organizer.objects.create(name='Dummy', slug='dummy')
    Event.objects.create(
        organizer=organizer2, name='D1234', slug='1234',
@@ -83,7 +114,7 @@ def test_event_on_custom_domain_only_with_wrong_organizer(env, client):


@pytest.mark.django_db
-def test_unknown_event_on_custom_domain(env, client):
+def test_unknown_event_on_org_domain(env, client):
    organizer2 = Organizer.objects.create(name='Dummy', slug='dummy')
    Event.objects.create(
        organizer=organizer2, name='D1234', slug='1234',
@@ -95,7 +126,7 @@ def test_unknown_event_on_custom_domain(env, client):


@pytest.mark.django_db
-def test_cookie_domain_on_custom_domain(env, client):
+def test_cookie_domain_on_org_domain(env, client):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    client.post('/2015/cart/add', HTTP_HOST='foobar')
    r = client.get('/2015/', HTTP_HOST='foobar')
@@ -103,6 +134,16 @@ def test_cookie_domain_on_custom_domain(env, client):
    assert r.client.cookies['pretix_session']['domain'] == ''


+@pytest.mark.django_db
+def test_cookie_domain_on_event_domain(env, client):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    client.post('/cart/add', HTTP_HOST='barfoo')
+    r = client.get('/', HTTP_HOST='barfoo')
+    assert r.client.cookies['pretix_csrftoken']['domain'] == ''
+    assert r.client.cookies['pretix_session']['domain'] == ''
+
+
@pytest.mark.django_db
 def test_cookie_domain_on_main_domain(env, client):
    with override_settings(SESSION_COOKIE_DOMAIN='example.com'):
@@ -113,12 +154,11 @@ def test_cookie_domain_on_main_domain(env, client):


@pytest.mark.django_db
+@override_settings(USE_X_FORWARDED_HOST=True)
 def test_with_forwarded_host(env, client):
-    settings.USE_X_FORWARDED_HOST = True
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    r = client.get('/2015/', HTTP_X_FORWARDED_HOST='foobar')
    assert r.status_code == 200
-    settings.USE_X_FORWARDED_HOST = False


@pytest.mark.django_db
--- a/src/tests/multidomain/test_urlreverse.py
+++ b/src/tests/multidomain/test_urlreverse.py
@@ -30,6 +30,13 @@ def test_event_main_domain_front_page(env):

@pytest.mark.django_db
 def test_event_custom_domain_kwargs(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    assert eventreverse(env[1], 'presale:event.checkout', {'step': 'payment'}) == 'http://barfoo/checkout/payment/'
+
+
+@pytest.mark.django_db
+def test_event_org_domain_kwargs(env):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    assert eventreverse(env[1], 'presale:event.checkout', {'step': 'payment'}) == 'http://foobar/2015/checkout/payment/'

@@ -40,21 +47,36 @@ def test_event_main_domain_kwargs(env):


@pytest.mark.django_db
-def test_event_custom_domain_front_page(env):
+def test_event_org_domain_front_page(env):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    assert eventreverse(env[1], 'presale:event.index') == 'http://foobar/2015/'
    assert eventreverse(env[0], 'presale:organizer.index') == 'http://foobar/'


@pytest.mark.django_db
-def test_event_custom_domain_keep_port(env):
+def test_event_custom_domain_front_page(env):
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    assert eventreverse(env[1], 'presale:event.index') == 'http://barfoo/'
+    assert eventreverse(env[0], 'presale:organizer.index') == '/mrmcd/'
+
+
+@pytest.mark.django_db
+def test_event_custom_and_org_domain_front_page(env):
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    assert eventreverse(env[1], 'presale:event.index') == 'http://barfoo/'
+    assert eventreverse(env[0], 'presale:organizer.index') == 'http://foobar/'
+
+
+@pytest.mark.django_db
+def test_event_org_domain_keep_port(env):
    settings.SITE_URL = 'http://example.com:8081'
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    assert eventreverse(env[1], 'presale:event.index') == 'http://foobar:8081/2015/'


@pytest.mark.django_db
-def test_event_custom_domain_keep_scheme(env):
+def test_event_org_domain_keep_scheme(env):
    settings.SITE_URL = 'https://example.com'
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    assert eventreverse(env[1], 'presale:event.index') == 'https://foobar/2015/'
@@ -82,7 +104,7 @@ def test_event_main_domain_cache(env):
        'LOCATION': 'unique-snowflake',
    }
 })
-def test_event_custom_domain_cache(env):
+def test_event_org_domain_cache(env):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    env[0].get_cache().clear()
    with assert_num_queries(1):
@@ -91,6 +113,45 @@ def test_event_custom_domain_cache(env):
        eventreverse(env[1], 'presale:event.index')


+@pytest.mark.django_db
+@override_settings(CACHES={
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'unique-snowflake',
+    }
+})
+def test_event_custom_domain_cache(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    env[0].get_cache().clear()
+    with assert_num_queries(1):
+        eventreverse(env[1], 'presale:event.index')
+    with assert_num_queries(0):
+        eventreverse(env[1], 'presale:event.index')
+
+
+@pytest.mark.django_db
+@override_settings(CACHES={
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'unique-snowflake',
+    }
+})
+@scopes_disabled()
+def test_event_org_domain_cache_clear(env):
+    kd = KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    env[0].cache.clear()
+    with assert_num_queries(1):
+        eventreverse(env[1], 'presale:event.index')
+    kd.delete()
+    with assert_num_queries(2):
+        ev = Event.objects.get(pk=env[1].pk)
+        assert ev.pk == env[1].pk
+        assert ev.organizer == env[0]
+    with assert_num_queries(1):
+        eventreverse(ev, 'presale:event.index')
+
+
@pytest.mark.django_db
@override_settings(CACHES={
    'default': {
@@ -100,7 +161,8 @@ def test_event_custom_domain_cache(env):
 })
@scopes_disabled()
 def test_event_custom_domain_cache_clear(env):
-    kd = KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    kd = KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
    env[0].cache.clear()
    with assert_num_queries(1):
        eventreverse(env[1], 'presale:event.index')
@@ -120,5 +182,12 @@ def test_event_main_domain_absolute(env):

@pytest.mark.django_db
 def test_event_custom_domain_absolute(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    assert build_absolute_uri(env[1], 'presale:event.index') == 'http://barfoo/'
+
+
+@pytest.mark.django_db
+def test_event_org_domain_absolute(env):
    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
    assert build_absolute_uri(env[1], 'presale:event.index') == 'http://foobar/2015/'