X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tests%2Ftestx509.py;h=a54417ba5733cb0e966f92bc7c196f8b624c2c0b;hb=2feb549a3199f6d503adc81d7b32a20ab970c553;hp=65b4a7a09df80a0b2526babdba2f4972f756b656;hpb=911a7fb801bfd74cb50b08fa77ae5c50d1890d8d;p=oss%2Fctypescrypto.git

diff --git a/tests/testx509.py b/tests/testx509.py
index 65b4a7a..a54417b 100644
--- a/tests/testx509.py
+++ b/tests/testx509.py
@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from ctypescrypto.x509 import X509,X509Store
+from ctypescrypto.x509 import X509,X509Store,utc
 from ctypescrypto.oid import Oid
+from tempfile import NamedTemporaryFile
+import datetime
 import unittest
 
 
@@ -67,6 +69,47 @@ WSaUuftL/+yFk729xDoYkOZhFwUSUM5SbEZ0JpufWFjDi3Qwj3ZOTXliHC3e4C71
 iFTXJP8/Au8kfezlA4b+eS81zWq2BFvNlBQsgf04S88oew0CuBBgtjUIIw7XZkS0
 3QIDAQAB
 -----END PUBLIC KEY-----
+"""
+	digicert_cert="""digicert.crt
+-----BEGIN CERTIFICATE-----
+MIIG5jCCBc6gAwIBAgIQAze5KDR8YKauxa2xIX84YDANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA3MTEwOTEyMDAwMFoXDTIxMTExMDAwMDAwMFowaTEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTEoMCYGA1UEAxMfRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgQ0EtMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPOWYth1bhn/
+PzR8SU8xfg0ETpmB4rOFVZEwscCvcLssqOcYqj9495BoUoYBiJfiOwZlkKq9ZXbC
+7L4QWzd4g2B1Rca9dKq2n6Q6AVAXxDlpufFP74LByvNK28yeUE9NQKM6kOeGZrzw
+PnYoTNF1gJ5qNRQ1A57bDIzCKK1Qss72kaPDpQpYSfZ1RGy6+c7pqzoC4E3zrOJ6
+4GAiBTyC01Li85xH+DvYskuTVkq/cKs+6WjIHY9YHSpNXic9rQpZL1oRIEDZaARo
+LfTAhAsKG3jf7RpY3PtBWm1r8u0c7lwytlzs16YDMqbo3rcoJ1mIgP97rYlY1R4U
+pPKwcNSgPqcCAwEAAaOCA4UwggOBMA4GA1UdDwEB/wQEAwIBhjA7BgNVHSUENDAy
+BggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMDBggrBgEFBQcDBAYIKwYBBQUH
+AwgwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUH
+AgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5o
+dG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0
+AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1
+AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABp
+AGcAaQBDAGUAcgB0ACAARQBWACAAQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBl
+AGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBo
+AGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAg
+AGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAg
+AGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wEgYDVR0TAQH/BAgwBgEB/wIBADCB
+gwYIKwYBBQUHAQEEdzB1MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2Vy
+dC5jb20wTQYIKwYBBQUHMAKGQWh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NBQ2Vy
+dHMvRGlnaUNlcnRIaWdoQXNzdXJhbmNlRVZSb290Q0EuY3J0MIGPBgNVHR8EgYcw
+gYQwQKA+oDyGOmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hB
+c3N1cmFuY2VFVlJvb3RDQS5jcmwwQKA+oDyGOmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0
+LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVlJvb3RDQS5jcmwwHQYDVR0OBBYE
+FExYyyXwQU9S9CjIgUObpqig5pLlMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSYJhoI
+Au9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQBMeheHKF0XvLIyc7/NLvVYMR3wsXFU
+nNabZ5PbLwM+Fm8eA8lThKNWYB54lBuiqG+jpItSkdfdXJW777UWSemlQk808kf/
+roF/E1S3IMRwFcuBCoHLdFfcnN8kpCkMGPAc5K4HM+zxST5Vz25PDVR708noFUjU
+xbvcNRx3RQdIRYW9135TuMAW2ZXNi419yWBP0aKb49Aw1rRzNubS+QOy46T15bg+
+BEkAui6mSnKDcp33C4ypieez12Qf1uNgywPE3IjpnSUBAHHLA7QpYCWP+UbRe3Gu
+zVMSW4SOwg/H7ZMZ2cn6j1g0djIvruFQFGHUqFijyDATI+/GJYw2jxyA
+-----END CERTIFICATE-----
 """
 	def test_readpubkey(self):
 		c=X509(self.cert1)
@@ -82,6 +125,12 @@ iFTXJP8/Au8kfezlA4b+eS81zWq2BFvNlBQsgf04S88oew0CuBBgtjUIIw7XZkS0
 		c=X509(self.cert1)
 		self.assertEqual(c.subject[Oid("C")],"RU")
 		self.assertEqual(c.subject[Oid("L")],u'\u041c\u043e\u0441\u043a\u0432\u0430')
+	def test_notBefore(self):
+		c=X509(self.cert1)
+		self.assertEqual(c.startDate,datetime.datetime(2014,10,26,19,07,17,0,utc))
+	def test_notAfter(self):
+		c=X509(self.cert1)
+		self.assertEqual(c.endDate,datetime.datetime(2024,10,23,19,7,17,0,utc))
 	def test_namecomp(self):
 		c=X509(self.cert1)
 		ca=X509(self.ca_cert)
@@ -91,11 +140,48 @@ iFTXJP8/Au8kfezlA4b+eS81zWq2BFvNlBQsgf04S88oew0CuBBgtjUIIw7XZkS0
 	def test_serial(self):
 		c=X509(self.cert1)
 		self.assertEqual(c.serial,0xDF448E69DADC927CL)
+	def test_version(self):
+		c=X509(self.cert1)
+		self.assertEqual(c.version,3)
 	def test_ca_cert(self):
 		ca=X509(self.ca_cert)
 		self.assertTrue(ca.check_ca())
 		notca=X509(self.cert1)
 		self.assertFalse(notca.check_ca())
+	def test_extension_count(self):
+		cert=X509(self.cert1)
+		self.assertTrue(len(cert.extensions),4)
+		ca_cert=X509(self.ca_cert)
+		self.assertEqual(len(ca_cert.extensions),3)
+	def test_extension_outofrange(self):
+		cert=X509(self.cert1)
+		with self.assertRaises(IndexError):
+			cert.extensions[4]
+		with self.assertRaises(IndexError):
+			cert.extensions[-1]
+	def test_extension_oid(self):
+		cert=X509(self.cert1)
+		ext=cert.extensions[0]
+		ext_id=ext.oid
+		self.assertTrue(isinstance(ext_id,Oid))
+		self.assertEqual(ext_id,Oid('basicConstraints'))
+	def text_extension_text(self):
+		cert=X509(self.cert1)
+		ext=cert.extensions[0]
+		self.assertEqual(str(ext),'CA:FALSE')
+	def test_extenson_find(self):
+		cert=X509(self.cert1)
+		exts=cert.extensions.find(Oid('subjectAltName'))
+		self.assertEqual(len(exts),1)
+		self.assertEqual(exts[0].oid,Oid('subjectAltName'))
+	def test_extenson_critical(self):
+		cert=X509(self.digicert_cert)
+		crit_exts=cert.extensions.find_critical()
+		self.assertEqual(len(crit_exts),2)
+		other_exts=cert.extensions.find_critical(False)
+		self.assertEqual(len(crit_exts)+len(other_exts),len(cert.extensions))
+		self.assertEqual(crit_exts[0].critical,True)
+		self.assertEqual(other_exts[0].critical,False)
 	def test_verify_by_key(self):
 		ca=X509(self.ca_cert)
 		pubkey=ca.pubkey
@@ -104,8 +190,31 @@ iFTXJP8/Au8kfezlA4b+eS81zWq2BFvNlBQsgf04S88oew0CuBBgtjUIIw7XZkS0
 		pk2=c.pubkey
 		self.assertFalse(c.verify(key=pk2))
 		self.assertTrue(c.verify(key=pubkey))
+	def test_default_filestore(self):
+		store=X509Store(default=True)
+		c1=X509(self.cert1)
+		# Cert signed by our CA shouldn't be successfully verified
+		# by default CA store
+		self.assertFalse(c1.verify(store))
+		# but cert, downloaded from some commercial CA - should.
+		c2=X509(self.digicert_cert)
+		self.assertTrue(c2.verify(store))
 	def test_verify_by_filestore(self):
-		pass
+		trusted=NamedTemporaryFile()
+		trusted.write(self.ca_cert)
+		trusted.flush()
+		goodcert=X509(self.cert1)
+		badcert=X509(self.cert1[0:-30]+"GG"+self.cert1[-28:])
+		gitcert=X509(self.digicert_cert)
+		store=X509Store(file=trusted.name)
+		# We should successfuly verify certificate signed by our CA cert
+		self.assertTrue(goodcert.verify(store))
+		# We should reject corrupted certificate
+		self.assertFalse(badcert.verify(store))
+		# And if we specify explicitely certificate file, certificate,
+		# signed by some commercial CA should be rejected too
+		self.assertFalse(gitcert.verify(store))
+		trusted.close()
 	def test_verify_by_dirstore(self):
 		pass
 if __name__ == '__main__':