From 62e2a794ea1473ba00cdc01e93ff1b9e1f29acb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Montilla?= <cesar.montilla@edunext.co>
Date: Mon, 20 Nov 2023 16:00:05 -0400
Subject: [PATCH] fix: Custom parameters validation (#412)

* fix: Custom parameters validation

* feat: Update version and changelog
---
 CHANGELOG.rst                              | 4 ++++
 lti_consumer/__init__.py                   | 2 +-
 lti_consumer/lti_xblock.py                 | 5 +----
 lti_consumer/tests/unit/test_lti_xblock.py | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 96983ea7..57c0e1bc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,6 +16,10 @@ Please See the `releases tab <https://github.com/openedx/xblock-lti-consumer/rel
 Unreleased
 ~~~~~~~~~~
 
+9.8.1 - 2023-11-17
+------------------
+* Fix custom_parameters xblock field validation.
+
 9.7.0 - 2023-10-23
 ------------------
 * Added LTI 1.3 reusable configuration compatibility.
diff --git a/lti_consumer/__init__.py b/lti_consumer/__init__.py
index 2b17d2b7..2d5f2787 100644
--- a/lti_consumer/__init__.py
+++ b/lti_consumer/__init__.py
@@ -4,4 +4,4 @@
 from .apps import LTIConsumerApp
 from .lti_xblock import LtiConsumerXBlock
 
-__version__ = '9.8.0'
+__version__ = '9.8.1'
diff --git a/lti_consumer/lti_xblock.py b/lti_consumer/lti_xblock.py
index 8779cd1f..bf18b4b2 100644
--- a/lti_consumer/lti_xblock.py
+++ b/lti_consumer/lti_xblock.py
@@ -106,10 +106,7 @@
     'instructor': 'Instructor',
 }
 CUSTOM_PARAMETER_SEPARATOR = '='
-# Allow a key-pair key and value to contain any character except "=".
-CUSTOM_PARAMETER_REGEX = re.compile(
-    rf'^([^{CUSTOM_PARAMETER_SEPARATOR}]+{CUSTOM_PARAMETER_SEPARATOR}[^{CUSTOM_PARAMETER_SEPARATOR}]+)$',
-)
+CUSTOM_PARAMETER_REGEX = re.compile(rf'^(.+{CUSTOM_PARAMETER_SEPARATOR}.+)$')
 # Catch a value enclosed by ${}, the value enclosed can contain any charater except "=".
 CUSTOM_PARAMETER_TEMPLATE_REGEX = re.compile(r'^(\${[^%s]+})$' % CUSTOM_PARAMETER_SEPARATOR)
 
diff --git a/lti_consumer/tests/unit/test_lti_xblock.py b/lti_consumer/tests/unit/test_lti_xblock.py
index c088b012..f489ee27 100644
--- a/lti_consumer/tests/unit/test_lti_xblock.py
+++ b/lti_consumer/tests/unit/test_lti_xblock.py
@@ -141,8 +141,8 @@ def test_context_id(self):
         self.assertEqual(self.xblock.context_id, str(self.xblock.scope_ids.usage_id.context_key))
 
     @ddt.data(
-        ['x=y'], [' x x = y y '], ['x= '], [' =y'], [' = '],
-        ['x=y', ' x x = y y ', 'x= ', ' =y', ' = '],
+        ['x=y'], [' x x = y y '], ['x= '], [' =y'], [' = '], [' x = = y = z '],
+        ['x=y', ' x x = y y ', 'x= ', ' =y', ' = ', ' x = = y = z '],
     )
     def test_validate_with_valid_custom_parameters(self, custom_parameters):
         """
@@ -167,7 +167,7 @@ def test_validate_with_empty_custom_parameters(self, add_mock, mock_validation_m
             mock_validation_message('error', 'Custom Parameters must be a list'),
         )
 
-    @ddt.data(['x'], ['x='], ['=y'], ['x==y'], ['x', 'x=', '=y', 'x==y'])
+    @ddt.data(['x'], ['x='], ['=y'], ['x', 'x=', '=y'])
     @patch('lti_consumer.lti_xblock.ValidationMessage')
     @patch.object(Validation, 'add')
     def test_validate_with_invalid_custom_parameters(self, custom_parameters, add_mock, mock_validation_message):