Skip to content

Commit

Permalink
quic: more idiomatic operators
Browse files Browse the repository at this point in the history 
PR-URL: nodejs#216
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
@jasnell
jasnell committed Dec 5, 2019
1 parent 02e5389 commit 08bb8c9
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 30 deletions.
38 changes: 20 additions & 18 deletions src/node_quic_crypto.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ Local<Value> GetALPNProtocol(QuicSession* session) {
unsigned int alpnlen;
QuicCryptoContext* ctx = session->CryptoContext();

SSL_get0_alpn_selected(**ctx, &alpn_buf, &alpnlen);
SSL_get0_alpn_selected(ctx->ssl(), &alpn_buf, &alpnlen);
if (alpnlen == sizeof(NGTCP2_ALPN_H3) - 2 &&
memcmp(alpn_buf, NGTCP2_ALPN_H3 + 1, sizeof(NGTCP2_ALPN_H3) - 2) == 0) {
alpn = session->env()->quic_alpn_string();
Expand Down Expand Up @@ -649,10 +649,11 @@ void SetHostname(SSL* ssl, const std::string& hostname) {
void InitializeTLS(QuicSession* session) {
QuicCryptoContext* ctx = session->CryptoContext();

SSL_set_app_data(**ctx, session);
SSL_set_cert_cb(**ctx, CertCB, session);
SSL_set_verify(**ctx, SSL_VERIFY_NONE, crypto::VerifyCallback);
SSL_set_quic_early_data_enabled(**ctx, 1);
SSL* ssl = ctx->ssl();
SSL_set_app_data(ssl, session);
SSL_set_cert_cb(ssl, CertCB, session);
SSL_set_verify(ssl, SSL_VERIFY_NONE, crypto::VerifyCallback);
SSL_set_quic_early_data_enabled(ssl, 1);

// Enable tracing if the `--trace-tls` command line flag
// is used. TODO(@jasnell): Add process warning for this
Expand All @@ -661,28 +662,28 @@ void InitializeTLS(QuicSession* session) {

switch (ctx->Side()) {
case NGTCP2_CRYPTO_SIDE_CLIENT: {
SSL_set_connect_state(**ctx);
crypto::SetALPN(**ctx, session->GetALPN());
SetHostname(**ctx, session->GetHostname());
SSL_set_connect_state(ssl);
crypto::SetALPN(ssl, session->GetALPN());
SetHostname(ssl, session->GetHostname());
if (ctx->IsOptionSet(QUICCLIENTSESSION_OPTION_REQUEST_OCSP))
SSL_set_tlsext_status_type(**ctx, TLSEXT_STATUSTYPE_ocsp);
SSL_set_tlsext_status_type(ssl, TLSEXT_STATUSTYPE_ocsp);
break;
}
case NGTCP2_CRYPTO_SIDE_SERVER: {
SSL_set_accept_state(**ctx);
SSL_set_accept_state(ssl);
if (ctx->IsOptionSet(QUICSERVERSESSION_OPTION_REQUEST_CERT)) {
int verify_mode = SSL_VERIFY_PEER;
if (ctx->IsOptionSet(QUICSERVERSESSION_OPTION_REJECT_UNAUTHORIZED))
verify_mode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
SSL_set_verify(**ctx, verify_mode, crypto::VerifyCallback);
SSL_set_verify(ssl, verify_mode, crypto::VerifyCallback);
}
break;
}
default:
UNREACHABLE();
}

SetTransportParams(session->Connection(), **ctx);
SetTransportParams(session->Connection(), ssl);
}

void InitializeSecureContext(
Expand Down Expand Up @@ -734,10 +735,11 @@ bool SetCryptoSecrets(
SessionKey tx_hp;

QuicCryptoContext* ctx = session->CryptoContext();
SSL* ssl = ctx->ssl();

if (NGTCP2_ERR(ngtcp2_crypto_derive_and_install_key(
session->Connection(),
**ctx,
ssl,
rx_key.data(),
rx_iv.data(),
rx_hp.data(),
Expand All @@ -755,31 +757,31 @@ bool SetCryptoSecrets(
switch (level) {
case NGTCP2_CRYPTO_LEVEL_EARLY:
crypto::LogSecret(
**ctx,
ssl,
QUIC_CLIENT_EARLY_TRAFFIC_SECRET,
rx_secret,
secretlen);
break;
case NGTCP2_CRYPTO_LEVEL_HANDSHAKE:
crypto::LogSecret(
**ctx,
ssl,
QUIC_CLIENT_HANDSHAKE_TRAFFIC_SECRET,
rx_secret,
secretlen);
crypto::LogSecret(
**ctx,
ssl,
QUIC_SERVER_HANDSHAKE_TRAFFIC_SECRET,
tx_secret,
secretlen);
break;
case NGTCP2_CRYPTO_LEVEL_APP:
crypto::LogSecret(
**ctx,
ssl,
QUIC_CLIENT_TRAFFIC_SECRET_0,
rx_secret,
secretlen);
crypto::LogSecret(
**ctx,
ssl,
QUIC_SERVER_TRAFFIC_SECRET_0,
tx_secret,
secretlen);
Expand Down
4 changes: 2 additions & 2 deletions src/node_quic_session.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2741,7 +2741,7 @@ void QuicSession::InitServer(
&path,
version,
&callbacks[crypto_context_->Side()],
**config,
config->data(),
&alloc_info_,
static_cast<QuicSession*>(this)), 0);

Expand Down Expand Up @@ -2876,7 +2876,7 @@ bool QuicSession::InitClient(
&path,
NGTCP2_PROTO_VER,
&callbacks[crypto_context_->Side()],
*config,
config.data(),
&alloc_info_,
static_cast<QuicSession*>(this)), 0);

Expand Down
8 changes: 5 additions & 3 deletions src/node_quic_session.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ class QuicSessionConfig {

void SetQlog(const ngtcp2_qlog_settings& qlog);

const ngtcp2_settings* operator*() const { return &settings_; }
const ngtcp2_settings& operator*() const { return settings_; }
const ngtcp2_settings* operator->() const { return &settings_; }

const ngtcp2_settings* data() { return &settings_; }

private:
uint64_t max_crypto_buffer_ = DEFAULT_MAX_CRYPTO_BUFFER;
Expand Down Expand Up @@ -309,8 +312,6 @@ class RandomConnectionIDStrategy : public ConnectionIDStrategy {
// handshake details on behalf of a QuicSession.
class QuicCryptoContext : public MemoryRetainer {
public:
SSL* operator*() { return ssl_.get(); }

uint64_t Cancel();

// Outgoing crypto data must be retained in memory until it is
Expand Down Expand Up @@ -380,6 +381,7 @@ class QuicCryptoContext : public MemoryRetainer {
ngtcp2_crypto_side Side() const { return side_; }

SSL* ssl() { return ssl_.get(); }
SSL* operator->() { return ssl_.get(); }

void WriteHandshake(
ngtcp2_crypto_level level,
Expand Down
12 changes: 6 additions & 6 deletions src/node_quic_socket.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ void QuicSocket::SendInitialConnectionClose(
ngtcp2_conn* conn;
ngtcp2_conn_server_new(
&conn,
*dcid,
dcid.cid(),
&scid,
&path,
version,
Expand Down Expand Up @@ -555,7 +555,7 @@ bool QuicSocket::SendRetry(
token.data(),
&tokenlen,
addr,
*dcid,
dcid.cid(),
token_secret_)) {
return false;
}
Expand All @@ -568,7 +568,7 @@ bool QuicSocket::SendRetry(
hd.token = nullptr;
hd.tokenlen = 0;
hd.len = 0;
hd.dcid = **scid;
hd.dcid = *scid.cid();
hd.scid.datalen = NGTCP2_SV_SCIDLEN;

EntropySource(hd.scid.data, NGTCP2_SV_SCIDLEN);
Expand All @@ -579,7 +579,7 @@ bool QuicSocket::SendRetry(
reinterpret_cast<uint8_t*>(buf.data),
NGTCP2_MAX_PKTLEN_IPV4,
&hd,
*dcid,
dcid.cid(),
token.data(),
tokenlen);
if (nwrite <= 0)
Expand Down Expand Up @@ -703,9 +703,9 @@ BaseObjectPtr<QuicSession> QuicSocket::AcceptInitialPacket(
QuicSession::CreateServer(
this,
&server_session_config_,
*dcid,
dcid.cid(),
addr,
*scid,
scid.cid(),
ocid_ptr,
version,
server_alpn_,
Expand Down
4 changes: 3 additions & 1 deletion src/node_quic_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ class QuicCID {

inline std::string ToHex() const;

const ngtcp2_cid* operator*() const { return &cid_; }
const ngtcp2_cid& operator*() const { return cid_; }
const ngtcp2_cid* operator->() const { return &cid_; }
const ngtcp2_cid* cid() const { return &cid_; }

const uint8_t* data() const { return cid_.data; }
size_t length() const { return cid_.datalen; }
Expand Down

0 comments on commit 08bb8c9

Please sign in to comment.