mirror of https://github.com/briansmith/webpki
tests: add BetterTLS path building test suite.
[`git cherry-pick 4a39e2b67d4cddf58b0ea16dd821a04ee2240058`, with support for Edition 2018 added by Brian.] This commit introduces the Netflix BetterTLS[0]'s path building test suite to the webpki integration tests. This project has a test runner for Rustls that will stand up TLS servers to exercise these tests but: * It requires Go. * It needs Rustls in order to do a full TLS handshake with the test servers. * It's slower than testing the path building directly without the TLS bits. To avoid these issues this commit takes a different approach and vendors the exported path building test suite. This is a supported feature[1] of the upstream project and allow us to directly test webpki's path building against the test suite without needing Rustls or Go. [0]: https://github.com/Netflix/bettertls [1]: https://github.com/Netflix/bettertls#exporting-tests-to-run-outside-of-the-bettertls-executor
This commit is contained in:
parent
519bcb6c23
commit
52f4db4b85
|
@ -76,6 +76,8 @@ untrusted = "0.7.1"
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
base64 = "0.9.1"
|
base64 = "0.9.1"
|
||||||
rcgen = { version = "=0.11.1", default-features = false }
|
rcgen = { version = "=0.11.1", default-features = false }
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
serde_json = "1.0"
|
||||||
|
|
||||||
[profile.bench]
|
[profile.bench]
|
||||||
opt-level = 3
|
opt-level = 3
|
||||||
|
|
|
@ -0,0 +1,100 @@
|
||||||
|
# Copyright 2015 Brian Smith.
|
||||||
|
#
|
||||||
|
# Permission to use, copy, modify, and/or distribute this software for any
|
||||||
|
# purpose with or without fee is hereby granted, provided that the above
|
||||||
|
# copyright notice and this permission notice appear in all copies.
|
||||||
|
#
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
|
||||||
|
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||||
|
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
|
||||||
|
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||||
|
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||||
|
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
|
[package]
|
||||||
|
authors = ["Brian Smith <brian@briansmith.org>"]
|
||||||
|
categories = ["cryptography", "no-std"]
|
||||||
|
description = "Web PKI X.509 Certificate Verification."
|
||||||
|
edition = "2018"
|
||||||
|
license-file = "LICENSE"
|
||||||
|
name = "webpki"
|
||||||
|
readme = "README.md"
|
||||||
|
repository = "https://github.com/briansmith/webpki"
|
||||||
|
version = "0.22.1"
|
||||||
|
|
||||||
|
include = [
|
||||||
|
"Cargo.toml",
|
||||||
|
|
||||||
|
"LICENSE",
|
||||||
|
"README.md",
|
||||||
|
|
||||||
|
"src/calendar.rs",
|
||||||
|
"src/cert.rs",
|
||||||
|
"src/der.rs",
|
||||||
|
"src/end_entity.rs",
|
||||||
|
"src/error.rs",
|
||||||
|
"src/name.rs",
|
||||||
|
"src/name/dns_name.rs",
|
||||||
|
"src/name/ip_address.rs",
|
||||||
|
"src/name/verify.rs",
|
||||||
|
"src/signed_data.rs",
|
||||||
|
"src/time.rs",
|
||||||
|
"src/trust_anchor.rs",
|
||||||
|
"src/verify_cert.rs",
|
||||||
|
"src/lib.rs",
|
||||||
|
|
||||||
|
"src/data/**/*",
|
||||||
|
|
||||||
|
"tests/dns_name_tests.rs",
|
||||||
|
"tests/integration.rs",
|
||||||
|
"tests/misc/serial_neg.der",
|
||||||
|
"tests/misc/serial_zero.der",
|
||||||
|
"tests/netflix/ca.der",
|
||||||
|
"tests/netflix/ee.der",
|
||||||
|
"tests/netflix/inter.der",
|
||||||
|
"tests/ed25519/ca.der",
|
||||||
|
"tests/ed25519/ee.der",
|
||||||
|
|
||||||
|
"third-party/chromium/**/*",
|
||||||
|
]
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
all-features = true
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "webpki"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
alloc = ["ring/alloc"]
|
||||||
|
std = ["alloc"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
ring = { version = "0.16.19", default-features = false }
|
||||||
|
untrusted = "0.7.1"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
base64 = "0.9.1"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
rcgen = { version = "=0.11.1", default-features = false }
|
||||||
|
=======
|
||||||
|
rcgen = { version = "0.11.1", default-features = false }
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
serde_json = "1.0"
|
||||||
|
>>>>>>> 54e2c69c (tests: add BetterTLS path building test suite.)
|
||||||
|
|
||||||
|
[profile.bench]
|
||||||
|
opt-level = 3
|
||||||
|
debug = false
|
||||||
|
rpath = false
|
||||||
|
lto = true
|
||||||
|
debug-assertions = false
|
||||||
|
codegen-units = 1
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
opt-level = 3
|
||||||
|
debug = false
|
||||||
|
rpath = false
|
||||||
|
lto = true
|
||||||
|
debug-assertions = false
|
||||||
|
codegen-units = 1
|
|
@ -0,0 +1,95 @@
|
||||||
|
use serde::Deserialize;
|
||||||
|
use std::{collections::HashMap, convert::TryFrom};
|
||||||
|
use webpki::TrustAnchor;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn path_building() {
|
||||||
|
let raw_json = include_bytes!("../third-party/bettertls/pathbuilding.tests.json");
|
||||||
|
let better_tls: BetterTls = serde_json::from_slice(raw_json).expect("invalid test JSON");
|
||||||
|
println!("Testing BetterTLS revision {:?}", better_tls.revision);
|
||||||
|
|
||||||
|
let root_der = &better_tls.root_der();
|
||||||
|
let roots = &[TrustAnchor::try_from_cert_der(root_der).expect("invalid trust anchor")];
|
||||||
|
let trust_anchors = &webpki::TlsServerTrustAnchors(roots);
|
||||||
|
|
||||||
|
let path_building_suite = better_tls
|
||||||
|
.suites
|
||||||
|
.get("pathbuilding")
|
||||||
|
.expect("missing pathbuilding suite");
|
||||||
|
|
||||||
|
for testcase in &path_building_suite.test_cases {
|
||||||
|
println!("Testing path building test case {:?}", testcase.id);
|
||||||
|
|
||||||
|
let certs_der = testcase.certs_der();
|
||||||
|
let ee_der = &certs_der[0];
|
||||||
|
let intermediates = &certs_der[1..]
|
||||||
|
.iter()
|
||||||
|
.map(|cert| cert.as_slice())
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
let ee_cert =
|
||||||
|
webpki::EndEntityCert::try_from(ee_der.as_slice()).expect("invalid end entity cert");
|
||||||
|
|
||||||
|
// Set the time to the time of test case generation. This ensures that the test case
|
||||||
|
// certificates won't expire.
|
||||||
|
let now = webpki::Time::from_seconds_since_unix_epoch(1_688_651_734);
|
||||||
|
|
||||||
|
let result = ee_cert.verify_is_valid_tls_server_cert(
|
||||||
|
&[&webpki::ECDSA_P256_SHA256], // All of the BetterTLS testcases use P256 keys.
|
||||||
|
trust_anchors,
|
||||||
|
intermediates,
|
||||||
|
now,
|
||||||
|
);
|
||||||
|
|
||||||
|
match testcase.expected {
|
||||||
|
ExpectedResult::Accept => assert!(result.is_ok(), "expected success, got {:?}", result),
|
||||||
|
ExpectedResult::Reject => {
|
||||||
|
assert!(result.is_err(), "expected failure, got {:?}", result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Debug)]
|
||||||
|
struct BetterTls {
|
||||||
|
#[serde(rename(deserialize = "betterTlsRevision"))]
|
||||||
|
revision: String,
|
||||||
|
#[serde(rename(deserialize = "trustRoot"))]
|
||||||
|
root: String,
|
||||||
|
suites: HashMap<String, BetterTlsSuite>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BetterTls {
|
||||||
|
fn root_der(&self) -> Vec<u8> {
|
||||||
|
base64::decode(&self.root).expect("invalid trust anchor base64")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Debug)]
|
||||||
|
struct BetterTlsSuite {
|
||||||
|
#[serde(rename(deserialize = "testCases"))]
|
||||||
|
test_cases: Vec<BetterTlsTest>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Debug)]
|
||||||
|
struct BetterTlsTest {
|
||||||
|
id: u32,
|
||||||
|
certificates: Vec<String>,
|
||||||
|
expected: ExpectedResult,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BetterTlsTest {
|
||||||
|
fn certs_der(&self) -> Vec<Vec<u8>> {
|
||||||
|
self.certificates
|
||||||
|
.iter()
|
||||||
|
.map(|cert| base64::decode(cert).expect("invalid cert base64"))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Debug)]
|
||||||
|
#[serde(rename_all = "UPPERCASE")]
|
||||||
|
enum ExpectedResult {
|
||||||
|
Accept,
|
||||||
|
Reject,
|
||||||
|
}
|
|
@ -0,0 +1,177 @@
|
||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
|
@ -0,0 +1,17 @@
|
||||||
|
# BetterTLS Test Suite
|
||||||
|
|
||||||
|
Generated using the Netflix [bettertls] project.
|
||||||
|
|
||||||
|
[bettertls]: https://github.com/Netflix/bettertls
|
||||||
|
|
||||||
|
## Pathbuilding
|
||||||
|
|
||||||
|
To regenerate pathbuilding test data:
|
||||||
|
|
||||||
|
1. Install Go
|
||||||
|
2. Generate the JSON testdata export for the path building suite:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
GOBIN=$PWD go install github.com/Netflix/bettertls/test-suites/cmd/bettertls@latest
|
||||||
|
./bettertls export-tests --suite pathbuilding --out ./pathbuilding.tests.json
|
||||||
|
```
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue