@@ -96,6 +96,7 @@ SECRET_KEY = os.getenv('SECRET_KEY', '')
MIDDLEWARE = (
'corsheaders.middleware.CorsMiddleware',
+ 'layerindex.middleware.RejectNullCharactersMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
@@ -7,9 +7,28 @@
# SPDX-License-Identifier: MIT
from django.utils.deprecation import MiddlewareMixin
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseBadRequest, HttpResponseRedirect
from django.urls import reverse
from reversion.middleware import RevisionMiddleware
class NonAtomicRevisionMiddleware(RevisionMiddleware):
atomic = False
+
+
+class RejectNullCharactersMiddleware:
+ """
+ Return a 400 for a request with a NUL character in its path or query
+ string. PostgreSQL text can't hold NUL, so any lookup with such a value
+ raised DataError and gave a 500. Forms already reject NUL in what they
+ clean; this covers the views that read the URL directly.
+ (AI-generated, Claude Opus 5.5)
+ """
+ def __init__(self, get_response):
+ self.get_response = get_response
+
+ def __call__(self, request):
+ if '\x00' in request.path or any(
+ '\x00' in key or any('\x00' in value for value in values)
+ for key, values in request.GET.lists()):
+ return HttpResponseBadRequest('NUL characters are not allowed')
+ return self.get_response(request)
@@ -96,6 +96,7 @@ SECRET_KEY = ''
MIDDLEWARE = (
'corsheaders.middleware.CorsMiddleware',
+ 'layerindex.middleware.RejectNullCharactersMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
new file mode 100644
@@ -0,0 +1,45 @@
+# layerindex-web - tests for NUL characters in requests
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+#
+# AI-generated, Claude Opus 5.5
+
+# [YOCTO #16520]: PostgreSQL text can't hold NUL, so a search or URL with
+# one raised DataError (a 500). MariaDB returned no results, so these tests
+# check for the 400 rather than for the DataError.
+
+import pytest
+from django.test import TestCase
+
+from layerindex.models import Branch
+
+
+@pytest.mark.django_db
+class TestNullCharacters(TestCase):
+
+ def setUp(self):
+ # The migrations may have created it already
+ Branch.objects.get_or_create(name='master', defaults=dict(
+ bitbake_branch='master', short_description='Master', sort_priority=1))
+
+ def assert_bad_request(self, url, params=None):
+ response = self.client.get(url, params or {})
+ self.assertEqual(response.status_code, 400, (url, params))
+
+ def test_search(self):
+ self.assert_bad_request('/layerindex/branch/master/recipes/', {'q': 'a\x00b'})
+
+ def test_api_filter(self):
+ self.assert_bad_request('/layerindex/api/recipes/', {'filter': 'pn:\x00'})
+
+ def test_parameter_name(self):
+ self.assert_bad_request('/layerindex/branch/master/recipes/', {'q\x00': 'a'})
+
+ def test_path(self):
+ self.assert_bad_request('/layerindex/branch/master/layer/a%00b/')
+
+ def test_search_without_nul(self):
+ response = self.client.get('/layerindex/branch/master/recipes/', {'q': 'ab'})
+ self.assertEqual(response.status_code, 200)
PostgreSQL text can't hold a NUL character, so a search term, API filter or URL path containing one, e.g. ?q=%00, raised DataError and gave a 500. MariaDB just found nothing. Forms already reject NUL in what they clean, but many views read the URL directly, so reject it once in a middleware. [YOCTO #16520] AI-Generated: Claude Opus 5.5 Signed-off-by: Tim Orling <tim.orling@konsulko.com> --- docker/settings.py | 1 + layerindex/middleware.py | 21 +++++++++++++++- settings.py | 1 + tests/test_null_characters.py | 45 +++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 tests/test_null_characters.py