Release of v1.13.1

docs/changelog.rst

@@ -18,6 +18,15 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 
 
 
+v1.13.1 - 2018-01-28
+^^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#428 <https://github.com/dennissiemensma/dsmr-reader/issues/428>`_] Django 2.0: Null characters are not allowed in telegram (esp8266)
+
+
+
 v1.13.0 - 2018-01-23
 ^^^^^^^^^^^^^^^^^^^^
 

dsmr_api/forms.py

@@ -1,5 +1,19 @@
 from django import forms
+from django.core import validators
+
+
+class NullCharField(forms.CharField):
+    """ Disables the ProhibitNullCharactersValidator, so we can clean it later on. """
+    def __init__(self, *args, **kwargs):
+        super(NullCharField, self).__init__(*args, **kwargs)
+        self.validators.remove(validators.ProhibitNullCharactersValidator())
 
 
 class DsmrReadingForm(forms.Form):
-    telegram = forms.CharField()
+    telegram = NullCharField()
+
+    def clean_telegram(self):
+        """ Since we allow null characters, we should strip them right away. """
+        telegram = self.cleaned_data['telegram']
+        telegram = telegram.strip('\x00')
+        return telegram

dsmr_api/tests/v1/test_api.py

@@ -116,3 +116,17 @@ def test_okay(self, verify_telegram_checksum_mock):
         self.assertTrue(DsmrReading.objects.exists())
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.content, b'')
+
+    @mock.patch('dsmr_datalogger.services.telegram_to_reading')
+    def test_null_data_validation(self, telegram_to_reading_mock):
+        """ Shallow data verification. """
+        response = self.client.post(
+            self._api_url,
+            data={'telegram': '\x00' + self._telegram},  # Add null byte.
+            HTTP_X_AUTHKEY=self._api_settings.auth_key
+        )
+        self.assertTrue(telegram_to_reading_mock.called)
+
+        # Make sure null characters are stripped.
+        self.assertNotIn('\x00', telegram_to_reading_mock.call_args[1]['data'])
+        self.assertEqual(response.status_code, 201)

dsmrreader/__init__.py

@@ -17,6 +17,6 @@
 from django.utils.version import get_version
 
 
-VERSION = (1, 13, 0, 'final', 0)
+VERSION = (1, 13, 1, 'final', 0)
 
 __version__ = get_version(VERSION)