From cb1cea643e19a3b6d76124648831e181cec6e6c5 Mon Sep 17 00:00:00 2001 From: Jesse Laukkanen Date: Thu, 15 Nov 2018 08:59:13 +0200 Subject: [PATCH] Use a guaranteed invalid email in sanitize_email TLD `.invalid` is quaranteed to be invalid by IETF RFC2606 hence it is safer than earlier `sanitized.net`, that could, in theory, have e.g. a working mail server. --- database_sanitizer/sanitizers/user.py | 2 +- .../tests/test_sanitizers_user.py | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/database_sanitizer/sanitizers/user.py b/database_sanitizer/sanitizers/user.py index a16bade..37140ce 100644 --- a/database_sanitizer/sanitizers/user.py +++ b/database_sanitizer/sanitizers/user.py @@ -12,7 +12,7 @@ def sanitize_email(value): given_name = given_names[num1 % given_names_count] surname = surnames[num2 % surnames_count] case_convert = (text_type.lower if num3 % 8 > 0 else lambda x: x) - return '{first}.{last}@x{num:x}.sanitized.net'.format( + return '{first}.{last}@x{num:x}.san.example.com'.format( first=case_convert(given_name), last=case_convert(surname).replace("'", ''), num=num3) diff --git a/database_sanitizer/tests/test_sanitizers_user.py b/database_sanitizer/tests/test_sanitizers_user.py index afbe77a..dc623fd 100644 --- a/database_sanitizer/tests/test_sanitizers_user.py +++ b/database_sanitizer/tests/test_sanitizers_user.py @@ -9,16 +9,16 @@ def setup_module(): def test_sanitize_email(): assert user.sanitize_email(None) is None assert user.sanitize_email('') == '' - assert user.sanitize_email('test@example.com') == ( - 'zoe.burke@xce13103b.sanitized.net') - assert user.sanitize_email('test2@example.com') == ( - 'Melanie.Pratt@x4feb7f40.sanitized.net') - assert user.sanitize_email('test@example.com') == ( - 'zoe.burke@xce13103b.sanitized.net') - assert user.sanitize_email('test3@example.com') == ( - 'irene.archer@x3d2e92ec.sanitized.net') - assert user.sanitize_email(' test3@example.com ') == ( - 'irene.archer@x3d2e92ec.sanitized.net') + assert user.sanitize_email('test@example.net') == ( + 'Marian.Little@x12decfd0.san.example.com') + assert user.sanitize_email('test2@example.net') == ( + 'Melanie.Pratt@x4feb7f40.san.example.com') + assert user.sanitize_email('test@example.net') == ( + 'maureen.graham@x8ed2cb6e.san.example.com') + assert user.sanitize_email('test3@example.net') == ( + 'irene.archer@x3d2e92ec.san.example.com') + assert user.sanitize_email(' test3@example.net ') == ( + 'irene.archer@x3d2e92ec.san.example.com') def test_sanitize_username(): @@ -59,9 +59,9 @@ def test_sanitize_surname_en_gb(): def test_sanitize_email_resets_on_session_reset(): - assert user.sanitize_email('test@example.com') == ( - 'zoe.burke@xce13103b.sanitized.net') + assert user.sanitize_email('test@example.net') == ( + 'zoe.burke@xce13103b.san.example.com') session.reset() - assert user.sanitize_email('test@example.com') != ( - 'zoe.burke@xce13103b.sanitized.net') + assert user.sanitize_email('test@example.net') != ( + 'zoe.burke@xce13103b.san.example.com') session.reset(b'not-so-secret-key')