Skip to content

Restrict QUIC crypto algorithms, switch to Dalek for {X,Ed}25519 #2935

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

Closed
ripatel-fd wants to merge 1 commit into from
Closed

Restrict QUIC crypto algorithms, switch to Dalek for {X,Ed}25519 #2935

Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ vec_extract_if_polyfill = "0.1.0"
wasm-bindgen = "0.2"
winapi = "0.3.8"
winreg = "0.50"
x25519-dalek = "2.0.1"
x509-parser = "0.14.0"
# See "zeroize versioning issues" below if you are updating this version.
zeroize = { version = "1.7", default-features = false }
Expand Down
18 changes: 4 additions & 14 deletions core/src/repair/quic_endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ use {
},
rustls::{
pki_types::{CertificateDer, PrivateKeyDer},
CertificateError, KeyLogFile,
CertificateError,
},
serde_bytes::ByteBuf,
solana_quic_client::nonblocking::quic_client::SkipServerVerification,
solana_runtime::bank_forks::BankForks,
solana_sdk::{packet::PACKET_DATA_SIZE, pubkey::Pubkey, signature::Keypair},
solana_streamer::{quic::SkipClientVerification, tls_certificates::new_dummy_x509_certificate},
solana_streamer::tls_certificates::new_dummy_x509_certificate,
std::{
cmp::Reverse,
collections::{hash_map::Entry, HashMap},
Expand Down Expand Up @@ -178,11 +177,7 @@ fn new_server_config(
cert: CertificateDer<'static>,
key: PrivateKeyDer<'static>,
) -> Result<ServerConfig, rustls::Error> {
let mut config = rustls::ServerConfig::builder()
.with_client_cert_verifier(SkipClientVerification::new())
.with_single_cert(vec![cert], key)?;
config.alpn_protocols = vec![ALPN_REPAIR_PROTOCOL_ID.to_vec()];
config.key_log = Arc::new(KeyLogFile::new());
let config = solana_streamer::tls::new_server_config(cert, key, ALPN_REPAIR_PROTOCOL_ID)?;
let quic_server_config = QuicServerConfig::try_from(config)
.map_err(|_err| rustls::Error::InvalidCertificate(CertificateError::BadSignature))?;

Expand All @@ -197,12 +192,7 @@ fn new_client_config(
cert: CertificateDer<'static>,
key: PrivateKeyDer<'static>,
) -> Result<ClientConfig, rustls::Error> {
let mut config = rustls::ClientConfig::builder()
.dangerous()
.with_custom_certificate_verifier(SkipServerVerification::new())
.with_client_auth_cert(vec![cert], key)?;
config.enable_early_data = true;
config.alpn_protocols = vec![ALPN_REPAIR_PROTOCOL_ID.to_vec()];
let config = solana_streamer::tls::new_client_config(cert, key, ALPN_REPAIR_PROTOCOL_ID)?;
let mut config = ClientConfig::new(Arc::new(QuicClientConfig::try_from(config).unwrap()));
config.transport_config(Arc::new(new_transport_config()));
Ok(config)
Expand Down
14 changes: 14 additions & 0 deletions programs/sbf/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 6 additions & 64 deletions quic-client/src/nonblocking/quic_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,60 +39,6 @@ use {
tokio::{sync::OnceCell, time::timeout},
};

#[derive(Debug)]
pub struct SkipServerVerification(Arc<rustls::crypto::CryptoProvider>);

impl SkipServerVerification {
pub fn new() -> Arc<Self> {
Arc::new(Self(Arc::new(rustls::crypto::ring::default_provider())))
}
}

impl rustls::client::danger::ServerCertVerifier for SkipServerVerification {
fn verify_tls12_signature(
&self,
message: &[u8],
cert: &rustls::pki_types::CertificateDer<'_>,
dss: &rustls::DigitallySignedStruct,
) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
rustls::crypto::verify_tls12_signature(
message,
cert,
dss,
&self.0.signature_verification_algorithms,
)
}

fn verify_tls13_signature(
&self,
message: &[u8],
cert: &rustls::pki_types::CertificateDer<'_>,
dss: &rustls::DigitallySignedStruct,
) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
rustls::crypto::verify_tls13_signature(
message,
cert,
dss,
&self.0.signature_verification_algorithms,
)
}

fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
self.0.signature_verification_algorithms.supported_schemes()
}

fn verify_server_cert(
&self,
_end_entity: &rustls::pki_types::CertificateDer<'_>,
_intermediates: &[rustls::pki_types::CertificateDer<'_>],
_server_name: &rustls::pki_types::ServerName<'_>,
_ocsp_response: &[u8],
_now: rustls::pki_types::UnixTime,
) -> Result<rustls::client::danger::ServerCertVerified, rustls::Error> {
Ok(rustls::client::danger::ServerCertVerified::assertion())
}
}

pub struct QuicClientCertificate {
pub certificate: rustls::pki_types::CertificateDer<'static>,
pub key: rustls::pki_types::PrivateKeyDer<'static>,
Expand Down Expand Up @@ -149,16 +95,12 @@ impl QuicLazyInitializedEndpoint {
QuicNewConnection::create_endpoint(EndpointConfig::default(), client_socket)
};

let mut crypto = rustls::ClientConfig::builder()
.dangerous()
.with_custom_certificate_verifier(SkipServerVerification::new())
.with_client_auth_cert(
vec![self.client_certificate.certificate.clone()],
self.client_certificate.key.clone_key(),
)
.expect("Failed to set QUIC client certificates");
crypto.enable_early_data = true;
crypto.alpn_protocols = vec![ALPN_TPU_PROTOCOL_ID.to_vec()];
let crypto = solana_streamer::tls::new_client_config(
self.client_certificate.certificate.clone(),
self.client_certificate.key.clone_key(),
ALPN_TPU_PROTOCOL_ID,
)
.expect("Failed to create TLS client config");

let mut config = ClientConfig::new(Arc::new(QuicClientConfig::try_from(crypto).unwrap()));
let mut transport_config = TransportConfig::default();
Expand Down
2 changes: 2 additions & 0 deletions streamer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ edition = { workspace = true }
async-channel = { workspace = true }
bytes = { workspace = true }
crossbeam-channel = { workspace = true }
ed25519-dalek = { workspace = true }
Copy link

@lijunwangs lijunwangs Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to put after dashmap to make dependency sorted.

dashmap = { workspace = true }
futures = { workspace = true }
futures-util = { workspace = true }
Expand All @@ -38,6 +39,7 @@ solana-sdk = { workspace = true }
solana-transaction-metrics-tracker = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["full"] }
x25519-dalek = { workspace = true }
x509-parser = { workspace = true }

[dev-dependencies]
Expand Down
1 change: 1 addition & 0 deletions streamer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub mod recvmmsg;
pub mod sendmmsg;
pub mod socket;
pub mod streamer;
pub mod tls;
pub mod tls_certificates;

#[macro_use]
Expand Down
65 changes: 2 additions & 63 deletions streamer/src/nonblocking/testing_utilities.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,72 +28,11 @@ use {
tokio::task::JoinHandle,
};

#[derive(Debug)]
pub struct SkipServerVerification(Arc<rustls::crypto::CryptoProvider>);

impl SkipServerVerification {
pub fn new() -> Arc<Self> {
Arc::new(Self(Arc::new(rustls::crypto::ring::default_provider())))
}
}

impl rustls::client::danger::ServerCertVerifier for SkipServerVerification {
fn verify_tls12_signature(
&self,
message: &[u8],
cert: &rustls::pki_types::CertificateDer<'_>,
dss: &rustls::DigitallySignedStruct,
) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
rustls::crypto::verify_tls12_signature(
message,
cert,
dss,
&self.0.signature_verification_algorithms,
)
}

fn verify_tls13_signature(
&self,
message: &[u8],
cert: &rustls::pki_types::CertificateDer<'_>,
dss: &rustls::DigitallySignedStruct,
) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
rustls::crypto::verify_tls13_signature(
message,
cert,
dss,
&self.0.signature_verification_algorithms,
)
}

fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
self.0.signature_verification_algorithms.supported_schemes()
}

fn verify_server_cert(
&self,
_end_entity: &rustls::pki_types::CertificateDer<'_>,
_intermediates: &[rustls::pki_types::CertificateDer<'_>],
_server_name: &rustls::pki_types::ServerName<'_>,
_ocsp_response: &[u8],
_now: rustls::pki_types::UnixTime,
) -> Result<rustls::client::danger::ServerCertVerified, rustls::Error> {
Ok(rustls::client::danger::ServerCertVerified::assertion())
}
}

pub fn get_client_config(keypair: &Keypair) -> ClientConfig {
let (cert, key) = new_dummy_x509_certificate(keypair);

let mut crypto = rustls::ClientConfig::builder()
.dangerous()
.with_custom_certificate_verifier(SkipServerVerification::new())
.with_client_auth_cert(vec![cert], key)
.expect("Failed to use client certificate");

crypto.enable_early_data = true;
crypto.alpn_protocols = vec![ALPN_TPU_PROTOCOL_ID.to_vec()];

let crypto = crate::tls::new_client_config(cert, key, ALPN_TPU_PROTOCOL_ID)
.expect("Failed to create TLS client config");
let mut config = ClientConfig::new(Arc::new(QuicClientConfig::try_from(crypto).unwrap()));

let mut transport_config = TransportConfig::default();
Expand Down
Loading