Skip to content
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

Jump to bottom

Always use ed25519_dalek for the QUIC-TLS cert verification #3

Closed
wants to merge 1 commit into from
Closed

Always use ed25519_dalek for the QUIC-TLS cert verification #3

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
1 change: 1 addition & 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.

31 changes: 12 additions & 19 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 @@ -28,7 +28,8 @@ use {
transport::Result as TransportResult,
},
solana_streamer::{
nonblocking::quic::ALPN_TPU_PROTOCOL_ID, tls_certificates::new_dummy_x509_certificate,
nonblocking::quic::ALPN_TPU_PROTOCOL_ID, quic::TLS_SIGVERIFY_SCHEMES,
tls_certificates::new_dummy_x509_certificate,
},
std::{
net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
Expand All @@ -40,27 +41,24 @@ use {
};

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

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

impl rustls::client::danger::ServerCertVerifier for SkipServerVerification {
fn verify_tls12_signature(
&self,
message: &[u8],
cert: &rustls::pki_types::CertificateDer<'_>,
dss: &rustls::DigitallySignedStruct,
_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,
)
Err(rustls::Error::PeerIncompatible(
rustls::PeerIncompatible::Tls13RequiredForQuic,
))
}

fn verify_tls13_signature(
Expand All @@ -69,16 +67,11 @@ impl rustls::client::danger::ServerCertVerifier for SkipServerVerification {
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,
)
rustls::crypto::verify_tls13_signature(message, cert, dss, &TLS_SIGVERIFY_SCHEMES)
}

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

fn verify_server_cert(
Expand Down
1 change: 1 addition & 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 }
dashmap = { workspace = true }
futures = { workspace = true }
futures-util = { workspace = true }
Expand Down
32 changes: 13 additions & 19 deletions streamer/src/nonblocking/testing_utilities.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ use {
DEFAULT_MAX_CONNECTIONS_PER_IPADDR_PER_MINUTE, DEFAULT_MAX_STREAMS_PER_MS,
},
crate::{
quic::{StreamerStats, MAX_STAKED_CONNECTIONS, MAX_UNSTAKED_CONNECTIONS},
quic::{
StreamerStats, MAX_STAKED_CONNECTIONS, MAX_UNSTAKED_CONNECTIONS, TLS_SIGVERIFY_SCHEMES,
},
streamer::StakedNodes,
tls_certificates::new_dummy_x509_certificate,
},
Expand All @@ -29,27 +31,24 @@ use {
};

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

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

impl rustls::client::danger::ServerCertVerifier for SkipServerVerification {
fn verify_tls12_signature(
&self,
message: &[u8],
cert: &rustls::pki_types::CertificateDer<'_>,
dss: &rustls::DigitallySignedStruct,
_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,
)
Err(rustls::Error::PeerIncompatible(
rustls::PeerIncompatible::Tls13RequiredForQuic,
))
}

fn verify_tls13_signature(
Expand All @@ -58,16 +57,11 @@ impl rustls::client::danger::ServerCertVerifier for SkipServerVerification {
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,
)
rustls::crypto::verify_tls13_signature(message, cert, dss, &TLS_SIGVERIFY_SCHEMES)
}

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

fn verify_server_cert(
Expand Down
73 changes: 53 additions & 20 deletions streamer/src/quic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@ use {
nonblocking::quic::ALPN_TPU_PROTOCOL_ID, streamer::StakedNodes,
tls_certificates::new_dummy_x509_certificate,
},
ed25519_dalek::Verifier,
crossbeam_channel::Sender,
pem::Pem,
quinn::{
crypto::rustls::{NoInitialCipherSuite, QuicServerConfig},
Endpoint, IdleTimeout, ServerConfig,
},
rustls::{
pki_types::{CertificateDer, UnixTime},
crypto::WebPkiSupportedAlgorithms,
pki_types::{
AlgorithmIdentifier, CertificateDer, InvalidSignature, SignatureVerificationAlgorithm,
UnixTime,
},
server::danger::ClientCertVerified,
DistinguishedName, KeyLogFile,
DistinguishedName, KeyLogFile, SignatureScheme,
},
solana_perf::packet::PacketBatch,
solana_sdk::{
Expand All @@ -38,12 +43,48 @@ pub const MAX_UNSTAKED_CONNECTIONS: usize = 500;
// This will be adjusted and parameterized in follow-on PRs.
pub const DEFAULT_QUIC_ENDPOINTS: usize = 1;

// Boilerplate required to use ed25519_dalek for signature verification.
#[derive(Debug)]
struct DalekEd25519;
static DALEK_ED25519: &dyn SignatureVerificationAlgorithm = &DalekEd25519;
const ED25519_ALG_ID: AlgorithmIdentifier =
AlgorithmIdentifier::from_slice(&[0x06, 0x03, 0x2b, 0x65, 0x70]);
impl SignatureVerificationAlgorithm for DalekEd25519 {
fn public_key_alg_id(&self) -> AlgorithmIdentifier {
ED25519_ALG_ID
}

fn signature_alg_id(&self) -> AlgorithmIdentifier {
ED25519_ALG_ID
}

fn verify_signature(
&self,
public_key: &[u8],
message: &[u8],
signature: &[u8],
) -> Result<(), InvalidSignature> {
let publickey =
ed25519_dalek::PublicKey::from_bytes(public_key).map_err(|_| InvalidSignature)?;
let signature =
ed25519_dalek::Signature::try_from(signature).map_err(|_| InvalidSignature)?;
publickey
.verify(message, &signature)
.map_err(|_| InvalidSignature)
}
}

pub static TLS_SIGVERIFY_SCHEMES: WebPkiSupportedAlgorithms = WebPkiSupportedAlgorithms {
all: &[DALEK_ED25519],
mapping: &[(SignatureScheme::ED25519, &[DALEK_ED25519])],
};

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

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

Expand All @@ -69,16 +110,13 @@ impl rustls::server::danger::ClientCertVerifier for SkipClientVerification {

fn verify_tls12_signature(
&self,
message: &[u8],
cert: &rustls::pki_types::CertificateDer<'_>,
dss: &rustls::DigitallySignedStruct,
_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,
)
Err(rustls::Error::PeerIncompatible(
rustls::PeerIncompatible::Tls13RequiredForQuic,
))
}

fn verify_tls13_signature(
Expand All @@ -87,16 +125,11 @@ impl rustls::server::danger::ClientCertVerifier for SkipClientVerification {
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,
)
rustls::crypto::verify_tls13_signature(message, cert, dss, &TLS_SIGVERIFY_SCHEMES)
}

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

fn offer_client_auth(&self) -> bool {
Expand Down