Skip to content

Consistently check connection validity in AsyncMysqlConnection #9621

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

Consistently check connection validity in AsyncMysqlConnection #9621

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
16 changes: 13 additions & 3 deletions hphp/runtime/ext/async_mysql/ext_async_mysql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,11 @@ static String HHLibSQLQuery__toString__FOR_DEBUGGING_ONLY(
val(this_->propRvalAtOffset(s_query_format_idx).tv()).pstr;
const auto args = val(this_->propRvalAtOffset(s_query_args_idx).tv()).parr;
const auto query = amquery_from_queryf(format, args);
auto mysql = Native::data<AsyncMysqlConnection>(conn)
->m_conn
->mysql_for_testing_only();

auto* data = Native::data<AsyncMysqlConnection>(conn);
data->verifyValidConnection();

auto mysql = data->m_conn->mysql_for_testing_only();
const auto str = query.render(mysql);
return String(str.data(), str.length(), CopyString);
}
Expand Down Expand Up @@ -1244,6 +1246,8 @@ static void HHVM_METHOD(AsyncMysqlConnection, close) {

static String HHVM_METHOD(AsyncMysqlConnection, getSslCertCn) {
auto* data = Native::data<AsyncMysqlConnection>(this_);
data->verifyValidConnection();

const auto* context = data->m_conn->getConnectionContext();
if (context && context->sslCertCn.hasValue()) {
return context->sslCertCn.value();
Expand All @@ -1254,6 +1258,8 @@ static String HHVM_METHOD(AsyncMysqlConnection, getSslCertCn) {

static Object HHVM_METHOD(AsyncMysqlConnection, getSslCertSan) {
auto* data = Native::data<AsyncMysqlConnection>(this_);
data->verifyValidConnection();

auto ret = req::make<c_Vector>();
const auto* context = data->m_conn->getConnectionContext();
if (context && context->sslCertSan.hasValue()) {
Expand All @@ -1266,6 +1272,8 @@ static Object HHVM_METHOD(AsyncMysqlConnection, getSslCertSan) {

static Object HHVM_METHOD(AsyncMysqlConnection, getSslCertExtensions) {
auto* data = Native::data<AsyncMysqlConnection>(this_);
data->verifyValidConnection();

auto ret = req::make<c_Vector>();
const auto* context = data->m_conn->getConnectionContext();
if (context && context->sslCertIdentities.hasValue()) {
Expand All @@ -1278,6 +1286,8 @@ static Object HHVM_METHOD(AsyncMysqlConnection, getSslCertExtensions) {

static bool HHVM_METHOD(AsyncMysqlConnection, isSslCertValidationEnforced) {
auto* data = Native::data<AsyncMysqlConnection>(this_);
data->verifyValidConnection();

const auto* context = data->m_conn->getConnectionContext();
return context && context->isServerCertValidated;
}
Expand Down