diff --git a/EncryptionTests/Certificates/ProdZustelldienst.json b/EncryptionTests/Certificates/ValidCertificateFromProdPki.json similarity index 100% rename from EncryptionTests/Certificates/ProdZustelldienst.json rename to EncryptionTests/Certificates/ValidCertificateFromProdPki.json diff --git a/EncryptionTests/EncryptionTests.csproj b/EncryptionTests/EncryptionTests.csproj index eb6ef4a97871c09a7fc4463a28b02cdddf609555..61c371729bcaf7e5848ca413f70bbb4394b5fec6 100644 --- a/EncryptionTests/EncryptionTests.csproj +++ b/EncryptionTests/EncryptionTests.csproj @@ -31,7 +31,7 @@ <None Update="Test.pdf"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> - <None Update="Certificates\ProdZustelldienst.json"> + <None Update="Certificates\ValidCertificateFromProdPki.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> <None Update="Certificates\TestPkiRootCertificate.pem"> diff --git a/EncryptionTests/RootCertificatesTests.cs b/EncryptionTests/RootCertificatesTests.cs index 96b90183c4aa221b48f57225b99ab3ffd20000a4..643c2764e88dd6d135cddd0310cc4a81d5df7350 100644 --- a/EncryptionTests/RootCertificatesTests.cs +++ b/EncryptionTests/RootCertificatesTests.cs @@ -13,7 +13,7 @@ using NUnit.Framework; namespace SenderTest; public class RootCertificatesTests { - private ILogger _logger; + private ILogger? _logger; [OneTimeSetUp] public void OneTimeSetup() { @@ -28,7 +28,7 @@ public class RootCertificatesTests { public void LoadRootCertificates_ShouldPass() { // Act var certificates = CertificateHelper.GetRootCertificates().Result; - + // Assert certificates.Count.Should().BeGreaterThan(2); } @@ -36,9 +36,9 @@ public class RootCertificatesTests { [Test] public void ProdSubmission_ValidCertificate_ShouldPass() { // Arrange - var certificate = File.ReadAllText("./Certificates/ProdZustelldienst.json"); + var certificate = File.ReadAllText("./Certificates/ValidCertificateFromProdPki.json"); var key = new JsonWebKeySet(certificate).Keys.First(); - + // Act var result = new CertificateHelper(_logger).ValidateCertificate(key, null, LogLevel.Trace) .Result; @@ -50,14 +50,14 @@ public class RootCertificatesTests { [Test] public void TestPki_ValidCertificate_ShouldPass() { // Arrange - var certificate = - new JsonWebKeySet( - File.ReadAllText("./Certificates/ValidCertificateFromTestPki.json")); - var root = X509Certificate2.CreateFromPem( File.ReadAllText("./Certificates/TestPkiRootCertificate.pem")); + var certificate = + new JsonWebKeySet( + File.ReadAllText("./Certificates/ValidCertificateFromTestPki.json")); + // Act var result = new CertificateHelper(_logger) .ValidateCertificate(certificate, new[] { root }, LogLevel.Trace) @@ -85,6 +85,21 @@ public class RootCertificatesTests { // Assert result.Should().BeFalse(); + } + [Test] + public void TestPkiCertificate_ValidatesAgainstProdPki_ShouldFail() { + // Arrange + var keySetToBeTested = + new JsonWebKey( + File.ReadAllText("./Certificates/RevokedCertificate.json")); + + // Act + var result = + new CertificateHelper(_logger).ValidateCertificate(keySetToBeTested, + logLevel: LogLevel.Trace).Result; + + // Assert + result.Should().BeFalse(); } }