Skip to content

Extend timeouts in revocation timeout tests. #40932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bartonjs merged 1 commit into from
Aug 17, 2020
Merged

Extend timeouts in revocation timeout tests. #40932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions ...aries/System.Security.Cryptography.X509Certificates/tests/RevocationTests/TimeoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ public static void RevocationCheckingDelayed(PkiOptions pkiOptions)
using (X509Certificate2 rootCert = rootAuthority.CloneIssuerCert())
using (X509Certificate2 intermediateCert = intermediateAuthority.CloneIssuerCert())
{
TimeSpan delay = TimeSpan.FromSeconds(3);
TimeSpan delay = TimeSpan.FromSeconds(8);

X509Chain chain = holder.Chain;
responder.ResponseDelay = delay;
responder.DelayedActions = RevocationResponder.DelayedActionsFlag.All;

// This needs to be greater than delay, but less than 2x delay to ensure
// that the time is a timeout for individual fetches, not a running total.
chain.ChainPolicy.UrlRetrievalTimeout = TimeSpan.FromSeconds(5);
chain.ChainPolicy.UrlRetrievalTimeout = TimeSpan.FromSeconds(15);
chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
chain.ChainPolicy.CustomTrustStore.Add(rootCert);
chain.ChainPolicy.ExtraStore.Add(intermediateCert);
Expand All @@ -51,14 +51,14 @@ public static void RevocationCheckingDelayed(PkiOptions pkiOptions)
chain.ChainPolicy.DisableCertificateDownloads = true;

Stopwatch watch = Stopwatch.StartNew();
Assert.True(chain.Build(endEntityCert));
Assert.True(chain.Build(endEntityCert), $"chain.Build; Chain status: {chain.AllStatusFlags()}");
watch.Stop();

// There should be two network fetches, OCSP/CRL to intermediate to get leaf status,
// OCSP/CRL to root to get intermediate statuses. It should take at least 2x the delay
// plus other non-network time, so we can at least ensure it took as long as
// the delay for each fetch.
Assert.True(watch.Elapsed >= delay * 2);
Assert.True(watch.Elapsed >= delay * 2, $"watch.Elapsed: {watch.Elapsed}");
}
}

Expand Down Expand Up @@ -99,7 +99,7 @@ public static void RevocationCheckingTimeout(PkiOptions pkiOptions)

chain.ChainPolicy.DisableCertificateDownloads = true;

Assert.False(chain.Build(endEntityCert));
Assert.False(chain.Build(endEntityCert), "chain.Build");

const X509ChainStatusFlags ExpectedFlags =
X509ChainStatusFlags.RevocationStatusUnknown |
Expand Down Expand Up @@ -159,7 +159,7 @@ public static void RevocationCheckingMaximum(PkiOptions pkiOptions)

// Even though UrlRetrievalTimeout is more than the delay, it should
// get clamped to 1 minute, and thus less than the actual delay.
Assert.False(chain.Build(endEntityCert));
Assert.False(chain.Build(endEntityCert), "chain.Build");

const X509ChainStatusFlags ExpectedFlags =
X509ChainStatusFlags.RevocationStatusUnknown |
Expand Down Expand Up @@ -208,7 +208,7 @@ public static void RevocationCheckingNegativeTimeout(PkiOptions pkiOptions)

chain.ChainPolicy.DisableCertificateDownloads = true;

Assert.True(chain.Build(endEntityCert));
Assert.True(chain.Build(endEntityCert), $"chain.Build; Chain status: {chain.AllStatusFlags()}");
}
}

Expand Down Expand Up @@ -238,7 +238,7 @@ public static void AiaFetchDelayed()
responder.ResponseDelay = delay;
responder.DelayedActions = RevocationResponder.DelayedActionsFlag.All;

chain.ChainPolicy.UrlRetrievalTimeout = TimeSpan.FromSeconds(5);
chain.ChainPolicy.UrlRetrievalTimeout = TimeSpan.FromSeconds(15);
chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
chain.ChainPolicy.CustomTrustStore.Add(rootCert);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
Expand All @@ -247,7 +247,7 @@ public static void AiaFetchDelayed()
Assert.True(chain.Build(endEntityCert), GetFlags(chain, endEntityCert.Thumbprint).ToString());
watch.Stop();

Assert.True(watch.Elapsed >= delay);
Assert.True(watch.Elapsed >= delay, $"watch.Elapsed: {watch.Elapsed}");
}
}

Expand Down Expand Up @@ -282,7 +282,7 @@ public static void AiaFetchTimeout()
chain.ChainPolicy.CustomTrustStore.Add(rootCert);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

Assert.False(chain.Build(endEntityCert));
Assert.False(chain.Build(endEntityCert), "chain.Build");

const X509ChainStatusFlags ExpectedFlags =
X509ChainStatusFlags.PartialChain;
Expand Down