polish

Author: chillaq

splitio/client/input_validator.py

@@ -80,7 +80,7 @@ def _check_string_not_empty(value, name, operation):
     return True
 
 
-def _check_string_matches(value, operation, pattern):
+def _check_string_matches(value, operation, pattern, name):
     """
     Check if value is adhere to a regular expression passed.
 
@@ -93,14 +93,14 @@ def _check_string_matches(value, operation, pattern):
     :return: The result of validation
     :rtype: True|False
     """
-    if not re.match(pattern, value):
+    if re.search(pattern, value) is None or re.search(pattern, value).group() != value:
         _LOGGER.error(
             '%s: you passed %s, event_type must ' +
             'adhere to the regular expression %s. ' +
-            'This means an event name must be alphanumeric, cannot be more ' +
+            'This means %s must be alphanumeric, cannot be more ' +
             'than 80 characters long, and can only include a dash, underscore, ' +
             'period, or colon as separators of alphanumeric characters.',
-            operation, value, pattern
+            operation, value, pattern, name
         )
         return False
     return True
@@ -323,7 +323,7 @@ def validate_event_type(event_type):
     if (not _check_not_null(event_type, 'event_type', 'track')) or \
        (not _check_is_string(event_type, 'event_type', 'track')) or \
        (not _check_string_not_empty(event_type, 'event_type', 'track')) or \
-       (not _check_string_matches(event_type, 'track', EVENT_TYPE_PATTERN)):
+       (not _check_string_matches(event_type, 'track', EVENT_TYPE_PATTERN, 'an event name')):
         return None
     return event_type
 
@@ -591,10 +591,9 @@ def validate_flag_sets(flag_sets, method_name):
         flag_set = _remove_empty_spaces(flag_set, 'flag set', method_name)
         flag_set = _convert_str_to_lower(flag_set, 'flag set', method_name)
 
-        if re.search(_FLAG_SETS_REGEX, flag_set) is None or re.search(_FLAG_SETS_REGEX, flag_set).group() != flag_set:
-            _LOGGER.warning("%s: you passed %s, flag set must adhere to the regular expressions %s. This means a flag set must start with a letter, be in lowercase, alphanumeric and have a max length of 50 characteres. %s was discarded.", flag_set, _FLAG_SETS_REGEX, flag_set)
+        if not _check_string_matches(flag_set, method_name, _FLAG_SETS_REGEX, 'a flag set'):
             continue
 
-        sanitized_flag_sets.add(flag_set.strip())
+        sanitized_flag_sets.add(flag_set)
 
     return sorted(list(sanitized_flag_sets))

splitio/models/flag_sets.py

@@ -73,8 +73,7 @@ def get_flag_set(self, flag_set):
         :rtype: list(str)
         """
         with self._lock:
-            if self.flag_set_exist(flag_set):
-                return self.sets_feature_flag_map[flag_set]
+            return self.sets_feature_flag_map.get(flag_set)
 
     def add_flag_set(self, flag_set):
         """

tests/client/test_input_validator.py

@@ -666,10 +666,10 @@ def test_track(self, mocker):
         assert _logger.error.mock_calls == [
             mocker.call("%s: you passed %s, event_type must adhere to the regular "
                         "expression %s. This means "
-                        "an event name must be alphanumeric, cannot be more than 80 "
+                        "%s must be alphanumeric, cannot be more than 80 "
                         "characters long, and can only include a dash, underscore, "
                         "period, or colon as separators of alphanumeric characters.",
-                        'track', '@@', '^[a-zA-Z0-9][-_.:a-zA-Z0-9]{0,79}$')
+                        'track', '@@', '^[a-zA-Z0-9][-_.:a-zA-Z0-9]{0,79}$', 'an event name')
         ]
 
         _logger.reset_mock()
@@ -1074,6 +1074,33 @@ def _configs(treatment):
             )
         ]
 
+    def test_flag_sets_validation(self):
+        """Test sanitization for flag sets."""
+        flag_sets = input_validator.validate_flag_sets([' set1', 'set2 ', 'set3'], 'method')
+        assert sorted(flag_sets) == ['set1', 'set2', 'set3']
+
+        flag_sets = input_validator.validate_flag_sets(['1set', '_set2'], 'method')
+        assert flag_sets == ['1set']
+
+        flag_sets = input_validator.validate_flag_sets(['Set1', 'SET2'], 'method')
+        assert sorted(flag_sets) == ['set1', 'set2']
+
+        flag_sets = input_validator.validate_flag_sets(['se\t1', 's/et2', 's*et3', 's!et4', 'se@t5', 'se#t5', 'se$t5', 'se^t5', 'se%t5', 'se&t5'], 'method')
+        assert flag_sets == []
+
+        flag_sets = input_validator.validate_flag_sets(['set4', 'set1', 'set3', 'set1'], 'method')
+        assert sorted(flag_sets) == ['set1', 'set3', 'set4']
+
+        flag_sets = input_validator.validate_flag_sets(['w' * 50, 's' * 51], 'method')
+        assert flag_sets == ['w' * 50]
+
+        flag_sets = input_validator.validate_flag_sets('set1', 'method')
+        assert flag_sets == []
+
+        flag_sets = input_validator.validate_flag_sets([12, 33], 'method')
+        assert flag_sets == []
+
+
 class ManagerInputValidationTests(object):  #pylint: disable=too-few-public-methods
     """Manager input validation test cases."""