Add initial new_with_extra_roots testing

Author: cstkingkey

rustls-platform-verifier/src/tests/verification_mock/ca.go

@@ -69,7 +69,7 @@ func doIt() error {
 
 	var err error = nil
 
-	root1_key, err := generateRoot("root1", now)
+	root1_key, err := generateRoot("root1", now, "", true)
 	if err != nil {
 		return err
 	}
@@ -96,6 +96,16 @@ func doIt() error {
 		}
 	}
 
+	_, err = generateRoot("root2", now, "example.com", true)
+	if err != nil {
+		return err
+	}
+
+	_, err = generateRoot("root3", now, "example.com", false)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -210,23 +220,32 @@ func generateInt(intName string, serial int64, now time.Time, caKey crypto.Signe
 	return intKey, nil
 }
 
-func generateRoot(name string, now time.Time) (crypto.Signer, error) {
+func generateRoot(name string, now time.Time, commonName string, IsCA bool) (crypto.Signer, error) {
 	caKey, err := generateKey()
 	if err != nil {
 		return nil, err
 	}
+
 	template := x509.Certificate{
 		SerialNumber: big.NewInt(1),
 		Subject: pkix.Name{
 			Organization: []string{name},
 		},
 		NotBefore:             now.Add(-OneDay),
 		NotAfter:              now.Add(OneYear),
-		IsCA:                  true,
+		IsCA:                  IsCA,
 		KeyUsage:              x509.KeyUsageCertSign,
 		BasicConstraintsValid: true,
 	}
 
+	if len(commonName) != 0 {
+		template.Subject.CommonName = commonName
+		template.KeyUsage = 0
+		// See `generateEndEntity` for list of macOS requirements.
+		template.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}
+		template.DNSNames = []string{commonName}
+	}
+
 	cert, err := x509.CreateCertificate(rand.Reader, &template, &template, caKey.Public(), caKey)
 	if err != nil {
 		return nil, err

rustls-platform-verifier/src/tests/verification_mock/mod.rs

@@ -28,7 +28,7 @@ use std::net::{Ipv4Addr, Ipv6Addr};
 use std::sync::Arc;
 
 use rustls::client::danger::ServerCertVerifier;
-use rustls::pki_types;
+use rustls::pki_types::{self, CertificateDer};
 #[cfg(not(any(target_vendor = "apple", windows)))]
 use rustls::pki_types::{DnsName, ServerName};
 use rustls::{CertificateError, Error as TlsError, OtherError};
@@ -80,13 +80,21 @@ macro_rules! no_error {
     };
 }
 
-const ROOT1: pki_types::CertificateDer<'static> =
-    pki_types::CertificateDer::from_slice(include_bytes!("root1.crt"));
+const ROOT1: CertificateDer = CertificateDer::from_slice(include_bytes!("root1.crt"));
 const ROOT1_INT1: &[u8] = include_bytes!("root1-int1.crt");
 const ROOT1_INT1_EXAMPLE_COM_GOOD: &[u8] = include_bytes!("root1-int1-ee_example.com-good.crt");
 const ROOT1_INT1_LOCALHOST_IPV4_GOOD: &[u8] = include_bytes!("root1-int1-ee_127.0.0.1-good.crt");
 const ROOT1_INT1_LOCALHOST_IPV6_GOOD: &[u8] = include_bytes!("root1-int1-ee_1-good.crt");
 
+// `ffi-testing` is currently only used for Android, which doesn't support extra roots yet.
+#[cfg_attr(feature = "ffi-testing", allow(unused))]
+#[cfg(not(target_os = "android"))]
+const ROOT2: CertificateDer = CertificateDer::from_slice(include_bytes!("root2.crt"));
+
+#[cfg_attr(feature = "ffi-testing", allow(unused))]
+#[cfg(not(target_os = "android"))]
+const ROOT3: CertificateDer = CertificateDer::from_slice(include_bytes!("root3.crt"));
+
 const EXAMPLE_COM: &str = "example.com";
 const LOCALHOST_IPV4: &str = "127.0.0.1";
 const LOCALHOST_IPV6: &str = "::1";
@@ -111,8 +119,8 @@ pub(super) fn verification_without_mock_root() {
     let verifier = Verifier::new(crypto_provider).unwrap();
 
     let server_name = pki_types::ServerName::try_from(EXAMPLE_COM).unwrap();
-    let end_entity = pki_types::CertificateDer::from(ROOT1_INT1_EXAMPLE_COM_GOOD);
-    let intermediates = [pki_types::CertificateDer::from(ROOT1_INT1)];
+    let end_entity = CertificateDer::from(ROOT1_INT1_EXAMPLE_COM_GOOD);
+    let intermediates = [CertificateDer::from(ROOT1_INT1)];
 
     // Fails because the server cert has no trust root in Windows, and can't since it uses a self-signed CA.
     // Similarly on UNIX platforms using the Webpki verifier, it can't fetch extra certificates through
@@ -139,6 +147,74 @@ fn test_verification_without_mock_root() {
     verification_without_mock_root()
 }
 
+#[cfg(not(target_os = "android"))]
+#[test]
+fn test_selfsigned_cert_with_extra_roots() {
+    let crypto_provider = test_provider();
+
+    let selfsigned = ROOT2;
+    let selfsigned_as_leaf = ROOT3;
+    let roots = vec![selfsigned.clone(), selfsigned_as_leaf.clone()];
+    let server_name = pki_types::ServerName::try_from(EXAMPLE_COM).unwrap();
+
+    let verifier = Verifier::new_with_extra_roots(roots, crypto_provider).unwrap();
+
+    let result =
+        verifier.verify_server_cert(&selfsigned, &[], &server_name, &[], verification_time());
+
+    #[cfg(target_vendor = "apple")]
+    assert!(result.is_ok(), "failed to validate self-signed certificate");
+
+    #[cfg(not(target_vendor = "apple"))]
+    assert!(
+        result.is_err(),
+        "self-signed certificate is accepted unexpectly"
+    );
+
+    let result = verifier.verify_server_cert(
+        &selfsigned_as_leaf,
+        &[],
+        &server_name,
+        &[],
+        verification_time(),
+    );
+
+    #[cfg(not(target_os = "windows"))]
+    assert!(
+        result.is_ok(),
+        "failed to validate self-signed leaf certificate"
+    );
+
+    #[cfg(target_os = "windows")]
+    assert!(
+        result.is_err(),
+        "self-signed leaf certificate is accepted unexpectly"
+    );
+}
+
+#[cfg(not(target_os = "android"))]
+#[test]
+fn test_chain_signed_with_extra_roots() {
+    let crypto_provider = test_provider();
+
+    let server_name = pki_types::ServerName::try_from(EXAMPLE_COM).unwrap();
+    let end_entity = CertificateDer::from(ROOT1_INT1_EXAMPLE_COM_GOOD);
+    let intermediates = [CertificateDer::from(ROOT1_INT1)];
+    let roots = vec![ROOT1];
+
+    let verifier = Verifier::new_with_extra_roots(roots, crypto_provider).unwrap();
+
+    verifier
+        .verify_server_cert(
+            &end_entity,
+            &intermediates,
+            &server_name,
+            &[],
+            verification_time(),
+        )
+        .expect("failed to validate extra root-only certificate chain");
+}
+
 // Note: Android does not currently support IP address hosts, so these tests are disabled for
 // Android.
 // Verifies that our test trust anchor(s) are not trusted when `Verifier::new()`
@@ -349,10 +425,10 @@ fn test_with_mock_root<E: std::error::Error + PartialEq + 'static>(
     let mut chain = test_case
         .chain
         .iter()
-        .map(|bytes| pki_types::CertificateDer::from(*bytes));
+        .map(|bytes| CertificateDer::from(*bytes));
 
     let end_entity = chain.next().unwrap();
-    let intermediates: Vec<pki_types::CertificateDer<'_>> = chain.collect();
+    let intermediates: Vec<CertificateDer<'_>> = chain.collect();
 
     let server_name = pki_types::ServerName::try_from(test_case.reference_id).unwrap();