Merge pull request #22 from apple/dn-ocsp-flaky-tests

Add better diagnostics if an OCSP test fails
This commit is contained in:
Cory Benfield authored and GitHub committed 2023-02-13 11:20:17 +00:00
commit cd04b642b2
2 files changed
+19 -3

No files matched your search

+1 -1
View File
@@ -225,7 +225,7 @@ public struct OCSPVerifierPolicy<Requester: OCSPRequester>: VerifierPolicy, Send
return .failsToMeetPolicy(reason: "failed to decode nonce response \(error)")
}
guard let response = basicResponse.responseData.responses.first(where: { $0.certID == requestedCertID }) else {
return .failsToMeetPolicy(reason: "OCSP response does not include a response for the queried certificate")
return .failsToMeetPolicy(reason: "OCSP response does not include a response for the queried certificate \(requestedCertID) - responses: \(basicResponse.responseData.responses)")
}
switch response.certStatus {
+18 -2
View File
@@ -145,12 +145,26 @@ final class OCSPVerifierPolicyTests: XCTestCase {
)
let result = await policy.chainMeetsPolicyRequirements(chain: UnverifiedCertificateChain(chain))
guard case .meetsPolicy = result else {
return XCTFail("fails to validate \(result)", file: file, line: line)
XCTFail("fails to validate \(result)", file: file, line: line)
printChainForDebugging(chain)
return
}
let queryCount = await requester.queryCount
XCTAssertEqual(queryCount, expectedQueryCount, "unexpected requester query count", file: file, line: line)
}
func printChainForDebugging(_ chain: [Certificate]) {
dump(chain) // TODO: replace with Certificate.description once implemented
do {
var serializer = DER.Serializer()
try serializer.serializeSequenceOf(chain)
print("base64 DER representation of chain:")
print(Data(serializer.serializedBytes).base64EncodedString())
} catch {
print("failed to serialise chain \(error)")
}
}
func assertChainFailsToMeetPolicy(
chain: [Certificate],
requester: TestRequester,
@@ -165,7 +179,9 @@ final class OCSPVerifierPolicyTests: XCTestCase {
)
let result = await policy.chainMeetsPolicyRequirements(chain: UnverifiedCertificateChain(chain))
guard case .failsToMeetPolicy(let actualReason) = result else {
return XCTFail("chain did not fail validation", file: file, line: line)
XCTFail("chain did not fail validation", file: file, line: line)
printChainForDebugging(chain)
return
}
if let expectedReason {
XCTAssertEqual(actualReason, expectedReason, "unexpected policy failure reason", file: file, line: line)