Skip to content

fix(qgs): Enable auto-recovery from transient network errors #482

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
Leechael wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(qgs): Enable auto-recovery from transient network errors #482

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
6 changes: 5 additions & 1 deletion QuoteGeneration/qcnl/linux/network_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ static sgx_qcnl_error_t pccs_status_to_qcnl_error(long pccs_status_code) {
case 403:
return SGX_QCNL_NETWORK_ERROR;
case 404: // PCCS_STATUS_NO_CACHE_DATA
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] PCCS returned HTTP 404: No cache data available for this platform.\n");
return SGX_QCNL_ERROR_STATUS_NO_CACHE_DATA;
case 461: // PCCS_STATUS_PLATFORM_UNKNOWN
return SGX_QCNL_ERROR_STATUS_PLATFORM_UNKNOWN;
Expand All @@ -252,6 +253,7 @@ static sgx_qcnl_error_t pccs_status_to_qcnl_error(long pccs_status_code) {
case 503: // PCCS_STATUS_SERVICE_UNAVAILABLE
return SGX_QCNL_ERROR_STATUS_SERVICE_UNAVAILABLE;
default:
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] PCCS returned unexpected HTTP status: %ld\n", pccs_status_code);
return SGX_QCNL_ERROR_STATUS_UNEXPECTED;
}
}
Expand Down Expand Up @@ -396,8 +398,10 @@ sgx_qcnl_error_t qcnl_https_request(const char *url,
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] Encountered CURL error: (%d) %s \n",
curl_ret, f_easy_strerror(curl_ret));
ret = curl_error_to_qcnl_error(curl_ret);
} else
} else {
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] Request failed for URL: %s (HTTP %ld)\n", url, http_code);
ret = pccs_status_to_qcnl_error(http_code);
}
goto cleanup;
}
} while (true);
Expand Down
5 changes: 5 additions & 0 deletions QuoteGeneration/qcnl/win/network_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ static sgx_qcnl_error_t pccs_status_to_qcnl_error(DWORD pccs_status_code) {
case 200: // PCCS_STATUS_SUCCESS
return SGX_QCNL_SUCCESS;
case 404: // PCCS_STATUS_NO_CACHE_DATA
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] PCCS returned HTTP 404: No cache data available for this platform.\n");
return SGX_QCNL_ERROR_STATUS_NO_CACHE_DATA;
case 461: // PCCS_STATUS_PLATFORM_UNKNOWN
return SGX_QCNL_ERROR_STATUS_PLATFORM_UNKNOWN;
Expand All @@ -94,6 +95,7 @@ static sgx_qcnl_error_t pccs_status_to_qcnl_error(DWORD pccs_status_code) {
case 503: // PCCS_STATUS_SERVICE_UNAVAILABLE;
return SGX_QCNL_ERROR_STATUS_SERVICE_UNAVAILABLE;
default:
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] PCCS returned unexpected HTTP status: %ld\n", pccs_status_code);
return SGX_QCNL_ERROR_STATUS_UNEXPECTED;
}
}
Expand Down Expand Up @@ -329,9 +331,12 @@ sgx_qcnl_error_t qcnl_https_request_once(const char *url,
delete[] lpOutBuffer;
} else if (dwStatus == HTTP_STATUS_NOT_FOUND) // 404
{
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] PCCS returned HTTP 404: No cache data available for this platform.\n");
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] Request failed for URL: %s (HTTP 404)\n", url);
ret = SGX_QCNL_ERROR_STATUS_NO_CACHE_DATA;
break;
} else {
qcnl_log(SGX_QL_LOG_ERROR, "[QCNL] Request failed for URL: %s (HTTP %lu)\n", url, dwStatus);
ret = pccs_status_to_qcnl_error(dwStatus);
break;
}
Expand Down
14 changes: 13 additions & 1 deletion QuoteGeneration/quote_wrapper/qgs/qgs_ql_logic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ namespace intel { namespace sgx { namespace dcap { namespace qgs {
tee_att_ret = tee_att_init_quote(ptr.get(), &qe_target_info, false, &hash_size, hash);
if (TEE_ATT_SUCCESS != tee_att_ret) {
QGS_LOG_ERROR("tee_att_init_quote return 0x%x\n", tee_att_ret);
ptr.reset(); // Release context on failure to allow re-initialization on next request
return {};
} else {
QGS_LOG_INFO("tee_att_init_quote return success\n");
Expand Down Expand Up @@ -194,6 +195,11 @@ namespace intel { namespace sgx { namespace dcap { namespace qgs {
}
// Only retry once when the return code is TEE_ATT_ATT_KEY_NOT_INITIALIZED
} while (TEE_ATT_ATT_KEY_NOT_INITIALIZED == tee_att_ret && retry--);

// Release context on failure to allow re-initialization on next request
if (resp_error_code != QGS_MSG_SUCCESS) {
ptr.reset();
}
}
if (resp_error_code == QGS_MSG_SUCCESS) {
qgs_msg_error_ret = qgs_msg_gen_get_quote_resp(NULL, 0, quote_buf.data(), size, &p_resp, &resp_size);
Expand Down Expand Up @@ -370,7 +376,8 @@ namespace intel { namespace sgx { namespace dcap { namespace qgs {
hash);
if (TEE_ATT_SUCCESS != tee_att_ret) {
QGS_LOG_ERROR("tee_att_init_quote return 0x%x\n", tee_att_ret);
//ingnore failure
ptr.reset(); // Release context on failure to allow re-initialization on next request
return {};
} else {
QGS_LOG_INFO("tee_att_init_quote return success\n");
}
Expand Down Expand Up @@ -429,6 +436,11 @@ namespace intel { namespace sgx { namespace dcap { namespace qgs {
// Only retry once when the return code is TEE_ATT_ATT_KEY_NOT_INITIALIZED
} while (TEE_ATT_ATT_KEY_NOT_INITIALIZED == tee_att_ret && retry--);

// Release context on failure to allow re-initialization on next request
if (TEE_ATT_SUCCESS != tee_att_ret) {
ptr.reset();
}

return resp;
} else {
QGS_LOG_INFO("Not a legimit raw request, stop\n");
Expand Down