Fix admin CSP: need to use SITE_URL, not INTERNAL_SITE_URL in admin CSP

settings.py

@@ -92,7 +92,7 @@ def insert_debug_toolbar_middleware(middlewares):
 DOMAIN = SERVICES_DOMAIN = urlparse(SITE_URL).netloc
 ADDONS_FRONTEND_PROXY_PORT = '7000'
 SERVICES_URL = SITE_URL
-INTERNAL_SITE_URL = SITE_URL
+INTERNAL_SITE_URL = 'http://nginx'
 EXTERNAL_SITE_URL = SITE_URL
 STATIC_URL = EXTERNAL_SITE_URL + STATIC_URL_PREFIX
 MEDIA_URL = EXTERNAL_SITE_URL + MEDIA_URL_PREFIX

src/olympia/amo/middleware.py

@@ -488,9 +488,7 @@ def get_policy_parts(self, request, response, report_only=False):
         # locale part.
         if request.path_info.startswith('/admin/models/'):
             policy_parts.update = {
-                'script-src': (
-                    f'{settings.INTERNAL_SITE_URL}/{request.LANG}/admin/models/jsi18n/'
-                ),
+                'script-src': f'{settings.SITE_URL}/{request.LANG}/admin/models/jsi18n/'
             }
 
         return policy_parts

src/olympia/amo/tests/test_csp_headers.py

@@ -1,6 +1,7 @@
 import os
 
 from django.conf import settings
+from django.test.utils import override_settings
 from django.urls import reverse
 
 from olympia.amo.tests import TestCase, user_factory
@@ -12,6 +13,7 @@ def test_default_settings_no_report_only():
 
 
 class TestCSPHeaders(TestCase):
+    @override_settings(SITE_URL='http://internal-admin-testserver')
     def test_admin_csp(self):
         user = user_factory(email='me@mozilla.com')
         self.grant_permission(user, '*:*')
@@ -24,7 +26,7 @@ def test_admin_csp(self):
         expected = [
             'script-src',
             *settings.CONTENT_SECURITY_POLICY['DIRECTIVES']['script-src'],
-            'http://testserver/en-US/admin/models/jsi18n/',
+            'http://internal-admin-testserver/en-US/admin/models/jsi18n/',
         ]
         assert ' '.join(expected) + ';' in response['content-security-policy']
 

src/olympia/core/apps.py

@@ -169,7 +169,7 @@ def nginx_check(app_configs, **kwargs):
     files_to_remove = []
 
     for dir, prefix in configs:
-        base_url = f'http://nginx{prefix}'
+        base_url = f'{settings.INTERNAL_SITE_URL}{prefix}'
         file_path = os.path.join(dir, 'test.txt')
         file_url = f'{base_url}test.txt'
 

src/olympia/core/tests/test_apps.py

@@ -202,7 +202,7 @@ def test_nginx_raises_missing_directory(self):
 
     def _test_nginx_response(self, status_code=200, body='', served_by='nginx'):
         self.mock_get_version_json.return_value['target'] = 'development'
-        url = f'http://nginx{settings.MEDIA_URL_PREFIX}test.txt'
+        url = f'{settings.INTERNAL_SITE_URL}{settings.MEDIA_URL_PREFIX}test.txt'
 
         responses.add(
             responses.GET,