Skip to content

Implement TLSBasicSupport for QUICNetVC #7959

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

Merged
maskit merged 2 commits into from
Jun 28, 2021
Merged

Implement TLSBasicSupport for QUICNetVC #7959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f969a71
Implement TLSBasicSupport for QUICNetVC
maskit Jun 21, 2021
922d8d0
Use static_cast
maskit Jun 22, 2021
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
7 changes: 7 additions & 0 deletions iocore/net/P_QUICNetVConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "P_UnixNet.h"
#include "P_UDPNet.h"
#include "P_ALPNSupport.h"
#include "TLSBasicSupport.h"
#include "TLSSessionResumptionSupport.h"
#include "tscore/ink_apidefs.h"
#include "tscore/List.h"
Expand Down Expand Up @@ -140,6 +141,7 @@ class QUICNetVConnection : public UnixNetVConnection,
public QUICConnection,
public RefCountObj,
public ALPNSupport,
public TLSBasicSupport,
public TLSSessionResumptionSupport
{
using super = UnixNetVConnection; ///< Parent type.
Expand Down Expand Up @@ -223,6 +225,11 @@ class QUICNetVConnection : public UnixNetVConnection,
SLINK(QUICNetVConnection, closed_alink);

protected:
// TLSBasicSupport
SSL *_get_ssl_object() const override;
ssl_curve_id _get_tls_curve() const override;

// TLSSessionResumptionSupport
const IpEndpoint &_getLocalEndpoint() override;

private:
Expand Down
22 changes: 22 additions & 0 deletions iocore/net/QUICNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ QUICNetVConnection::start()
this->_ack_frame_manager.set_ack_delay_exponent(this->_quic_config->ack_delay_exponent_out());
this->_hs_protocol = this->_setup_handshake_protocol(this->_quic_config->client_ssl_ctx());
this->_handshake_handler = new QUICHandshake(this->_initial_version, this, this->_hs_protocol);
this->_record_tls_handshake_begin_time();
this->_handshake_handler->start(tp_config, &this->_packet_factory, this->_quic_config->vn_exercise_enabled());
this->_handshake_handler->do_handshake();
this->_ack_frame_manager.set_max_ack_delay(this->_quic_config->max_ack_delay_out());
Expand Down Expand Up @@ -495,6 +496,8 @@ QUICNetVConnection::free(EThread *t)
*/
this->_context->trigger(QUICContext::CallbackEvent::CONNECTION_CLOSE);
ALPNSupport::clear();
TLSSessionResumptionSupport::clear();
TLSBasicSupport::clear();
this->_packet_handler->close_connection(this);
}

Expand Down Expand Up @@ -1222,6 +1225,7 @@ QUICNetVConnection::_state_handshake_process_initial_packet(const QUICInitialPac
if (this->_quic_config->quantum_readiness_test_enabled_in()) {
tp_config.add_tp(QUANTUM_TEST_ID, QUANTUM_TEST_VALUE, sizeof(QUANTUM_TEST_VALUE));
}
this->_record_tls_handshake_begin_time();
error = this->_handshake_handler->start(tp_config, packet, &this->_packet_factory, this->_alt_con_manager->preferred_address());

// If version negotiation was failed and VERSION NEGOTIATION packet was sent, nothing to do.
Expand Down Expand Up @@ -2118,6 +2122,7 @@ QUICNetVConnection::_switch_to_established_state()
if (this->_complete_handshake_if_possible() == 0) {
QUICConDebug("Enter state_connection_established");
QUICConDebug("Negotiated cipher suite: %s", this->_handshake_handler->negotiated_cipher_suite());
this->_record_tls_handshake_end_time();

SET_HANDLER((NetVConnHandler)&QUICNetVConnection::state_connection_established);

Expand Down Expand Up @@ -2296,6 +2301,7 @@ QUICNetVConnection::_setup_handshake_protocol(const shared_SSL_CTX &ctx)
QUICTLS *tls = new QUICTLS(this->_pp_key_info, ctx.get(), this->direction(), this->options,
this->_quic_config->client_session_file(), this->_quic_config->client_keylog_file());
SSL_set_ex_data(tls->ssl_handle(), QUIC::ssl_quic_qc_index, static_cast<QUICConnection *>(this));
TLSBasicSupport::bind(tls->ssl_handle(), this);
TLSSessionResumptionSupport::bind(tls->ssl_handle(), this);
ALPNSupport::bind(tls->ssl_handle(), this);

Expand Down Expand Up @@ -2412,6 +2418,22 @@ QUICNetVConnection::_handle_periodic_ack_event()
}
}

SSL *
QUICNetVConnection::_get_ssl_object() const
{
return static_cast<QUICTLS *>(this->_hs_protocol)->ssl_handle();
}

ssl_curve_id
QUICNetVConnection::_get_tls_curve() const
{
if (this->getSSLSessionCacheHit()) {
return this->getSSLCurveNID();
} else {
return SSLGetCurveNID(this->_get_ssl_object());
}
}

const IpEndpoint &
QUICNetVConnection::_getLocalEndpoint()
{
Expand Down