hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[CP] fix bug: observer may core cuz lack of nullptr check in object_storage

Browse Source 
Co-authored-by: donglou-zhang <zhangleisoft2012@163.com>
This commit is contained in:
obdev
2024-01-22 07:42:54 +00:00
committed by ob-robot
parent 2f1d042c88
commit 05b1bc313b
3 changed files with 171 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
deps/oblib/src/lib/restore/cos/ob_cos_wrapper.cpp vendored
View File

@ -736,7 +736,10 @@ int ObCosWrapper::del_objects_in_dir(
cos_list_for_each_entry(cos_list_object_content_t, content, &params->object_list, node) {
// Check if the prefix of returned object key match the dir_name
size_t dir_name_str_len = strlen(dir_name.data_);
if (0 != memcmp(content->key.data, dir_name.data_, dir_name_str_len)) {
if (NULL == content->key.data) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned object key data is null, dir=%s, ret=%d\n", dir_name.data_, ret);
} else if (0 != memcmp(content->key.data, dir_name.data_, dir_name_str_len)) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned object prefix not match, dir=%s, object=%s, ret=%d\n", dir_name.data_, content->key.data, ret);
} else if (NULL == (to_delete_object = cos_create_cos_object_key(ctx->mem_pool))) {
@ -772,7 +775,13 @@ int ObCosWrapper::del_objects_in_dir(
// Delete next batch of objects.
char *next_marker_str = NULL;
if (OB_SUCCESS == ret && COS_TRUE == params->truncated) {
if (NULL == (next_marker_str = apr_psprintf(ctx->mem_pool, "%.*s", params->next_marker.len, params->next_marker.data))) {
if (nullptr == params->next_marker.data || params->next_marker.len == 0) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned next marker is invalid, data=%s, len=%d, ret=%d\n",
params->next_marker.data, params->next_marker.len, ret);
} else if (NULL == (next_marker_str = apr_psprintf(ctx->mem_pool, "%.*s",
params->next_marker.len,
params->next_marker.data))) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]get next marker is null, ret=%d\n", ret);
} else {
@ -937,6 +946,11 @@ int ObCosWrapper::pread(
cos_warn_log("[COS]unexpected error, too much data returned, ret=%d, range_size=%s, buf_pos=%ld, size=%ld, req_id=%s.\n", ret, range_size, buf_pos, size, cos_ret->req_id);
log_status(cos_ret, ret);
break;
} else if (NULL == content->pos) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]unexpected error, data pos is null, ret=%d, range_size=%s, buf_pos=%ld, size=%ld, req_id=%s.\n", ret, range_size, buf_pos, size, cos_ret->req_id);
log_status(cos_ret, ret);
break;
} else {
// copy to buf
memcpy(buf + buf_pos, content->pos, (size_t)needed_size);
@ -1011,6 +1025,7 @@ int ObCosWrapper::is_object_tagging(
char key_str[MAX_TAGGING_STR_LEN];
char value_str[MAX_TAGGING_STR_LEN];
if ((NULL != tag->key.data) && (NULL != tag->value.data)) {
int key_n = snprintf(key_str, MAX_TAGGING_STR_LEN, "%.*s", tag->key.len, tag->key.data);
int val_n = snprintf(value_str, MAX_TAGGING_STR_LEN, "%.*s", tag->key.len, tag->value.data);
if (0 >= key_n || MAX_TAGGING_STR_LEN <= key_n) {
@ -1022,6 +1037,8 @@ int ObCosWrapper::is_object_tagging(
} else if (0 == strcmp("delete_mode", key_str) && 0 == strcmp("tagging", value_str)) {
is_tagging = true;
}
}
if (OB_SUCCESS != ret) {
break;
}
@ -1161,7 +1178,10 @@ int ObCosWrapper::list_objects(
cos_list_for_each_entry(cos_list_object_content_t, content, &params->object_list, node) {
// check if the prefix of returned object key match the full_dir_path
size_t full_dir_path_len = strlen(full_dir_path.data_);
if (false == full_dir_path.is_prefix_of(content->key.data, content->key.len)) {
if (nullptr == content->key.data || 0 == content->key.len) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned object key is invalid, dir=%s, requestid=%s, ret=%d\n", full_dir_path.data_, request_id, ret);
} else if (false == full_dir_path.is_prefix_of(content->key.data, content->key.len)) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned object prefix not match, dir=%s, object=%s, requestid=%s, ret=%d\n",
full_dir_path.data_, content->key.data, request_id, ret);
@ -1185,7 +1205,11 @@ int ObCosWrapper::list_objects(
} // end cos_list_for_each_entry
if (OB_SUCCESS == ret && COS_TRUE == params->truncated) {
if (NULL == (cos_list_args.next_marker_ = apr_psprintf(ctx->mem_pool, "%.*s",
if (nullptr == params->next_marker.data || params->next_marker.len == 0) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned next marker is invalid, data=%s, len=%d, ret=%d\n",
params->next_marker.data, params->next_marker.len, ret);
} else if (nullptr == (cos_list_args.next_marker_ = apr_psprintf(ctx->mem_pool, "%.*s",
params->next_marker.len,
params->next_marker.data))) {
ret = OB_COS_ERROR;
@ -1235,7 +1259,11 @@ int ObCosWrapper::list_part_objects(
cos_list_for_each_entry(cos_list_object_content_t, content, &params->object_list, node) {
// check if the prefix of returned object key match the full_dir_path
size_t full_dir_path_len = strlen(full_dir_path.data_);
if (false == full_dir_path.is_prefix_of(content->key.data, content->key.len)) {
if (nullptr == content->key.data || content->key.len <= 0) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned object key is invalid, dir=%s, requestid=%s, ret=%d\n",
full_dir_path.data_, request_id, ret);
} else if (false == full_dir_path.is_prefix_of(content->key.data, content->key.len)) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned object prefix not match, dir=%s, object=%s, requestid=%s, ret=%d\n",
full_dir_path.data_, content->key.data, request_id, ret);
@ -1326,7 +1354,10 @@ int ObCosWrapper::list_directories(
const int64_t listed_dir_full_path_len = common_prefix->prefix.len;
// check if the prefix of returned object key match the dir_name
const size_t dir_name_str_len = strlen(dir_name.data_);
if (false == dir_name.is_prefix_of(listed_dir_full_path, listed_dir_full_path_len)) {
if (nullptr == listed_dir_full_path || listed_dir_full_path_len <= 0) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned dirs is invalid, dir=%s, requestid=%s, ret=%d\n", dir_name.data_, request_id, ret);
} else if (false == dir_name.is_prefix_of(listed_dir_full_path, listed_dir_full_path_len)) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned object prefix not match, dir=%s, object=%s, requestid=%s, ret=%d, obj_path_len=%d, dir_name_len=%d\n",
dir_name.data_, listed_dir_full_path, request_id, ret, listed_dir_full_path_len, dir_name.size_);
@ -1353,7 +1384,11 @@ int ObCosWrapper::list_directories(
} // end cos_list_for_each_entry
if (OB_SUCCESS == ret && COS_TRUE == params->truncated) {
if (NULL == (cos_list_args.next_marker_ = apr_psprintf(ctx->mem_pool, "%.*s",
if (nullptr == params->next_marker.data || params->next_marker.len == 0) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned next marker is invalid, data=%s, len=%d, ret=%d\n",
params->next_marker.data, params->next_marker.len, ret);
} else if (nullptr == (cos_list_args.next_marker_ = apr_psprintf(ctx->mem_pool, "%.*s",
params->next_marker.len,
params->next_marker.data))) {
ret = OB_COS_ERROR;
@ -1555,6 +1590,11 @@ int ObCosWrapper::complete_multipart_upload(
if (NULL == complete_part) {
ret = OB_ALLOCATE_MEMORY_FAILED;
cos_warn_log("[COS]fail to create complete part content, ret=%d\n", ret);
} else if (nullptr == part_content->part_number.data
|| nullptr == part_content->etag.data) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]invalid part_number or etag, part_number=%s, etag=%s ret=%d\n",
part_content->part_number.data, part_content->etag.data, ret);
} else {
cos_str_set(&complete_part->part_number, part_content->part_number.data);
cos_str_set(&complete_part->etag, part_content->etag.data);
@ -1564,7 +1604,12 @@ int ObCosWrapper::complete_multipart_upload(
if (OB_SUCCESS == ret && COS_TRUE == params->truncated) {
const char *next_part_number_marker = NULL;
if (NULL == (next_part_number_marker =
if (nullptr == params->next_part_number_marker.data
|| params->next_part_number_marker.len == 0) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned next part number marker is invalid, data=%s, len=%d, ret=%d\n",
params->next_part_number_marker.data, params->next_part_number_marker.len, ret);
} else if (nullptr == (next_part_number_marker =
apr_psprintf(ctx->mem_pool, "%.*s",
params->next_part_number_marker.len,
params->next_part_number_marker.data))) {
@ -1687,9 +1732,16 @@ int ObCosWrapper::del_unmerged_parts(
cos_warn_log("[COS]fail to list multipart uploads, ret=%d\n", ret);
log_status(cos_ret, ret);
} else {
char *request_id = (char*)apr_table_get(resp_headers, "x-cos-request-id");
cos_list_for_each_entry(cos_list_multipart_upload_content_t, content, &params->upload_list, node) {
if (NULL == (cos_ret = cos_abort_multipart_upload(ctx->options, &bucket, &(content->key),
&(content->upload_id), &resp_headers))
if (nullptr == content->key.data || nullptr == content->upload_id.data) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned key or upload id is invalid, dir=%s, requestid=%s, ret=%d, key=%s, upload id=%s\n",
object_name.data_, request_id, ret, content->key.data, content->upload_id.data);
} else if (nullptr == (cos_ret = cos_abort_multipart_upload(ctx->options, &bucket,
&(content->key),
&(content->upload_id),
&resp_headers))
|| !cos_status_is_ok(cos_ret)) {
convert_io_error(cos_ret, ret);
cos_warn_log("[COS]fail to abort multipart upload, ret=%d, bucket=%s, object=%s, upload_id=%s\n",
@ -1704,7 +1756,13 @@ int ObCosWrapper::del_unmerged_parts(
}
if (OB_SUCCESS == ret && COS_TRUE == params->truncated) {
if (NULL == (next_key_marker = apr_psprintf(ctx->mem_pool, "%.*s",
if (nullptr == params->next_key_marker.data || nullptr == params->next_upload_id_marker.data
|| params->next_key_marker.len == 0 || params->next_upload_id_marker.len == 0) {
ret = OB_COS_ERROR;
cos_warn_log("[COS]returned key marker or upload id is invalid, key data=%s, key len=%d, upload id data=%s, upload id len=%d, ret=%d\n",
params->next_key_marker.data, params->next_key_marker.len,
params->next_upload_id_marker.data, params->next_upload_id_marker.len, ret);
} else if (nullptr == (next_key_marker = apr_psprintf(ctx->mem_pool, "%.*s",
params->next_key_marker.len,
params->next_key_marker.data))) {
ret = OB_COS_ERROR;

4
deps/oblib/src/lib/restore/ob_storage_file.cpp vendored
View File

@ -45,9 +45,9 @@ int get_file_path(const common::ObString &uri, char *buf, const int64_t buf_size
int ret = OB_SUCCESS;
int64_t offset = strlen(OB_FILE_PREFIX);
if (uri.empty()) {
if (uri.empty() || OB_ISNULL(buf)) {
ret = OB_INVALID_ARGUMENT;
STORAGE_LOG(WARN, "invalid args", K(ret), K(uri));
STORAGE_LOG(WARN, "invalid args", K(ret), K(uri), KP(buf));
} else if (!uri.prefix_match(OB_FILE_PREFIX)) {
ret = OB_INVALID_ARGUMENT;
STORAGE_LOG(WARN, "invalid uri", K(ret), K(uri));

52
deps/oblib/src/lib/restore/ob_storage_oss_base.cpp vendored
View File

@ -600,6 +600,9 @@ int ObStorageOssBase::get_oss_file_meta(const ObString &bucket_ob_string,
if (!is_inited()) {
ret = OB_NOT_INIT;
OB_LOG(WARN, "oss client not inited", K(ret));
} else if (OB_ISNULL(bucket_ob_string.ptr()) || OB_ISNULL(object_ob_string.ptr())) {
ret = OB_INVALID_ARGUMENT;
OB_LOG(WARN, "invalid argument", K(ret), K(bucket_ob_string), K(object_ob_string));
} else {
aos_string_t bucket;
aos_string_t object;
@ -938,6 +941,12 @@ int ObStorageOssMultiPartWriter::close()
ret = OB_OSS_ERROR;
OB_LOG(WARN, "fail to create complete part content", K_(bucket), K_(object), K(ret));
break;
} else if (OB_ISNULL(part_content->part_number.data)
|| OB_ISNULL(part_content->etag.data)) {
ret = OB_OSS_ERROR;
OB_LOG(WARN, "invalid part_number or etag",
K(ret), KP(part_content->part_number.data), KP(part_content->etag.data));
break;
} else {
aos_str_set(&complete_part_content->part_number, part_content->part_number.data);
aos_str_set(&complete_part_content->etag, part_content->etag.data);
@ -947,7 +956,12 @@ int ObStorageOssMultiPartWriter::close()
if (OB_SUCC(ret) && AOS_TRUE == params->truncated) {
const char *next_part_number_marker = NULL;
if (OB_ISNULL(next_part_number_marker =
if (OB_ISNULL(params->next_part_number_marker.data)
|| OB_UNLIKELY(params->next_part_number_marker.len <= 0)) {
ret = OB_OSS_ERROR;
OB_LOG(WARN, "next_part_number_marker is invalid", K(ret),
K(params->next_part_number_marker.data), K(params->next_part_number_marker.len));
} else if (OB_ISNULL(next_part_number_marker =
apr_psprintf(aos_pool_, "%.*s",
params->next_part_number_marker.len,
params->next_part_number_marker.data))) {
@ -1178,6 +1192,9 @@ int ObStorageOssReader::pread(
ret = OB_SIZE_OVERFLOW;
OB_LOG(WARN, "the size is too long", K(buf_pos), K(size), K(get_data_size), K(ret));
break;
} else if (OB_ISNULL(content->pos)) {
ret = OB_OSS_ERROR;
OB_LOG(WARN, "unexpected error, the data pos is null", K(size), K(ret));
} else {
memcpy(buf + buf_pos, content->pos, (size_t)needed_size);
buf_pos += needed_size;
@ -1366,6 +1383,7 @@ int ObStorageOssUtil::is_tagging(
aos_list_for_each_entry(oss_tag_content_t, b, &tag_list, node) {
char key_str[OB_MAX_TAGGING_STR_LENGTH];
char value_str[OB_MAX_TAGGING_STR_LENGTH];
if (OB_NOT_NULL(b->key.data) && OB_NOT_NULL(b->value.data)) {
if (OB_FAIL(databuff_printf(key_str, OB_MAX_TAGGING_STR_LENGTH , "%.*s",b->key.len, b->key.data))) {
OB_LOG(WARN, "failed to databuff printf key str", K(ret));
} else if (OB_FAIL(databuff_printf(value_str, OB_MAX_TAGGING_STR_LENGTH, "%.*s", b->key.len, b->value.data))) {
@ -1373,6 +1391,8 @@ int ObStorageOssUtil::is_tagging(
} else if (0 == strcmp("delete_mode", key_str) && 0 == strcmp("tagging", value_str)) {
is_tagging = true;
}
}
if (OB_FAIL(ret)) {
break;
}
@ -1620,7 +1640,11 @@ int ObStorageOssUtil::list_files(
} // end aos_list_for_each_entry
}
if (OB_SUCC(ret) && AOS_TRUE == params->truncated) {
if (NULL == (next_marker = apr_psprintf(oss_base.aos_pool_, "%.*s",
if (OB_ISNULL(params->next_marker.data) || OB_UNLIKELY(params->next_marker.len <= 0)) {
ret = OB_OSS_ERROR;
OB_LOG(WARN, "next_marker is invalid", K(ret),
K(params->next_marker.data), K(params->next_marker.len));
} else if (nullptr == (next_marker = apr_psprintf(oss_base.aos_pool_, "%.*s",
params->next_marker.len,
params->next_marker.data))) {
ret = OB_OSS_ERROR;
@ -1812,7 +1836,11 @@ int ObStorageOssUtil::list_directories(
} // end aos_list_for_each_entry
}
if (OB_SUCC(ret) && AOS_TRUE == params->truncated) {
if (NULL == (next_marker = apr_psprintf(oss_base.aos_pool_, "%.*s",
if (OB_ISNULL(params->next_marker.data) || OB_UNLIKELY(params->next_marker.len <= 0)) {
ret = OB_OSS_ERROR;
OB_LOG(WARN, "next_marker is invalid", K(ret),
K(params->next_marker.data), K(params->next_marker.len));
} else if (nullptr == (next_marker = apr_psprintf(oss_base.aos_pool_, "%.*s",
params->next_marker.len,
params->next_marker.data))) {
ret = OB_OSS_ERROR;
@ -1872,8 +1900,14 @@ int ObStorageOssUtil::del_unmerged_parts(const ObString &uri)
oss_base.print_oss_info(resp_headers, aos_ret, ret);
} else {
aos_list_for_each_entry(oss_list_multipart_upload_content_t, content, &params->upload_list, node) {
if (OB_ISNULL(aos_ret = oss_abort_multipart_upload(oss_base.oss_option_, &bucket, &(content->key),
&(content->upload_id), &resp_headers))
if (OB_ISNULL(content->key.data) || OB_ISNULL(content->upload_id.data)) {
ret = OB_OSS_ERROR;
OB_LOG(WARN, "returned key or upload id invalid",
K(ret), K(content->key.data), K(content->upload_id.data));
} else if (OB_ISNULL(aos_ret = oss_abort_multipart_upload(oss_base.oss_option_, &bucket,
&(content->key),
&(content->upload_id),
&resp_headers))
|| !aos_status_is_ok(aos_ret)) {
convert_io_error(aos_ret, ret);
OB_LOG(WARN, "fail to abort oss multipart upload",
@ -1888,7 +1922,13 @@ int ObStorageOssUtil::del_unmerged_parts(const ObString &uri)
}
if (OB_SUCC(ret) && AOS_TRUE == params->truncated) {
if (OB_ISNULL(next_key_marker =
if (OB_ISNULL(params->next_key_marker.data) || OB_ISNULL(params->next_upload_id_marker.data)
|| OB_UNLIKELY(params->next_key_marker.len <= 0 || params->next_upload_id_marker.len <= 0)) {
ret = OB_OSS_ERROR;
OB_LOG(WARN, "next_key_marker or next_upload_id_marker is invalid", K(ret),
K(params->next_key_marker.data), K(params->next_key_marker.len),
K(params->next_upload_id_marker.data), K(params->next_upload_id_marker.len));
} else if (OB_ISNULL(next_key_marker =
apr_psprintf(oss_base.aos_pool_, "%.*s",
params->next_key_marker.len,
params->next_key_marker.data))) {