Skip to content

Commit

Permalink
rest_vol_object: (fix) H5Ovisit
Browse files Browse the repository at this point in the history 
- Fixed the function RV_object_specific() for the case H5Ovisit.
  If the variable iter_object_type is either H5I_FILE or H5I_GROUP
  a call to CURL_PERFORM is made before setting the cURL headers
  correctly. This resulted in a segmentation fault. This has
  been fixed.
- Added the missing brackets in 2 if statements to ensure that
  the variable url_len is set first before the comparison
  evaluation.
- Corrected the link target path for the test_copy_link and
  test_move_link tests.
- Implemented a test for H5Ovisit() using file_id as root.
  • Loading branch information
Jan-Willem Blokland authored and Jan-Willem Blokland committed Oct 24, 2023
1 parent 25b14be commit 046c2ac
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 10 deletions.
33 changes: 27 additions & 6 deletions src/rest_vol_object.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -996,8 +996,8 @@ RV_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_s
/* To build object table, information about parent object will be needed */
object_iter_data.iter_obj_parent = iter_object;

if (url_len = snprintf(request_url, URL_MAX_LENGTH, "%s/%s/%s", base_URL, object_type_header,
object_iter_data.iter_obj_parent->URI) < 0)
if ((url_len = snprintf(request_url, URL_MAX_LENGTH, "%s/%s/%s", base_URL, object_type_header,
object_iter_data.iter_obj_parent->URI)) < 0)
FUNC_GOTO_ERROR(H5E_LINK, H5E_SYSERRSTR, FAIL, "snprintf error");

if (url_len >= URL_MAX_LENGTH)
Expand Down Expand Up @@ -1085,6 +1085,11 @@ RV_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_s
* object */
CURL_PERFORM(curl, H5E_LINK, H5E_CANTGET, FAIL);

if (curl_headers) {
curl_slist_free_all(curl_headers);
curl_headers = NULL;
}

if (RV_parse_response(response_buffer.buffer, NULL, &oinfo, RV_get_object_info_callback) < 0)
FUNC_GOTO_ERROR(H5E_OBJECT, H5E_PARSEERROR, FAIL, "failed to get object info");

Expand All @@ -1104,21 +1109,37 @@ RV_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_s
switch (iter_object_type) {
case H5I_FILE:
case H5I_GROUP:
if (url_len = snprintf(request_url, URL_MAX_LENGTH, "%s/%s/%s%s", base_URL,
object_type_header, object_iter_data.iter_obj_parent->URI,
(!strcmp(object_type_header, "groups") ? "/links" : "")) < 0)
if ((url_len = snprintf(request_url, URL_MAX_LENGTH, "%s/%s/%s%s", base_URL,
object_type_header, object_iter_data.iter_obj_parent->URI,
(!strcmp(object_type_header, "groups") ? "/links" : ""))) < 0)
FUNC_GOTO_ERROR(H5E_LINK, H5E_SYSERRSTR, FAIL, "snprintf error");

if (url_len >= URL_MAX_LENGTH)
FUNC_GOTO_ERROR(H5E_LINK, H5E_SYSERRSTR, FAIL,
"H5Oiterate/visit request URL size exceeded maximum URL size");

curl_headers = curl_slist_append(curl_headers, host_header);

/* Disable use of Expect: 100 Continue HTTP response */
curl_headers = curl_slist_append(curl_headers, "Expect:");

if (CURLE_OK != curl_easy_setopt(curl, CURLOPT_HTTPHEADER, curl_headers))
FUNC_GOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL, "can't set cURL HTTP headers: %s",
curl_err_buf);
if (CURLE_OK != curl_easy_setopt(curl, CURLOPT_HTTPGET, 1))
FUNC_GOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL,
"can't set up cURL to make HTTP GET request: %s", curl_err_buf);
if (CURLE_OK != curl_easy_setopt(curl, CURLOPT_URL, request_url))
FUNC_GOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL, "can't set cURL request URL: %s",
curl_err_buf);

CURL_PERFORM(curl, H5E_LINK, H5E_CANTGET, FAIL);

if (curl_headers) {
curl_slist_free_all(curl_headers);
curl_headers = NULL;
}

if (RV_parse_response(response_buffer.buffer, &object_iter_data, NULL,
RV_object_iter_callback) < 0)
FUNC_GOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't iterate over links");
Expand Down Expand Up @@ -2162,4 +2183,4 @@ RV_traverse_object_table(object_table_entry *object_table, rv_hash_table_t *visi
RV_free(object_rel_path);

return ret_value;
} /* end RV_traverse_object_table */
} /* end RV_traverse_object_table */
14 changes: 10 additions & 4 deletions test/test_rest_vol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ char filename[FILENAME_MAX_LENGTH];
#define LINK_DELETE_TEST_DSET_NAME1 "link_delete_test_dset1"
#define LINK_DELETE_TEST_DSET_NAME2 "link_delete_test_dset2"

#define COPY_LINK_TEST_SOFT_LINK_TARGET_PATH "/" COPY_LINK_TEST_GROUP_NAME "/" COPY_LINK_TEST_DSET_NAME
#define COPY_LINK_TEST_SOFT_LINK_TARGET_PATH "/" LINK_TEST_GROUP_NAME "/" COPY_LINK_TEST_GROUP_NAME \
"/" COPY_LINK_TEST_DSET_NAME
#define COPY_LINK_TEST_HARD_LINK_COPY_NAME "hard_link_to_dset_copy"
#define COPY_LINK_TEST_SOFT_LINK_COPY_NAME "soft_link_to_dset_copy"
#define COPY_LINK_TEST_HARD_LINK_NAME "hard_link_to_dset"
Expand All @@ -455,7 +456,8 @@ char filename[FILENAME_MAX_LENGTH];
#define COPY_LINK_TEST_DSET_NAME "link_copy_test_dset"
#define COPY_LINK_TEST_DSET_SPACE_RANK 2

#define MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH "/" MOVE_LINK_TEST_GROUP_NAME "/" MOVE_LINK_TEST_DSET_NAME
#define MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH "/" LINK_TEST_GROUP_NAME "/" MOVE_LINK_TEST_GROUP_NAME \
"/" MOVE_LINK_TEST_DSET_NAME
#define MOVE_LINK_TEST_HARD_LINK_NAME "hard_link_to_dset"
#define MOVE_LINK_TEST_SOFT_LINK_NAME "soft_link_to_dset"
#define MOVE_LINK_TEST_GROUP_NAME "link_move_test_group"
Expand Down Expand Up @@ -884,7 +886,6 @@ static int (**tests[])(void) = {
setup_tests, file_tests, group_tests, attribute_tests, dataset_tests,
link_tests, type_tests, object_tests, misc_tests,
};

/*****************************************************
* *
* Plugin initialization/termination tests *
Expand Down Expand Up @@ -15395,7 +15396,12 @@ test_object_visit(void)
if (H5Ovisit3(container_group, H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, NULL,
H5O_INFO_ALL) < 0) {
H5_FAILED();
printf(" H5Ovisit failed!\n");
printf(" H5Ovisit using container_group failed!\n");
goto error;
}
if (H5Ovisit(file_id, H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, NULL, H5O_INFO_ALL) < 0) {
H5_FAILED();
printf(" H5Ovisit using file_id failed!\n");
goto error;
}

Expand Down

0 comments on commit 046c2ac

Please sign in to comment.