@@ -349,48 +349,12 @@ fn tls_ocsf_ctx() -> SandboxContext {
349349#[ cfg( test) ]
350350mod tests {
351351 use super :: * ;
352+ use crate :: tls_test_utils:: {
353+ generate_test_certs_with_ca, install_rustls_provider, write_test_file,
354+ } ;
352355 use rcgen:: { CertificateParams , IsCa , KeyPair , KeyUsagePurpose } ;
353- use std:: io:: Write ;
354356 use tokio:: net:: { TcpListener , TcpStream } ;
355357
356- fn install_rustls_provider ( ) {
357- let _ = rustls:: crypto:: ring:: default_provider ( ) . install_default ( ) ;
358- }
359-
360- /// Generate test CA + server certs in `dir`, returning the CA cert and
361- /// keypair so callers can sign additional server or client certificates.
362- fn generate_test_certs_with_ca ( dir : & Path ) -> ( rcgen:: Certificate , KeyPair ) {
363- let mut ca_params =
364- CertificateParams :: new ( Vec :: < String > :: new ( ) ) . expect ( "failed to create CA params" ) ;
365- ca_params. is_ca = IsCa :: Ca ( rcgen:: BasicConstraints :: Unconstrained ) ;
366- ca_params
367- . distinguished_name
368- . push ( rcgen:: DnType :: CommonName , "test-ca" ) ;
369- let ca_key = KeyPair :: generate ( ) . expect ( "failed to generate CA key" ) ;
370- let ca_cert = ca_params
371- . self_signed ( & ca_key)
372- . expect ( "failed to sign CA cert" ) ;
373-
374- let server_params = CertificateParams :: new ( vec ! [ "localhost" . to_string( ) ] )
375- . expect ( "failed to create server params" ) ;
376- let server_key = KeyPair :: generate ( ) . expect ( "failed to generate server key" ) ;
377- let server_cert = server_params
378- . signed_by ( & server_key, & ca_cert, & ca_key)
379- . expect ( "failed to sign server cert" ) ;
380-
381- let write_file = |name : & str , data : & [ u8 ] | {
382- let path = dir. join ( name) ;
383- File :: create ( & path)
384- . and_then ( |mut file| file. write_all ( data) )
385- . expect ( "failed to write test file" ) ;
386- } ;
387- write_file ( "ca.pem" , ca_cert. pem ( ) . as_bytes ( ) ) ;
388- write_file ( "server-cert.pem" , server_cert. pem ( ) . as_bytes ( ) ) ;
389- write_file ( "server-key.pem" , server_key. serialize_pem ( ) . as_bytes ( ) ) ;
390-
391- ( ca_cert, ca_key)
392- }
393-
394358 /// Generate a new server cert + key in `dir`, signed by the given CA.
395359 /// Overwrites `server-cert.pem` and `server-key.pem`.
396360 fn generate_server_cert ( ca_cert : & rcgen:: Certificate , ca_key : & KeyPair , dir : & Path ) {
@@ -401,14 +365,8 @@ mod tests {
401365 . signed_by ( & server_key, ca_cert, ca_key)
402366 . expect ( "failed to sign server cert" ) ;
403367
404- let write_file = |name : & str , data : & [ u8 ] | {
405- let path = dir. join ( name) ;
406- File :: create ( & path)
407- . and_then ( |mut file| file. write_all ( data) )
408- . expect ( "failed to write test file" ) ;
409- } ;
410- write_file ( "server-cert.pem" , server_cert. pem ( ) . as_bytes ( ) ) ;
411- write_file ( "server-key.pem" , server_key. serialize_pem ( ) . as_bytes ( ) ) ;
368+ write_test_file ( dir, "server-cert.pem" , server_cert. pem ( ) . as_bytes ( ) ) ;
369+ write_test_file ( dir, "server-key.pem" , server_key. serialize_pem ( ) . as_bytes ( ) ) ;
412370 }
413371
414372 fn build_test_client_config ( ca_path : & Path ) -> Arc < rustls:: ClientConfig > {
@@ -482,7 +440,10 @@ mod tests {
482440 std:: fs:: write ( dir. path ( ) . join ( "server-cert.pem" ) , b"garbage" )
483441 . expect ( "failed to write garbage" ) ;
484442
485- assert ! ( acceptor. reload( ) . is_err( ) , "reload with garbage cert should fail" ) ;
443+ assert ! (
444+ acceptor. reload( ) . is_err( ) ,
445+ "reload with garbage cert should fail"
446+ ) ;
486447
487448 // Old config must still be accessible after a failed reload.
488449 drop ( acceptor_before) ;
@@ -559,7 +520,9 @@ mod tests {
559520 let reload_handle = tokio:: spawn ( async move {
560521 for _ in 0 ..20 {
561522 generate_server_cert ( & ca_cert, & ca_key, dir. path ( ) ) ;
562- acceptor. reload ( ) . expect ( "reload with valid cert should succeed" ) ;
523+ acceptor
524+ . reload ( )
525+ . expect ( "reload with valid cert should succeed" ) ;
563526 tokio:: time:: sleep ( Duration :: from_millis ( 5 ) ) . await ;
564527 }
565528 } ) ;
@@ -618,9 +581,7 @@ mod tests {
618581 . await
619582 . expect ( "TLS accept failed" ) ;
620583 } ) ;
621- let tcp_1 = TcpStream :: connect ( addr1)
622- . await
623- . expect ( "connect failed" ) ;
584+ let tcp_1 = TcpStream :: connect ( addr1) . await . expect ( "connect failed" ) ;
624585 let tls_1 = connector
625586 . connect ( server_name. clone ( ) , tcp_1)
626587 . await
@@ -646,9 +607,7 @@ mod tests {
646607 . await
647608 . expect ( "TLS accept failed" ) ;
648609 } ) ;
649- let tcp_2 = TcpStream :: connect ( addr2)
650- . await
651- . expect ( "connect failed" ) ;
610+ let tcp_2 = TcpStream :: connect ( addr2) . await . expect ( "connect failed" ) ;
652611 let tls_2 = connector
653612 . connect ( server_name. clone ( ) , tcp_2)
654613 . await
@@ -793,36 +752,19 @@ mod tests {
793752 let new_ca_cert = new_ca_params
794753 . self_signed ( & new_ca_key)
795754 . expect ( "failed to sign new CA cert" ) ;
796- std:: fs:: write (
797- dir. path ( ) . join ( "ca.pem" ) ,
798- new_ca_cert. pem ( ) . as_bytes ( ) ,
799- )
800- . expect ( "failed to write new CA" ) ;
801-
802- // Generate new server cert signed by new CA
803- let server_params = CertificateParams :: new ( vec ! [ "localhost" . to_string( ) ] )
804- . expect ( "failed to create server params" ) ;
805- let server_key = KeyPair :: generate ( ) . expect ( "failed to generate server key" ) ;
806- let server_cert = server_params
807- . signed_by ( & server_key, & new_ca_cert, & new_ca_key)
808- . expect ( "failed to sign server cert" ) ;
809- std:: fs:: write (
810- dir. path ( ) . join ( "server-cert.pem" ) ,
811- server_cert. pem ( ) . as_bytes ( ) ,
812- )
813- . expect ( "failed to write server cert" ) ;
814- std:: fs:: write (
815- dir. path ( ) . join ( "server-key.pem" ) ,
816- server_key. serialize_pem ( ) . as_bytes ( ) ,
817- )
818- . expect ( "failed to write server key" ) ;
755+ std:: fs:: write ( dir. path ( ) . join ( "ca.pem" ) , new_ca_cert. pem ( ) . as_bytes ( ) )
756+ . expect ( "failed to write new CA" ) ;
819757
820- acceptor. reload ( ) . expect ( "reload with new CA should succeed" ) ;
758+ // Generate new server cert signed by new CA and reload
759+ generate_server_cert ( & new_ca_cert, & new_ca_key, dir. path ( ) ) ;
760+ acceptor
761+ . reload ( )
762+ . expect ( "reload with new CA should succeed" ) ;
821763
822764 // Generate client cert signed by new CA, write to files
823765 let client_key = KeyPair :: generate ( ) . expect ( "failed to generate client key" ) ;
824- let mut client_params = CertificateParams :: new ( Vec :: < String > :: new ( ) )
825- . expect ( "failed to create client params" ) ;
766+ let mut client_params =
767+ CertificateParams :: new ( Vec :: < String > :: new ( ) ) . expect ( "failed to create client params" ) ;
826768 client_params
827769 . distinguished_name
828770 . push ( rcgen:: DnType :: CommonName , "test-client" ) ;
0 commit comments