Merge pull request #37 from Keyfactor/skipexpiredfix

dgaley · web-flow · commit e7260ab9cc17 · 2023-02-15T16:30:44.000-05:00
correctly check the IgnoreExpired flag
diff --git a/src/EntrustRestCAProxy/EntrustCAConnector.cs b/src/EntrustRestCAProxy/EntrustCAConnector.cs
@@ -588,7 +588,7 @@ public override void Synchronize(ICertificateDataReader certificateDataReader, B
 			{
 				cancelToken.ThrowIfCancellationRequested();
 
-				if (entrustCert.ExpiresAfter.GetValueOrDefault() <= DateTime.UtcNow)
+				if (entrustCert.ExpiresAfter.GetValueOrDefault() <= DateTime.UtcNow && ignoreExpired)
 				{
 					Logger.Trace($"The certificate with serial number '{entrustCert.SerialNumber}' is expired and IgnoreExpired is true. Skipping.");
 					continue;

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ public override void Synchronize(ICertificateDataReader certificateDataReader, B`
`588`	`588`	`{`
`589`	`589`	`cancelToken.ThrowIfCancellationRequested();`
`590`	`590`
`591`		`- if (entrustCert.ExpiresAfter.GetValueOrDefault() <= DateTime.UtcNow)`
	`591`	`+ if (entrustCert.ExpiresAfter.GetValueOrDefault() <= DateTime.UtcNow && ignoreExpired)`
`592`	`592`	`{`
`593`	`593`	`Logger.Trace($"The certificate with serial number '{entrustCert.SerialNumber}' is expired and IgnoreExpired is true. Skipping.");`
`594`	`594`	`continue;`