diff --git a/dkim/tests/__init__.py b/dkim/tests/__init__.py index bedc568..9bc88c8 100644 --- a/dkim/tests/__init__.py +++ b/dkim/tests/__init__.py @@ -30,6 +30,7 @@ def test_suite(): test_crypto, test_dkim, test_dkim_ed25519, + test_dkim_rsavariants, test_dkim_tlsrpt, test_util, test_arc, @@ -40,6 +41,7 @@ def test_suite(): test_crypto, test_dkim, test_dkim_ed25519, + test_dkim_rsavariants, test_dkim_tlsrpt, test_util, test_arc, diff --git a/dkim/tests/data/1024_testkey.key b/dkim/tests/data/1024_testkey.key new file mode 100644 index 0000000..7c0d47a --- /dev/null +++ b/dkim/tests/data/1024_testkey.key @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQC6aakWzruYAKX9OdOdSHMemqVdGQurNYLC1H7O/T2LQIHVbkKF +6KKjlgFM7lr8skfZMhJe/KRGMvVjCV5ZakZIGeP3Hi1qXCEvmjS4ElpMPMPyPrZi +gt95ipqywPYZJWHbRiJ085VdkSCtLUvo5sypA0nTJeynEouAN+/wBaCO6QIDAQAB +AoGBALdQsLd9FX2lJZagBznkxVCTQ4sJ1i/Hr49o6EslPiByjzsT8tc8rrOwEBdX +TqKxr3Ynh2lhiSp/clCyJdZIbFNKwXnqdN6DaA+aVRKT5n2YxmZr1AGp8VdOX56a ++JTWDFSrDBUeNgG0xU7ywJjAYpj5gWk4rwsaA0ez/7Kb/5sBAkEA9H3Rxmyi0T5z +IqOpAMOg0oHJRk0gGbJ6etKVPsghd+PDU+gfz69Ga2eEpPBIGFv8SXAeBlWyQCAK +SXIkEREn7wJBAMMv+nWQsjf71BmdFULvUrHux2eHE6R18+CIYak8xs8sEJuprjQf +7QfznUBaDqAww7+XufofdSrU1AcfEsXWnqcCQQDgeSCACMAYUzkMhaymSfa/L3An +vqoJTefMGsnyQXcRByoQQJ/sY+XIuNt9QCtBSjtBBdJbSJUG8SPguQ5KKTE7AkBz +RXJ02+9kgKTSO6LC1PPRgWLiETPYfJB6mhCTEgGXeD6Wr67hubkSaR0FVCovEJ2K +GOEMhmd71BUj34YGsKkhAkBKkdEwDWSvPDCfmyBzgCKufu1tZzphRtxoL6Z6Vlcj +0/SRmoG8S1uQKzkm7z7ekRMLIl9UlUlKUvxF6oblccUo +-----END RSA PRIVATE KEY----- diff --git a/dkim/tests/data/1024_testkey_wo_markers.pub.rsa.txt b/dkim/tests/data/1024_testkey_wo_markers.pub.rsa.txt new file mode 100644 index 0000000..d0eb66d --- /dev/null +++ b/dkim/tests/data/1024_testkey_wo_markers.pub.rsa.txt @@ -0,0 +1 @@ +v=DKIM1; g=*; k=rsa; p=MIGJAoGBALppqRbOu5gApf05051Icx6apV0ZC6s1gsLUfs79PYtAgdVuQoXooqOWAUzuWvyyR9kyEl78pEYy9WMJXllqRkgZ4/ceLWpcIS+aNLgSWkw8w/I+tmKC33mKmrLA9hklYdtGInTzlV2RIK0tS+jmzKkDSdMl7KcSi4A37/AFoI7pAgMBAAE= diff --git a/dkim/tests/data/1024_testkey_wo_markers.pub.txt b/dkim/tests/data/1024_testkey_wo_markers.pub.txt new file mode 100644 index 0000000..d14dec2 --- /dev/null +++ b/dkim/tests/data/1024_testkey_wo_markers.pub.txt @@ -0,0 +1 @@ +v=DKIM1; g=*; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6aakWzruYAKX9OdOdSHMemqVdGQurNYLC1H7O/T2LQIHVbkKF6KKjlgFM7lr8skfZMhJe/KRGMvVjCV5ZakZIGeP3Hi1qXCEvmjS4ElpMPMPyPrZigt95ipqywPYZJWHbRiJ085VdkSCtLUvo5sypA0nTJeynEouAN+/wBaCO6QIDAQAB diff --git a/dkim/tests/data/2048_testkey.key b/dkim/tests/data/2048_testkey.key new file mode 100644 index 0000000..4c946e1 --- /dev/null +++ b/dkim/tests/data/2048_testkey.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA5Ru5WVhkPiBuE+mOf29uqontUfoQpcWX04sA/V6dRmZ0I2kR +HOSKYXLW84sqPiWyfKH4WaP7f0p6RvENyIqFjCYWDPxSX5Ck/rj0jUzQ6FKloUb9 +M/0hhdUy2xa7przy7wudLu7WpgxyMLogPZfWMV369vvPefyvuXF8B3rCuy5qSNyv +nDf0Dn4/blILfyw5df4JWJIj0FfXxc3LMMLQM+Nn8q71iJmH5qXuB78GWUjT7erE +XnrXdWKZimM9l6fMSOb6EBm0AwNVR+mOGwt05LPrSHFrwKJSNRB5gBOzXfmjdUpg +hIq+wLF1trz+oJt5CcZs45GPjiuyUomI+HgFpQIDAQABAoIBACZDIAxEz9D0V43p +xouPz5qZmFHFgnw86KNCprKp13hHagPz6xC5NkcaB736st5YK1vXLQPDeCAFDzDD +1zpzr+P9BFe82ADvxi5oMydZ+dWi39h0Y5sIHk4ckfa28DXjfmrftKt+5cgrcfKj +UvkWX4Y1HNGcskS8J5i/1Cfnn5fk0qRcedRnRTI+EgtV5pdawCMxvQ5jZ+QEirfZ +jvmY+PsZZHbYDwpj4kptro/R4CA6ROO8O70gWsOYDwc0Ag4NrNYw4TwXNJLZXPJ/ +uOybF0uG9E8b9TUIkbuKPza6dH7eEziKrWzbdpc/7KHzjm2+w5cpL1FhmplypJ9z +0K3cMqECgYEA8+VqnauecO2k9OmcFHJK1vAmZDklO56DF0e4VluXUUHEl1hSq/gE +KrQpObnFPuJ6s/94rcMfsHYxnmpRvqGQJfQelVPUw0sFCpi4Oef8DdWVs88K0W9/ +0OBxTUQDzn3BwOpkP1xpnkvgerf+vZLNsOKyR47crGAEnV/zSavXwbkCgYEA8Hpv +VDqgKgxmZPBx5x2wiSP1n+1iVA7UejiENekrV45O0hgpTPIewzE5h4Znnku8TI8P +R3udNRQhFbaUftfJIhbOiPd7Tkax+dpUuyE2pxviCfTYYtw3C/tkAK8BtvRR8F/1 +N3U/bef/mUygWmy28heTm71Ul7NZ5+uVSQN9SU0CgYEAuC9EeJWmLXoJ3LqemAJH +6lGpbH6LU569ONN8rhq1BzQ3lmOo6x19aBJuH53fC0JVj6EaLX7xa32Wsx9vZBr2 +lPLqNbL9Ng5tXDdAyNocSwZE62krrkYZrFASwFrg1Qu7Ski4M/FCAb0jZQmWYut+ +Ulqgb9G/bJ2GXqKbQ8N2SGECgYB7k49OS2ou8XxU9rKxv7IOZ2o7qvNSmuRZgl1+ +jrn1Hm4mzL+8iNeCGvOjT1BEKkszVHjXlRBuTE/MJq0cmasEV4//Fp5I1U90Q9wy +5Zh+O3fnAemIs/2drKvxJf3NlLPewJD01M2pnwTcNGJa1W8V7UOvTpX/9uyGn6tx +f9eMKQKBgQDGuBHLDYSW5/uSAKq2462mDSa7keTUfONkFN2XR0f0JnYt3DIgcX3/ +ciGzZumCEmp4XJu0HUi67Fjz1BeCmKQWFC0rMzkTSZimjxQMv2iPXwhWDyR1yMpe ++yV8JAFAwBUUtMVXTMPZfWXeNLFep0dyCSk6qCRBT7ppydNOaLSnHg== +-----END RSA PRIVATE KEY----- diff --git a/dkim/tests/data/2048_testkey_wo_markers.pub.rsa.txt b/dkim/tests/data/2048_testkey_wo_markers.pub.rsa.txt new file mode 100644 index 0000000..fee46fb --- /dev/null +++ b/dkim/tests/data/2048_testkey_wo_markers.pub.rsa.txt @@ -0,0 +1 @@ +v=DKIM1; g=*; k=rsa; p=MIIBCgKCAQEA5Ru5WVhkPiBuE+mOf29uqontUfoQpcWX04sA/V6dRmZ0I2kRHOSKYXLW84sqPiWyfKH4WaP7f0p6RvENyIqFjCYWDPxSX5Ck/rj0jUzQ6FKloUb9M/0hhdUy2xa7przy7wudLu7WpgxyMLogPZfWMV369vvPefyvuXF8B3rCuy5qSNyvnDf0Dn4/blILfyw5df4JWJIj0FfXxc3LMMLQM+Nn8q71iJmH5qXuB78GWUjT7erEXnrXdWKZimM9l6fMSOb6EBm0AwNVR+mOGwt05LPrSHFrwKJSNRB5gBOzXfmjdUpghIq+wLF1trz+oJt5CcZs45GPjiuyUomI+HgFpQIDAQAB diff --git a/dkim/tests/data/2048_testkey_wo_markers.pub.txt b/dkim/tests/data/2048_testkey_wo_markers.pub.txt new file mode 100644 index 0000000..8c8357b --- /dev/null +++ b/dkim/tests/data/2048_testkey_wo_markers.pub.txt @@ -0,0 +1 @@ +v=DKIM1; g=*; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5Ru5WVhkPiBuE+mOf29uqontUfoQpcWX04sA/V6dRmZ0I2kRHOSKYXLW84sqPiWyfKH4WaP7f0p6RvENyIqFjCYWDPxSX5Ck/rj0jUzQ6FKloUb9M/0hhdUy2xa7przy7wudLu7WpgxyMLogPZfWMV369vvPefyvuXF8B3rCuy5qSNyvnDf0Dn4/blILfyw5df4JWJIj0FfXxc3LMMLQM+Nn8q71iJmH5qXuB78GWUjT7erEXnrXdWKZimM9l6fMSOb6EBm0AwNVR+mOGwt05LPrSHFrwKJSNRB5gBOzXfmjdUpghIq+wLF1trz+oJt5CcZs45GPjiuyUomI+HgFpQIDAQAB diff --git a/dkim/tests/test_dkim_rsavariants.py b/dkim/tests/test_dkim_rsavariants.py new file mode 100644 index 0000000..308f7a9 --- /dev/null +++ b/dkim/tests/test_dkim_rsavariants.py @@ -0,0 +1,107 @@ +# This software is provided 'as-is', without any express or implied +# warranty. In no event will the author be held liable for any damages +# arising from the use of this software. +# +# Permission is granted to anyone to use this software for any purpose, +# including commercial applications, and to alter it and redistribute it +# freely, subject to the following restrictions: +# +# 1. The origin of this software must not be misrepresented; you must not +# claim that you wrote the original software. If you use this software +# in a product, an acknowledgment in the product documentation would be +# appreciated but is not required. +# 2. Altered source versions must be plainly marked as such, and must not be +# misrepresented as being the original software. +# 3. This notice may not be removed or altered from any source distribution. +# +# Copyright (c) 2011 William Grant + +import email +import os.path +import unittest +import time + +import dkim + + +def read_test_data(filename): + """Get the content of the given test data file. + + The files live in dkim/tests/data. + """ + path = os.path.join(os.path.dirname(__file__), 'data', filename) + with open(path, 'rb') as f: + return f.read() + + +class TestSignAndVerify(unittest.TestCase): + """End-to-end signature and verification tests.""" + + def setUp(self): + self.message = read_test_data("test.message") + self.key1024 = read_test_data("1024_testkey.key") + self.key2048 = read_test_data("2048_testkey.key") + + def dnsfunc(self, domain, timeout=5): + _dns_responses = { + 'test._domainkey.example.com.': read_test_data("1024_testkey_wo_markers.pub.txt"), + 'test2._domainkey.example.com.': read_test_data("1024_testkey_wo_markers.pub.rsa.txt"), + 'test3._domainkey.example.com.': read_test_data("2048_testkey_wo_markers.pub.txt"), + 'test4._domainkey.example.com.': read_test_data("2048_testkey_wo_markers.pub.rsa.txt"), + } + try: + domain = domain.decode('ascii') + except UnicodeDecodeError: + return None + self.assertTrue(domain in _dns_responses,domain) + return _dns_responses[domain] + + + def test_verifies_SubjectPublicKeyInfo1024(self): + # A message verifies after being signed. + for header_algo in (b"simple", b"relaxed"): + for body_algo in (b"simple", b"relaxed"): + sig = dkim.sign( + self.message, b"test", b"example.com", self.key1024, + canonicalize=(header_algo, body_algo)) + res = dkim.verify(sig + self.message, dnsfunc=self.dnsfunc) + self.assertTrue(res) + + + + def test_verifies_RSAPublicKey1024(self): + # A message verifies after being signed. + for header_algo in (b"simple", b"relaxed"): + for body_algo in (b"simple", b"relaxed"): + sig = dkim.sign( + self.message, b"test2", b"example.com", self.key1024, + canonicalize=(header_algo, body_algo)) + res = dkim.verify(sig + self.message, dnsfunc=self.dnsfunc) + self.assertTrue(res) + + + def test_verifiesSubjectPublicKeyInfo2048(self): + # A message verifies after being signed. + for header_algo in (b"simple", b"relaxed"): + for body_algo in (b"simple", b"relaxed"): + sig = dkim.sign( + self.message, b"test3", b"example.com", self.key2048, + canonicalize=(header_algo, body_algo)) + res = dkim.verify(sig + self.message, dnsfunc=self.dnsfunc) + self.assertTrue(res) + + + def test_verifiesRSAPublicKey2048(self): + # A message verifies after being signed. + for header_algo in (b"simple", b"relaxed"): + for body_algo in (b"simple", b"relaxed"): + sig = dkim.sign( + self.message, b"test4", b"example.com", self.key2048, + canonicalize=(header_algo, body_algo)) + res = dkim.verify(sig + self.message, dnsfunc=self.dnsfunc) + self.assertTrue(res) + + +def test_suite(): + from unittest import TestLoader + return TestLoader().loadTestsFromName(__name__)