Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Sign.Core/Certificates/CertificateVerifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ public void Verify(X509Certificate2 certificate)
{
// See https://github.com/dotnet/roslyn-analyzers/issues/5626
#pragma warning disable CA2254 // Template should be a static expression
_logger.LogWarning(Resources.CertificateIsNotYetTimeValid);
_logger.LogError(Resources.CertificateIsNotYetTimeValid);
throw new SigningException(Resources.CertificateIsNotYetTimeValid);
}
else if (certificate.NotAfter < now)
{
_logger.LogWarning(Resources.CertificateIsExpired);
_logger.LogError(Resources.CertificateIsExpired);
throw new SigningException(Resources.CertificateIsExpired);
#pragma warning restore CA2254 // Template should be a static expression
}
}
Expand Down
10 changes: 5 additions & 5 deletions test/Sign.Core.Test/Certificates/CertificateVerifierTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void Verify_WhenCertificateIsNull_Throws()
}

[Fact]
public void Verify_WhenCertificateIsNotYetTimeValid_LogsWarning()
public void Verify_WhenCertificateIsNotYetTimeValid_Throws()
{
Logger logger = new(Resources.CertificateIsNotYetTimeValid);
CertificateVerifier verifier = new(logger);
Expand All @@ -42,14 +42,14 @@ public void Verify_WhenCertificateIsNotYetTimeValid_LogsWarning()
notBefore: now.AddDays(1),
notAfter: now.AddDays(2)))
{
verifier.Verify(certificate);
Assert.Throws<SigningException>(() => verifier.Verify(certificate));
}

Assert.Equal(1, logger.Log_CallCount);
}

[Fact]
public void Verify_WhenCertificateIsExpired_LogsWarning()
public void Verify_WhenCertificateIsExpired_Throws()
{
Logger logger = new(Resources.CertificateIsExpired);
CertificateVerifier verifier = new(logger);
Expand All @@ -59,7 +59,7 @@ public void Verify_WhenCertificateIsExpired_LogsWarning()
notBefore: now.AddDays(-2),
notAfter: now.AddDays(-1)))
{
verifier.Verify(certificate);
Assert.Throws<SigningException>(() => verifier.Verify(certificate));
}

Assert.Equal(1, logger.Log_CallCount);
Expand Down Expand Up @@ -107,7 +107,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
{
++Log_CallCount;

Assert.Equal(LogLevel.Warning, logLevel);
Assert.Equal(LogLevel.Error, logLevel);

string actualMessage = formatter(state, exception);

Expand Down