to nul_byte

Author: avdata99

ckan/logic/schema/__init__.py

@@ -498,14 +498,14 @@ def user_new_form_schema(
 @validator_args
 def request_reset_form_schema(
         not_empty: Validator, unicode_safe: Validator,
-        no_nul_characters: Validator) -> Schema:
+        no_nul_byte: Validator) -> Schema:
     '''Schema for the /user/reset form (request a password-reset link).
 
     Guards the ``user`` field against NUL bytes that would otherwise crash
     psycopg2 when the value is used to look the user up in Postgres.
     '''
     return {
-        'user': [not_empty, no_nul_characters, unicode_safe],
+        'user': [not_empty, no_nul_byte, unicode_safe],
     }
 
 

ckan/logic/validators.py

@@ -367,7 +367,7 @@ def group_id_or_name_exists(reference: str, context: Context) -> Any:
     return reference
 
 
-def no_nul_characters(value: Any, context: Context) -> Any:
+def no_nul_byte(value: Any, context: Context) -> Any:
     '''Reject strings containing the NUL character (U+0000).
 
     PostgreSQL ``text`` columns cannot store the NUL byte and ``psycopg2``

ckan/tests/logic/test_validators.py

@@ -356,8 +356,8 @@ def call_validator(*args, **kwargs):
         call_validator(valid_value)
 
 
-def test_no_nul_characters_with_invalid_value():
-    """no_nul_characters() should raise Invalid for any string containing
+def test_no_nul_byte_with_invalid_value():
+    """no_nul_byte() should raise Invalid for any string containing
     the NUL byte. PostgreSQL text columns reject NUL and psycopg2 raises
     ValueError before the query is sent, so unguarded input becomes a 500.
     """
@@ -371,11 +371,11 @@ def test_no_nul_characters_with_invalid_value():
     ]
 
     for invalid_value in invalid_values:
-        raises_invalid(validators.no_nul_characters)(invalid_value, context={})
+        raises_invalid(validators.no_nul_byte)(invalid_value, context={})
 
 
-def test_no_nul_characters_with_valid_value():
-    """no_nul_characters() should return the value unchanged for any string
+def test_no_nul_byte_with_valid_value():
+    """no_nul_byte() should return the value unchanged for any string
     that doesn't contain the NUL byte, including strings with other control
     characters and non-ASCII Unicode (which PostgreSQL accepts)."""
     valid_values = [
@@ -391,7 +391,7 @@ def test_no_nul_characters_with_valid_value():
     ]
 
     for valid_value in valid_values:
-        returns_arg(validators.no_nul_characters)(valid_value)
+        returns_arg(validators.no_nul_byte)(valid_value)
 
 
 def test_strip_value_with_valid_value():