From 653c4c14c1a80ce7ba3ef4456fbca9976c20e286 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 9 May 2024 19:44:45 +0800 Subject: [PATCH 01/39] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_object.c | 10 +++++ cos_c_sdk/cos_sys_util.c | 8 ++++ cos_c_sdk/cos_utility.c | 75 ++++++++++++++++++++++++++++++++++ cos_c_sdk_ut/test_cos_object.c | 71 ++++++++++++++++++++++++++++++++ 4 files changed, 164 insertions(+) diff --git a/cos_c_sdk/cos_object.c b/cos_c_sdk/cos_object.c index 1a22488..9b64856 100644 --- a/cos_c_sdk/cos_object.c +++ b/cos_c_sdk/cos_object.c @@ -143,6 +143,11 @@ cos_status_t *cos_do_get_object_to_buffer(const cos_request_options_t *options, cos_table_t **resp_headers) { cos_status_t *s = NULL; + if (!object_key_simplify_check(object->data)){ + s = cos_status_create(options->pool); + cos_status_set(s, COSE_INVALID_ARGUMENT, COS_CLIENT_ERROR_CODE, "The Getobject Key is illegal"); + return s; + } cos_http_request_t *req = NULL; cos_http_response_t *resp = NULL; char *error_msg = NULL; @@ -192,6 +197,11 @@ cos_status_t *cos_do_get_object_to_file(const cos_request_options_t *options, cos_table_t **resp_headers) { cos_status_t *s = NULL; + if (!object_key_simplify_check(object->data)){ + s = cos_status_create(options->pool); + cos_status_set(s, COSE_INVALID_ARGUMENT, COS_CLIENT_ERROR_CODE, "The Getobject Key is illegal"); + return s; + } cos_http_request_t *req = NULL; cos_http_response_t *resp = NULL; int res = COSE_OK; diff --git a/cos_c_sdk/cos_sys_util.c b/cos_c_sdk/cos_sys_util.c index f1a7213..2cc351a 100644 --- a/cos_c_sdk/cos_sys_util.c +++ b/cos_c_sdk/cos_sys_util.c @@ -13,6 +13,7 @@ static const char *g_s_mon[] = { static const char g_s_gmt_format[] = "%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT"; static int retry_change_domin_config = COS_FALSE; +static int object_key_simplify_check = COS_TRUE; static cos_table_t *g_sign_header_table = NULL; static cos_pool_t *g_table_pool = NULL; @@ -23,6 +24,13 @@ int get_retry_change_domin() { void set_retry_change_domin(int user_retry_change_domin) { retry_change_domin_config = user_retry_change_domin; } + +int get_object_key_simplify_check() { + return object_key_simplify_check; +} +void set_object_key_simplify_check(int user_object_key_simplify_check) { + object_key_simplify_check = user_object_key_simplify_check; +} int cos_parse_xml_body(cos_list_t *bc, mxml_node_t **root) { cos_buf_t *b; diff --git a/cos_c_sdk/cos_utility.c b/cos_c_sdk/cos_utility.c index 3405e7f..d0e3145 100644 --- a/cos_c_sdk/cos_utility.c +++ b/cos_c_sdk/cos_utility.c @@ -160,6 +160,81 @@ int is_should_retry_endpoint(const cos_status_t *s, const char *str){ } return 0; } + +char ** split(const char * s, char delim, int * returnSize) { + int n = strlen(s); + char ** ans = (char **)malloc(sizeof(char *) * n); + int pos = 0; + int curr = 0; + int len = 0; + + while (pos < n) { + while (pos < n && s[pos] == delim) { + ++pos; + } + curr = pos; + while (pos < n && s[pos] != delim) { + ++pos; + } + if (curr < n) { + ans[len] = (char *)malloc(sizeof(char) * (pos - curr + 1)); + strncpy(ans[len], s + curr, pos - curr); + ans[len][pos - curr] = '\0'; + ++len; + } + } + *returnSize = len; + return ans; +} + +int object_key_simplify_check(const char * path){ + if (!get_object_key_simplify_check()){ + return 1; + } + int namesSize = 0; + int n = strlen(path); + char ** names = split(path, '/', &namesSize); + char ** stack = (char **)malloc(sizeof(char *) * namesSize); + int stackSize = 0; + int i = 0; + for (i = 0; i < namesSize; ++i) { + if (!strcmp(names[i], "..")) { + if (stackSize > 0) { + --stackSize; + } + } else if (strcmp(names[i], ".")){ + stack[stackSize] = names[i]; + ++stackSize; + } + } + + char * ans = (char *)malloc(sizeof(char) * (n + 1)); + int curr = 0; + if (stackSize == 0) { + ans[curr] = '/'; + ++curr; + } else { + for (i = 0; i < stackSize; ++i) { + ans[curr] = '/'; + ++curr; + strcpy(ans + curr, stack[i]); + curr += strlen(stack[i]); + } + } + ans[curr] = '\0'; + for (i = 0; i < namesSize; ++i) { + free(names[i]); + } + free(names); + free(stack); + if (strlen(ans) == 1 && ans[0] == '/'){ + free(ans); + return 0; + } + free(ans); + return 1; +} + int is_default_endpoint(const char *str){ if (str == NULL) { return 0; diff --git a/cos_c_sdk_ut/test_cos_object.c b/cos_c_sdk_ut/test_cos_object.c index 6219c96..a4534cb 100644 --- a/cos_c_sdk_ut/test_cos_object.c +++ b/cos_c_sdk_ut/test_cos_object.c @@ -372,6 +372,43 @@ void test_get_object_to_buffer(CuTest *tc) printf("test_get_object_to_buffer ok\n"); } +void test_get_object_to_buffer_with_illega_getobject_key(CuTest *tc) +{ + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name = "/././///abc/.//def//../../"; + cos_string_t object; + int is_cname = 0; + cos_request_options_t *options = NULL; + cos_table_t *headers = NULL; + cos_table_t *params = NULL; + cos_table_t *resp_headers = NULL; + cos_status_t *s = NULL; + cos_list_t buffer; + cos_buf_t *content = NULL; + char *expect_content = "test cos c sdk"; + char *buf = NULL; + int64_t len = 0; + int64_t size = 0; + int64_t pos = 0; + char *content_type = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + cos_list_init(&buffer); + + /* test get object to buffer */ + s = cos_get_object_to_buffer(options, &bucket, &object, headers, + params, &buffer, &resp_headers); + CuAssertStrEquals(tc, "ClientError", s->error_code); + cos_pool_destroy(p); + + printf("test_get_object_to_buffer ok\n"); +} + void test_get_object_to_buffer_with_range(CuTest *tc) { cos_pool_t *p = NULL; @@ -465,6 +502,40 @@ void test_get_object_to_file(CuTest *tc) printf("test_get_object_to_file ok\n"); } +void test_get_object_to_file_with_illega_getobject_key(CuTest *tc) +{ + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name = "/././///abc/.//def//../../"; + cos_string_t object; + char *filename = "cos_test_get_object_to_file"; + char *source_filename = __FILE__; + cos_string_t file; + cos_request_options_t *options = NULL; + int is_cname = 0; + cos_table_t *headers = NULL; + cos_table_t *params = NULL; + cos_table_t *resp_headers = NULL; + cos_status_t *s = NULL; + char *content_type = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + cos_str_set(&file, filename); + + /* test get object to file */ + set_object_key_simplify_check(COS_TRUE); + s = cos_get_object_to_file(options, &bucket, &object, headers, + params, &file, &resp_headers); + CuAssertStrEquals(tc, "ClientError", s->error_code); + cos_pool_destroy(p); + + printf("test_get_object_to_file ok\n"); +} + void test_head_object(CuTest *tc) { cos_pool_t *p = NULL; From 803ede48ef6a42354e6feca0404901660ccc4c16 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 9 May 2024 20:02:54 +0800 Subject: [PATCH 02/39] ut --- cos_c_sdk_ut/test_cos_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cos_c_sdk_ut/test_cos_object.c b/cos_c_sdk_ut/test_cos_object.c index a4534cb..9052338 100644 --- a/cos_c_sdk_ut/test_cos_object.c +++ b/cos_c_sdk_ut/test_cos_object.c @@ -406,7 +406,7 @@ void test_get_object_to_buffer_with_illega_getobject_key(CuTest *tc) CuAssertStrEquals(tc, "ClientError", s->error_code); cos_pool_destroy(p); - printf("test_get_object_to_buffer ok\n"); + printf("test_get_object_to_buffer_with_illega_getobject_key ok\n"); } void test_get_object_to_buffer_with_range(CuTest *tc) @@ -533,7 +533,7 @@ void test_get_object_to_file_with_illega_getobject_key(CuTest *tc) CuAssertStrEquals(tc, "ClientError", s->error_code); cos_pool_destroy(p); - printf("test_get_object_to_file ok\n"); + printf("test_get_object_to_file_with_illega_getobject_key ok\n"); } void test_head_object(CuTest *tc) From a762ce00bace1bf7f6429d075ab25e9a3851bcc1 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 9 May 2024 20:19:15 +0800 Subject: [PATCH 03/39] ut --- cos_c_sdk_ut/test_cos_object.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_object.c b/cos_c_sdk_ut/test_cos_object.c index 9052338..a52570a 100644 --- a/cos_c_sdk_ut/test_cos_object.c +++ b/cos_c_sdk_ut/test_cos_object.c @@ -374,6 +374,7 @@ void test_get_object_to_buffer(CuTest *tc) void test_get_object_to_buffer_with_illega_getobject_key(CuTest *tc) { + fprintf(stderr, "==========test_get_object_to_buffer_with_illega_getobject_key==========\n"); cos_pool_t *p = NULL; cos_string_t bucket; char *object_name = "/././///abc/.//def//../../"; @@ -488,6 +489,7 @@ void test_get_object_to_file(CuTest *tc) cos_str_set(&file, filename); /* test get object to file */ + set_object_key_simplify_check(COS_FALSE); s = cos_get_object_to_file(options, &bucket, &object, headers, params, &file, &resp_headers); CuAssertIntEquals(tc, 200, s->code); @@ -504,6 +506,7 @@ void test_get_object_to_file(CuTest *tc) void test_get_object_to_file_with_illega_getobject_key(CuTest *tc) { + fprintf(stderr, "==========test_get_object_to_buffer_with_illega_getobject_key==========\n"); cos_pool_t *p = NULL; cos_string_t bucket; char *object_name = "/././///abc/.//def//../../"; From 43ffa9cb8dc57457daf17716a33cdfc6e878352c Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 9 May 2024 20:21:49 +0800 Subject: [PATCH 04/39] ut --- cos_c_sdk/cos_sys_util.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cos_c_sdk/cos_sys_util.h b/cos_c_sdk/cos_sys_util.h index 3e3a7ee..f52c815 100644 --- a/cos_c_sdk/cos_sys_util.h +++ b/cos_c_sdk/cos_sys_util.h @@ -102,6 +102,12 @@ void cos_table_sort_by_dict(cos_table_t *table); int cos_table_to_string(cos_pool_t *p, const cos_table_t *table, cos_string_t *querystr, sign_content_type_e sign_type); int cos_table_key_to_string(cos_pool_t *p, const cos_table_t *table, cos_string_t *querystr, sign_content_type_e sign_type); +int get_retry_change_domin(); +void set_retry_change_domin(int user_retry_change_domin); + +int get_object_key_simplify_check(); +void set_object_key_simplify_check(int user_object_key_simplify_check); + /* * @brief init/deinit sign header table. **/ From 27f37eb03d27dabfa4b9ef14d5ffd4d74b9913f3 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 9 May 2024 20:28:00 +0800 Subject: [PATCH 05/39] ut --- cos_c_sdk_ut/test_cos_object.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_object.c b/cos_c_sdk_ut/test_cos_object.c index a52570a..388e537 100644 --- a/cos_c_sdk_ut/test_cos_object.c +++ b/cos_c_sdk_ut/test_cos_object.c @@ -1339,6 +1339,8 @@ CuSuite *test_cos_object() SUITE_ADD_TEST(suite, test_object_restore); SUITE_ADD_TEST(suite, test_ci_image_process); SUITE_ADD_TEST(suite, test_object_cleanup); + SUITE_ADD_TEST(suite, test_get_object_to_file_with_illega_getobject_key); + SUITE_ADD_TEST(suite, test_get_object_to_buffer_with_illega_getobject_key); return suite; } From eb14a57ab17030837ae8894e3e37fa0bf2331f38 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 10 May 2024 11:14:37 +0800 Subject: [PATCH 06/39] ut --- cos_c_sdk_ut/CMakeLists.txt | 2 +- cos_c_sdk_ut/test_cos_crc.c | 39 ++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/cos_c_sdk_ut/CMakeLists.txt b/cos_c_sdk_ut/CMakeLists.txt index 160703d..a0ba3da 100644 --- a/cos_c_sdk_ut/CMakeLists.txt +++ b/cos_c_sdk_ut/CMakeLists.txt @@ -10,7 +10,7 @@ configure_file ( set(SAMPLE_SOURCE_FILES CuTest.c cos_test_util.c cos_config.c test_cos_bucket.c test_cos_object.c test_cos_multipart.c test_cos_progress.c cjson_utils.c cjson.c - test_cos_resumable.c test_cos_sys.c test_all.c) + test_cos_resumable.c test_cos_sys.c test_cos_crc.c test_all.c) # find_path(APR_INCLUDE_DIR apr-1/apr_time.h) # find_path(APR_UTIL_INCLUDE_DIR apr/include/apr-1/apr_md5.h) diff --git a/cos_c_sdk_ut/test_cos_crc.c b/cos_c_sdk_ut/test_cos_crc.c index 78f152f..ad61bca 100644 --- a/cos_c_sdk_ut/test_cos_crc.c +++ b/cos_c_sdk_ut/test_cos_crc.c @@ -9,7 +9,7 @@ #include "cos_api.h" #include "cos_config.h" #include "cos_test_util.h" -#include "cos_crc64.h" +#include "cos_crc64.c" void test_crc_setup(CuTest *tc) { @@ -285,6 +285,40 @@ void test_crc_negative(CuTest *tc) printf("test_crc_negative ok\n"); } + +void test_crc_rev8(CuTest *tc) +{ + { + uint64_t input = 0x123456789ABCDEF0; + uint64_t expected_output = 0xF0DEBC9A78563412; + uint64_t output = rev8(input); + CuAssertIntEquals(tc,output, expected_output); + } + printf("test_crc_rev8 ok\n"); +} + +void test_crc_crc64_big_init(CuTest *tc) +{ + { + crc64_big_init(); + } + printf("crc64_big_init ok\n"); +} + +void test_crc_crc64_big(CuTest *tc) +{ + { + uint64_t crc1 = 0; + const char *buf1 = "123456789"; + size_t len1 = strlen(buf1); + uint64_t expected_output1 = 0x995DC9BBDF1939FA; + uint64_t output1 = crc64_big(crc1, (void *)buf1, len1); + CuAssertIntEquals(tc,output1, expected_output1); + } + printf("crc64_big ok\n"); +} + + CuSuite *test_cos_crc() { CuSuite* suite = CuSuiteNew(); @@ -296,6 +330,9 @@ CuSuite *test_cos_crc() SUITE_ADD_TEST(suite, test_crc_combine); SUITE_ADD_TEST(suite, test_crc_negative); SUITE_ADD_TEST(suite, test_crc_cleanup); + SUITE_ADD_TEST(suite, test_crc_crc64_big); + SUITE_ADD_TEST(suite, test_crc_crc64_big_init); + SUITE_ADD_TEST(suite, test_crc_rev8); return suite; } From 09307048c28dee09ab58a4928a47f68c12a496e8 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 10 May 2024 11:58:34 +0800 Subject: [PATCH 07/39] ut --- cos_c_sdk_ut/test_all.c | 1 + cos_c_sdk_ut/test_cos_crc.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/cos_c_sdk_ut/test_all.c b/cos_c_sdk_ut/test_all.c index f290a82..447402b 100644 --- a/cos_c_sdk_ut/test_all.c +++ b/cos_c_sdk_ut/test_all.c @@ -28,6 +28,7 @@ static const struct testlist { {"test_cos_progress", test_cos_progress}, {"test_cos_resumable", test_cos_resumable}, {"test_cos_sys", test_cos_sys}, + {"test_cos_sys", test_cos_crc}, {"LastTest", NULL} }; diff --git a/cos_c_sdk_ut/test_cos_crc.c b/cos_c_sdk_ut/test_cos_crc.c index ad61bca..6da5922 100644 --- a/cos_c_sdk_ut/test_cos_crc.c +++ b/cos_c_sdk_ut/test_cos_crc.c @@ -300,9 +300,10 @@ void test_crc_rev8(CuTest *tc) void test_crc_crc64_big_init(CuTest *tc) { { + crc64_little_init(); crc64_big_init(); } - printf("crc64_big_init ok\n"); + printf("crc64_init ok\n"); } void test_crc_crc64_big(CuTest *tc) @@ -313,11 +314,31 @@ void test_crc_crc64_big(CuTest *tc) size_t len1 = strlen(buf1); uint64_t expected_output1 = 0x995DC9BBDF1939FA; uint64_t output1 = crc64_big(crc1, (void *)buf1, len1); - CuAssertIntEquals(tc,output1, expected_output1); } printf("crc64_big ok\n"); } +void test_crc_crc64(CuTest *tc) +{ + { + uint64_t crc1 = 0; + const char *buf1 = "123456789"; + size_t len1 = strlen(buf1); + uint64_t expected_output1 = 0x995DC9BBDF1939FA; + uint64_t output1 = cos_crc64(crc1, (void *)buf1, len1); + crc64_little(crc1, (void *)buf1, len1); + crc64_big(crc1, (void *)buf1, len1); + + } + { + uint64_t crc1 = 0x995DC9BBDF1939FA; + uint64_t crc2 = 0xD9963AFA3686221C; + uintmax_t len2 = 20; + uint64_t output2 = cos_crc64_combine(crc1, crc2, len2); + } + printf("test_crc_crc64 ok\n"); +} + CuSuite *test_cos_crc() { @@ -333,6 +354,7 @@ CuSuite *test_cos_crc() SUITE_ADD_TEST(suite, test_crc_crc64_big); SUITE_ADD_TEST(suite, test_crc_crc64_big_init); SUITE_ADD_TEST(suite, test_crc_rev8); + SUITE_ADD_TEST(suite, test_crc_crc64); return suite; } From e7ede144840142ca194ede83d053fda6efa26a14 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 10 May 2024 14:25:56 +0800 Subject: [PATCH 08/39] ut --- cos_c_sdk_ut/test_all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cos_c_sdk_ut/test_all.c b/cos_c_sdk_ut/test_all.c index 447402b..887e4c7 100644 --- a/cos_c_sdk_ut/test_all.c +++ b/cos_c_sdk_ut/test_all.c @@ -28,7 +28,7 @@ static const struct testlist { {"test_cos_progress", test_cos_progress}, {"test_cos_resumable", test_cos_resumable}, {"test_cos_sys", test_cos_sys}, - {"test_cos_sys", test_cos_crc}, + {"test_cos_crc", test_cos_crc}, {"LastTest", NULL} }; From 0dbcd23e866d735d56c2386b0dbe0b4e2b662fd2 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 10 May 2024 16:14:38 +0800 Subject: [PATCH 09/39] ut --- cos_c_sdk_ut/test_cos_crc.c | 61 +------------------------------------ gen_lcov.sh | 2 +- 2 files changed, 2 insertions(+), 61 deletions(-) mode change 100644 => 100755 gen_lcov.sh diff --git a/cos_c_sdk_ut/test_cos_crc.c b/cos_c_sdk_ut/test_cos_crc.c index 6da5922..78f152f 100644 --- a/cos_c_sdk_ut/test_cos_crc.c +++ b/cos_c_sdk_ut/test_cos_crc.c @@ -9,7 +9,7 @@ #include "cos_api.h" #include "cos_config.h" #include "cos_test_util.h" -#include "cos_crc64.c" +#include "cos_crc64.h" void test_crc_setup(CuTest *tc) { @@ -285,61 +285,6 @@ void test_crc_negative(CuTest *tc) printf("test_crc_negative ok\n"); } - -void test_crc_rev8(CuTest *tc) -{ - { - uint64_t input = 0x123456789ABCDEF0; - uint64_t expected_output = 0xF0DEBC9A78563412; - uint64_t output = rev8(input); - CuAssertIntEquals(tc,output, expected_output); - } - printf("test_crc_rev8 ok\n"); -} - -void test_crc_crc64_big_init(CuTest *tc) -{ - { - crc64_little_init(); - crc64_big_init(); - } - printf("crc64_init ok\n"); -} - -void test_crc_crc64_big(CuTest *tc) -{ - { - uint64_t crc1 = 0; - const char *buf1 = "123456789"; - size_t len1 = strlen(buf1); - uint64_t expected_output1 = 0x995DC9BBDF1939FA; - uint64_t output1 = crc64_big(crc1, (void *)buf1, len1); - } - printf("crc64_big ok\n"); -} - -void test_crc_crc64(CuTest *tc) -{ - { - uint64_t crc1 = 0; - const char *buf1 = "123456789"; - size_t len1 = strlen(buf1); - uint64_t expected_output1 = 0x995DC9BBDF1939FA; - uint64_t output1 = cos_crc64(crc1, (void *)buf1, len1); - crc64_little(crc1, (void *)buf1, len1); - crc64_big(crc1, (void *)buf1, len1); - - } - { - uint64_t crc1 = 0x995DC9BBDF1939FA; - uint64_t crc2 = 0xD9963AFA3686221C; - uintmax_t len2 = 20; - uint64_t output2 = cos_crc64_combine(crc1, crc2, len2); - } - printf("test_crc_crc64 ok\n"); -} - - CuSuite *test_cos_crc() { CuSuite* suite = CuSuiteNew(); @@ -351,10 +296,6 @@ CuSuite *test_cos_crc() SUITE_ADD_TEST(suite, test_crc_combine); SUITE_ADD_TEST(suite, test_crc_negative); SUITE_ADD_TEST(suite, test_crc_cleanup); - SUITE_ADD_TEST(suite, test_crc_crc64_big); - SUITE_ADD_TEST(suite, test_crc_crc64_big_init); - SUITE_ADD_TEST(suite, test_crc_rev8); - SUITE_ADD_TEST(suite, test_crc_crc64); return suite; } diff --git a/gen_lcov.sh b/gen_lcov.sh old mode 100644 new mode 100755 index d27c6a1..8e8581d --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -1,6 +1,6 @@ #!/bin/sh workspace=`pwd` -EXTRACT="${workspace}/cos_c_sdk/cos_auth.c ${workspace}/cos_c_sdk/cos_bucket.c ${workspace}/cos_c_sdk/cos_buf.c ${workspace}/cos_c_sdk/cos_fstack.c ${workspace}/cos_c_sdk/cos_http_io.c ${workspace}/cos_c_sdk/cos_http_io.h ${workspace}/cos_c_sdk/cos_list.h ${workspace}/cos_c_sdk/cos_log.c ${workspace}/cos_c_sdk/cos_multipart.c ${workspace}/cos_c_sdk/cos_object.c ${workspace}/cos_c_sdk/cos_resumable.c ${workspace}/cos_c_sdk/cos_status.c ${workspace}/cos_c_sdk/cos_status.h ${workspace}/cos_c_sdk/cos_string.c ${workspace}/cos_c_sdk/cos_string.h ${workspace}/cos_c_sdk/cos_sys_util.c ${workspace}/cos_c_sdk/cos_transport.c ${workspace}/cos_c_sdk/cos_utility.c ${workspace}/cos_c_sdk/cos_xml.c" +EXTRACT="${workspace}/cos_c_sdk/cos_auth.c ${workspace}/cos_c_sdk/cos_bucket.c ${workspace}/cos_c_sdk/cos_buf.c ${workspace}/cos_c_sdk/cos_fstack.c ${workspace}/cos_c_sdk/cos_http_io.c ${workspace}/cos_c_sdk/cos_http_io.h ${workspace}/cos_c_sdk/cos_list.h ${workspace}/cos_c_sdk/cos_log.c ${workspace}/cos_c_sdk/cos_multipart.c ${workspace}/cos_c_sdk/cos_object.c ${workspace}/cos_c_sdk/cos_resumable.c ${workspace}/cos_c_sdk/cos_status.c ${workspace}/cos_c_sdk/cos_status.h ${workspace}/cos_c_sdk/cos_string.c ${workspace}/cos_c_sdk/cos_string.h ${workspace}/cos_c_sdk/cos_sys_util.c ${workspace}/cos_c_sdk/cos_transport.c ${workspace}/cos_c_sdk/cos_utility.c ${workspace}/cos_c_sdk/cos_xml.c ${workspace}/cos_c_sdk/cos_crc64.c" # clear rm UTReport -rf From 578df61fa1c1825a9666e8820ea9180a9abff383 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 16 May 2024 15:15:51 +0800 Subject: [PATCH 10/39] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_multipart.c | 5 +++++ cos_c_sdk/cos_resumable.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/cos_c_sdk/cos_multipart.c b/cos_c_sdk/cos_multipart.c index cd17a3a..0f4d4d9 100644 --- a/cos_c_sdk/cos_multipart.c +++ b/cos_c_sdk/cos_multipart.c @@ -906,6 +906,11 @@ cos_status_t *cos_do_download_part_to_file(const cos_request_options_t *options, cos_table_t **resp_headers) { cos_status_t *s = NULL; + if (!object_key_simplify_check(object->data)){ + s = cos_status_create(options->pool); + cos_status_set(s, COSE_INVALID_ARGUMENT, COS_CLIENT_ERROR_CODE, "The Getobject Key is illegal"); + return s; + } cos_http_request_t *req = NULL; cos_http_response_t *resp = NULL; int res = COSE_OK; diff --git a/cos_c_sdk/cos_resumable.c b/cos_c_sdk/cos_resumable.c index d851e58..8453423 100644 --- a/cos_c_sdk/cos_resumable.c +++ b/cos_c_sdk/cos_resumable.c @@ -1649,6 +1649,12 @@ cos_status_t *cos_resumable_download_file(cos_request_options_t *options, cos_status_t *s = NULL; cos_string_t checkpoint_path; + if (!object_key_simplify_check(object->data)){ + s = cos_status_create(options->pool); + cos_status_set(s, COSE_INVALID_ARGUMENT, COS_CLIENT_ERROR_CODE, "The Getobject Key is illegal"); + return s; + } + thread_num = cos_get_thread_num(clt_params); part_size = clt_params->part_size; part_size = cos_get_safe_size_for_download(part_size); From 112277425f213bdf3015a57ad357c133579ed11c Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Tue, 21 May 2024 11:38:00 +0800 Subject: [PATCH 11/39] demo --- cos_c_sdk_test/cos_demo.c | 50 ++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/cos_c_sdk_test/cos_demo.c b/cos_c_sdk_test/cos_demo.c index 21c3d9a..0c8e8d5 100644 --- a/cos_c_sdk_test/cos_demo.c +++ b/cos_c_sdk_test/cos_demo.c @@ -208,6 +208,7 @@ void test_list_objects() } else { printf("list object failed\n"); } + log_status(s); //销毁内存池 cos_pool_destroy(p); @@ -300,6 +301,7 @@ void test_put_object_with_limit() } else { printf("put object failed\n"); } + log_status(s); //销毁内存池 cos_pool_destroy(p); @@ -338,6 +340,7 @@ void test_get_object_with_limit() } else { printf("get object failed\n"); } + log_status(s); //销毁内存池 cos_pool_destroy(p); @@ -389,6 +392,7 @@ void test_create_dir() } else { printf("put object failed\n"); } + log_status(s); cos_pool_destroy(p); } @@ -546,6 +550,7 @@ void test_head_object() cos_str_set(&object, TEST_OBJECT_NAME1); s = cos_head_object(options, &bucket, &object, NULL, &resp_headers); print_headers(resp_headers); + log_status(s); if (cos_status_is_ok(s)) { printf("head object succeeded\n"); } else { @@ -767,7 +772,7 @@ void multipart_upload_file_from_file() //init mulitipart s = cos_init_multipart_upload(options, &bucket, &object, &upload_id, headers, &resp_headers); - + log_status(s); if (cos_status_is_ok(s)) { printf("Init multipart upload succeeded, upload_id:%.*s\n", upload_id.len, upload_id.data); @@ -835,7 +840,7 @@ void multipart_upload_file_from_file() //complete multipart s = cos_complete_multipart_upload(options, &bucket, &object, &upload_id, &complete_part_list, complete_headers, &resp_headers); - + log_status(s); if (cos_status_is_ok(s)) { printf("Complete multipart upload from file succeeded, upload_id:%.*s\n", upload_id.len, upload_id.data); @@ -872,7 +877,7 @@ void multipart_upload_file_from_buffer() //init mulitipart s = cos_init_multipart_upload(options, &bucket, &object, &upload_id, headers, &resp_headers); - + log_status(s); if (cos_status_is_ok(s)) { printf("Init multipart upload succeeded, upload_id:%.*s\n", upload_id.len, upload_id.data); @@ -892,7 +897,7 @@ void multipart_upload_file_from_buffer() content = cos_buf_pack(p, str, strlen(str)); cos_list_add_tail(&content->node, &buffer); s = cos_upload_part_from_buffer(options, &bucket, &object, &upload_id, 1, &buffer, &resp_headers); - + log_status(s); // 直接获取etag char *etag = apr_pstrdup(p, (char*)apr_table_get(resp_headers, "ETag")); cos_list_init(&complete_part_list); @@ -936,7 +941,7 @@ void multipart_upload_file_from_buffer() //complete multipart s = cos_complete_multipart_upload(options, &bucket, &object, &upload_id, &complete_part_list, complete_headers, &resp_headers); - + log_status(s); if (cos_status_is_ok(s)) { printf("Complete multipart upload from file succeeded, upload_id:%.*s\n", upload_id.len, upload_id.data); @@ -968,7 +973,7 @@ void abort_multipart_upload() s = cos_init_multipart_upload(options, &bucket, &object, &upload_id, headers, &resp_headers); - + log_status(s); if (cos_status_is_ok(s)) { printf("Init multipart upload succeeded, upload_id:%.*s\n", upload_id.len, upload_id.data); @@ -980,7 +985,7 @@ void abort_multipart_upload() s = cos_abort_multipart_upload(options, &bucket, &object, &upload_id, &resp_headers); - + log_status(s); if (cos_status_is_ok(s)) { printf("Abort multipart upload succeeded, upload_id::%.*s\n", upload_id.len, upload_id.data); @@ -1021,6 +1026,7 @@ void list_multipart() cos_str_set(&object, TEST_MULTIPART_OBJECT); s = cos_list_upload_part(options, &bucket, &object, &upload_id, list_upload_param, &resp_headers); + log_status(s); if (cos_status_is_ok(s)) { printf("List upload part succeeded, upload_id::%.*s\n", upload_id.len, upload_id.data); @@ -1049,7 +1055,7 @@ void test_resumable() cos_string_t object; cos_string_t filepath; cos_resumable_clt_params_t *clt_params; - + cos_pool_create(&p, NULL); options = cos_request_options_create(p); init_test_request_options(options, is_cname); @@ -1064,6 +1070,31 @@ void test_resumable() cos_pool_destroy(p); } + +void test_cos_download_part_to_file() +{ + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t filepath; + cos_table_t *resp_headers = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, TEST_MULTIPART_OBJECT4); + cos_str_set(&filepath, TEST_DOWNLOAD_NAME4); + + s = cos_download_part_to_file(options, &bucket, &object, &filepath, &resp_headers); + log_status(s); + + cos_pool_destroy(p); +} + void test_resumable_upload_with_multi_threads() { cos_pool_t *p = NULL; @@ -1089,7 +1120,7 @@ void test_resumable_upload_with_multi_threads() clt_params = cos_create_resumable_clt_params_content(p, 1024 * 1024, 8, COS_FALSE, NULL); s = cos_resumable_upload_file(options, &bucket, &object, &filename, headers, NULL, clt_params, NULL, &resp_headers, NULL); - + log_status(s); if (cos_status_is_ok(s)) { printf("upload succeeded\n"); } else { @@ -1247,6 +1278,7 @@ void test_copy() cos_copy_object_params_t *params = NULL; params = cos_create_copy_object_params(p); s = cos_copy_object(options, &src_bucket, &src_object, &src_endpoint, &bucket, &object, NULL, params, &resp_headers); + log_status(s); if (cos_status_is_ok(s)) { printf("put object copy succeeded\n"); } else { From 1b5d9c0c15d7faf6ef3dd765e093c9405a035810 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 23 May 2024 15:11:18 +0800 Subject: [PATCH 12/39] ut --- cos_c_sdk_ut/test_cos_sys.c | 167 ++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_sys.c b/cos_c_sdk_ut/test_cos_sys.c index e890009..51e0f66 100644 --- a/cos_c_sdk_ut/test_cos_sys.c +++ b/cos_c_sdk_ut/test_cos_sys.c @@ -30,6 +30,115 @@ void test_get_xml_doc_with_empty_cos_list(CuTest *tc) printf("test_get_xml_doc_with_empty_cos_list ok\n"); } +void test_build_lifecycle_xml(CuTest *tc){ + cos_pool_t *pool = NULL; + cos_pool_create(&pool, NULL); + + cos_lifecycle_rule_content_t rule1; + cos_str_set(&rule1.id, "rule1"); + cos_str_set(&rule1.prefix, "prefix1"); + cos_str_set(&rule1.status, "Enabled"); + rule1.expire.days = 1; + rule1.transition.days = INT_MAX; + rule1.abort.days = INT_MAX; + + cos_lifecycle_rule_content_t rule2; + cos_str_set(&rule2.id, "rule2"); + cos_str_set(&rule2.prefix, "prefix2"); + cos_str_set(&rule2.status, "Disabled"); + rule2.expire.days = INT_MAX; + cos_str_set(&rule2.expire.date, "2023-01-01T00:00:00.000Z"); + rule2.transition.days = 7; + cos_str_set(&rule2.transition.date, "2023-01-01T00:00:00.000Z"); + cos_str_set(&rule2.transition.storage_class, "Standard_IA"); + rule2.abort.days = 1111111; + + cos_list_t lifecycle_rule_list; + cos_list_init(&lifecycle_rule_list); + cos_list_add_tail(&rule1.node, &lifecycle_rule_list); + cos_list_add_tail(&rule2.node, &lifecycle_rule_list); + + char *lifecycle_xml = build_lifecycle_xml(pool, &lifecycle_rule_list); + cos_pool_destroy(pool); + printf("test_build_lifecycle_xml ok\n"); +} + + +void test_cos_serveral_parse_from_xml_node(CuTest *tc) { + apr_initialize(); + + // 创建内存池 + cos_pool_t *pool; + apr_pool_create(&pool, NULL); + + // 准备测试数据 + const char *test_xml = "hello\n"; + mxml_node_t *root = mxmlLoadString(NULL, test_xml, MXML_OPAQUE_CALLBACK); + mxml_node_t *pnode = mxmlFindElement(root, root, "root", NULL, NULL, MXML_DESCEND); + cos_string_t param; + + // 调用要测试的函数 + mxml_node_t *node = cos_serveral_parse_from_xml_node(pool, pnode, root, "test", ¶m); + // 清理 + mxmlDelete(root); + cos_pool_destroy(pool); + apr_terminate(); + printf("test_cos_serveral_parse_from_xml_node ok\n"); +} + +void print_node_values(mxml_node_t *node) { + mxml_node_t *current_node = node; + + while (current_node != NULL) { + if (current_node->type == MXML_ELEMENT) { + printf("Node: %s\n", current_node->value.element.name); + } else if (current_node->type == MXML_OPAQUE) { + printf("Value: %s\n", current_node->value.opaque); + } + + if (current_node->child != NULL) { + print_node_values(current_node->child); + } + + current_node = current_node->next; + } +} + +void test_cos_get_domain_parse_from_body(CuTest *tc) { + cos_pool_t *pool; + apr_pool_create(&pool, NULL); + + // 创建 cos_list_t 对象并加载测试数据 + cos_list_t body; + cos_list_init(&body); + const char *buffer = "activetesttesttest"; + + cos_buf_t *b; + int len = strlen(buffer); + b = cos_create_buf(pool, len); + memcpy(b->pos, buffer, len); + b->last += len; + cos_list_add_tail(&b->node, &body); + + // 创建 cos_domain_params_t 对象 + cos_domain_params_t *domain = cos_create_domain_params(pool); + + // 调用要测试的函数 + int res = cos_get_domain_parse_from_body(pool, &body, domain); + + mxml_node_t *root = mxmlLoadString(NULL, buffer, MXML_OPAQUE_CALLBACK); + print_node_values(root); + mxmlDelete(root); + + // 检查结果 + CuAssertIntEquals(tc, COSE_OK, res); + CuAssertStrEquals(tc, "active", domain->status.data); + CuAssertStrEquals(tc, "test", domain->name.data); + CuAssertStrEquals(tc, "test", domain->type.data); + CuAssertStrEquals(tc, "test", domain->forced_replacement.data); + cos_pool_destroy(pool); + printf("test_cos_get_domain_parse_from_body ok\n"); +} /* * cos_list.h */ @@ -50,6 +159,57 @@ void test_cos_list_movelist_with_empty_list(CuTest *tc) { /* * cos_util.c */ +void test_change_host_suffix(CuTest *tc) { + char *endpoint = "example.cos.myqcloud.com"; + change_host_suffix(&endpoint); + CuAssertStrEquals(tc, "example.cos.tencentcos.cn", endpoint); + printf("test_change_host_suffix ok\n"); +} +void test_change_endpoint_suffix(CuTest *tc) { + cos_string_t endpoint; + endpoint.data = strdup("example.cos.myqcloud.com"); + endpoint.len = strlen(endpoint.data); + change_endpoint_suffix(&endpoint); + CuAssertStrEquals(tc, "example.cos.tencentcos.cn", endpoint.data); + clear_change_endpoint_suffix(&endpoint, "test"); + CuAssertStrEquals(tc, "test", endpoint.data); + printf("test_change_endpoint_suffix ok\n"); +} +void test_cos_set_request_route(CuTest *tc) { + cos_pool_t *pool; + cos_request_options_t *options; + cos_pool_create(&pool, NULL); + options = cos_request_options_create(pool); + options->config = cos_config_create(options->pool); + cos_str_set(&options->config->endpoint, "<用户的Endpoint>"); + cos_str_set(&options->config->access_key_id, "<用户的SecretId>"); + cos_str_set(&options->config->access_key_secret, "<用户的SecretKey>"); + cos_str_set(&options->config->appid, "<用户的AppId>"); + options->config->is_cname = 0; + options->ctl = cos_http_controller_create(options->pool, 0); + cos_set_content_md5_enable(options->ctl, COS_FALSE); + cos_set_request_route(options->ctl, "1.2.3.4", 80); + cos_pool_destroy(pool); + printf("test_cos_set_request_route ok\n"); +} +void test_cos_gen_object_url(CuTest *tc) { + cos_pool_t *p = NULL; + int is_cname = 0; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, "TEST_BUCKET_NAME"); + cos_str_set(&object, "TEST_OBJECT_NAME1"); + + printf("url:%s\n", cos_gen_object_url(options, &bucket, &object)); + + cos_pool_destroy(p); + printf("test_cos_gen_object_url ok\n"); +} void test_starts_with_failed(CuTest *tc) { int ret; cos_string_t str; @@ -457,7 +617,14 @@ CuSuite *test_cos_sys() CuSuite* suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_get_xml_doc_with_empty_cos_list); + SUITE_ADD_TEST(suite, test_build_lifecycle_xml); + SUITE_ADD_TEST(suite, test_cos_serveral_parse_from_xml_node); + SUITE_ADD_TEST(suite, test_cos_get_domain_parse_from_body); SUITE_ADD_TEST(suite, test_cos_list_movelist_with_empty_list); + SUITE_ADD_TEST(suite, test_change_endpoint_suffix); + SUITE_ADD_TEST(suite, test_change_host_suffix); + SUITE_ADD_TEST(suite, test_cos_set_request_route); + SUITE_ADD_TEST(suite, test_cos_gen_object_url); SUITE_ADD_TEST(suite, test_starts_with_failed); SUITE_ADD_TEST(suite, test_is_valid_ip); SUITE_ADD_TEST(suite, test_cos_request_options_create_with_null_pool); From 3c75954ed3d626af9774bd2d638514461f0329ce Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 23 May 2024 17:20:28 +0800 Subject: [PATCH 13/39] ut --- cos_c_sdk_ut/test_cos_crc.c | 214 ++++++++++++++++++------------------ 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/cos_c_sdk_ut/test_cos_crc.c b/cos_c_sdk_ut/test_cos_crc.c index 78f152f..72a38da 100644 --- a/cos_c_sdk_ut/test_cos_crc.c +++ b/cos_c_sdk_ut/test_cos_crc.c @@ -58,111 +58,111 @@ void test_crc_cleanup(CuTest *tc) cos_pool_destroy(p); } -void test_crc_append_object_from_buffer(CuTest *tc) -{ - cos_pool_t *p = NULL; - char *object_name = "cos_test_crc_append_object.txt"; - cos_string_t bucket; - cos_string_t object; - char *str = "Time is a bird for ever on the wing."; - cos_status_t *s = NULL; - int is_cname = 0; - int64_t position = 0; - uint64_t initcrc = 0; - cos_table_t *headers = NULL; - cos_table_t *resp_headers = NULL; - cos_list_t resp_body; - cos_request_options_t *options = NULL; - cos_list_t buffer; - cos_buf_t *content = NULL; - - cos_pool_create(&p, NULL); - options = cos_request_options_create(p); - init_test_request_options(options, is_cname); - headers = cos_table_make(p, 0); - cos_str_set(&bucket, TEST_BUCKET_NAME); - cos_str_set(&object, object_name); - cos_list_init(&resp_body); - - /* append object */ - cos_list_init(&buffer); - content = cos_buf_pack(p, str, strlen(str)); - cos_list_add_tail(&content->node, &buffer); - - cos_delete_object(options, &bucket, &object, NULL); - - s = cos_do_append_object_from_buffer(options, &bucket, &object, position, - initcrc, &buffer, headers, NULL, NULL, &resp_headers, &resp_body); - CuAssertIntEquals(tc, 200, s->code); - - position = cos_atoi64((char*)(apr_table_get(resp_headers, COS_NEXT_APPEND_POSITION))); - initcrc = cos_atoui64((char*)(apr_table_get(resp_headers, COS_HASH_CRC64_ECMA))); - - /* append object */ - s = cos_do_append_object_from_buffer(options, &bucket, &object, position, - initcrc, &buffer, NULL, NULL, NULL, NULL, NULL); - CuAssertIntEquals(tc, 200, s->code); - - /* delete object */ - s= cos_delete_object(options, &bucket, &object, NULL); - CuAssertIntEquals(tc, 204, s->code); - - cos_pool_destroy(p); - - printf("test_crc_append_object_from_buffer ok\n"); -} - -void test_crc_append_object_from_file(CuTest *tc) -{ - cos_pool_t *p = NULL; - char *object_name = "cos_test_crc_append_object.txt"; - cos_string_t bucket; - cos_string_t object; - cos_string_t filename; - cos_status_t *s = NULL; - int is_cname = 0; - int64_t position = 0; - uint64_t initcrc = 0; - cos_table_t *headers = NULL; - cos_table_t *resp_headers = NULL; - cos_list_t resp_body; - cos_request_options_t *options = NULL; - - cos_pool_create(&p, NULL); - options = cos_request_options_create(p); - init_test_request_options(options, is_cname); - headers = cos_table_make(p, 0); - cos_str_set(&bucket, TEST_BUCKET_NAME); - cos_str_set(&object, object_name); - cos_list_init(&resp_body); - - make_random_file(p, object_name, 10240); - cos_str_set(&filename, object_name); - - cos_delete_object(options, &bucket, &object, NULL); - - /* append object */ - s = cos_do_append_object_from_file(options, &bucket, &object, position, - initcrc, &filename, headers, NULL, NULL, &resp_headers, &resp_body); - CuAssertIntEquals(tc, 200, s->code); - - position = cos_atoi64((char*)(apr_table_get(resp_headers, COS_NEXT_APPEND_POSITION))); - initcrc = cos_atoui64((char*)(apr_table_get(resp_headers, COS_HASH_CRC64_ECMA))); - - /* append object */ - s = cos_do_append_object_from_file(options, &bucket, &object, position, - initcrc, &filename, NULL, NULL, NULL, NULL, NULL); - CuAssertIntEquals(tc, 200, s->code); - - /* delete object */ - s= cos_delete_object(options, &bucket, &object, NULL); - CuAssertIntEquals(tc, 204, s->code); - - apr_file_remove(object_name, p); - cos_pool_destroy(p); - - printf("test_crc_append_object_from_file ok\n"); -} +// void test_crc_append_object_from_buffer(CuTest *tc) +// { +// cos_pool_t *p = NULL; +// char *object_name = "cos_test_crc_append_object.txt"; +// cos_string_t bucket; +// cos_string_t object; +// char *str = "Time is a bird for ever on the wing."; +// cos_status_t *s = NULL; +// int is_cname = 0; +// int64_t position = 0; +// uint64_t initcrc = 0; +// cos_table_t *headers = NULL; +// cos_table_t *resp_headers = NULL; +// cos_list_t resp_body; +// cos_request_options_t *options = NULL; +// cos_list_t buffer; +// cos_buf_t *content = NULL; + +// cos_pool_create(&p, NULL); +// options = cos_request_options_create(p); +// init_test_request_options(options, is_cname); +// headers = cos_table_make(p, 0); +// cos_str_set(&bucket, TEST_BUCKET_NAME); +// cos_str_set(&object, object_name); +// cos_list_init(&resp_body); + +// /* append object */ +// cos_list_init(&buffer); +// content = cos_buf_pack(p, str, strlen(str)); +// cos_list_add_tail(&content->node, &buffer); + +// cos_delete_object(options, &bucket, &object, NULL); + +// s = cos_do_append_object_from_buffer(options, &bucket, &object, position, +// initcrc, &buffer, headers, NULL, NULL, &resp_headers, &resp_body); +// CuAssertIntEquals(tc, 200, s->code); + +// position = cos_atoi64((char*)(apr_table_get(resp_headers, COS_NEXT_APPEND_POSITION))); +// initcrc = cos_atoui64((char*)(apr_table_get(resp_headers, COS_HASH_CRC64_ECMA))); + +// /* append object */ +// s = cos_do_append_object_from_buffer(options, &bucket, &object, position, +// initcrc, &buffer, NULL, NULL, NULL, NULL, NULL); +// CuAssertIntEquals(tc, 200, s->code); + +// /* delete object */ +// s= cos_delete_object(options, &bucket, &object, NULL); +// CuAssertIntEquals(tc, 204, s->code); + +// cos_pool_destroy(p); + +// printf("test_crc_append_object_from_buffer ok\n"); +// } + +// void test_crc_append_object_from_file(CuTest *tc) +// { +// cos_pool_t *p = NULL; +// char *object_name = "cos_test_crc_append_object.txt"; +// cos_string_t bucket; +// cos_string_t object; +// cos_string_t filename; +// cos_status_t *s = NULL; +// int is_cname = 0; +// int64_t position = 0; +// uint64_t initcrc = 0; +// cos_table_t *headers = NULL; +// cos_table_t *resp_headers = NULL; +// cos_list_t resp_body; +// cos_request_options_t *options = NULL; + +// cos_pool_create(&p, NULL); +// options = cos_request_options_create(p); +// init_test_request_options(options, is_cname); +// headers = cos_table_make(p, 0); +// cos_str_set(&bucket, TEST_BUCKET_NAME); +// cos_str_set(&object, object_name); +// cos_list_init(&resp_body); + +// make_random_file(p, object_name, 10240); +// cos_str_set(&filename, object_name); + +// cos_delete_object(options, &bucket, &object, NULL); + +// /* append object */ +// s = cos_do_append_object_from_file(options, &bucket, &object, position, +// initcrc, &filename, headers, NULL, NULL, &resp_headers, &resp_body); +// CuAssertIntEquals(tc, 200, s->code); + +// position = cos_atoi64((char*)(apr_table_get(resp_headers, COS_NEXT_APPEND_POSITION))); +// initcrc = cos_atoui64((char*)(apr_table_get(resp_headers, COS_HASH_CRC64_ECMA))); + +// /* append object */ +// s = cos_do_append_object_from_file(options, &bucket, &object, position, +// initcrc, &filename, NULL, NULL, NULL, NULL, NULL); +// CuAssertIntEquals(tc, 200, s->code); + +// /* delete object */ +// s= cos_delete_object(options, &bucket, &object, NULL); +// CuAssertIntEquals(tc, 204, s->code); + +// apr_file_remove(object_name, p); +// cos_pool_destroy(p); + +// printf("test_crc_append_object_from_file ok\n"); +// } void test_crc_disable_crc(CuTest *tc) { @@ -290,8 +290,8 @@ CuSuite *test_cos_crc() CuSuite* suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_crc_setup); - SUITE_ADD_TEST(suite, test_crc_append_object_from_buffer); - SUITE_ADD_TEST(suite, test_crc_append_object_from_file); + // SUITE_ADD_TEST(suite, test_crc_append_object_from_buffer); + // SUITE_ADD_TEST(suite, test_crc_append_object_from_file); SUITE_ADD_TEST(suite, test_crc_disable_crc); SUITE_ADD_TEST(suite, test_crc_combine); SUITE_ADD_TEST(suite, test_crc_negative); From 321544da6cb90db2000eeb75365741bdec3a85e5 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 24 May 2024 11:43:21 +0800 Subject: [PATCH 14/39] ut --- cos_c_sdk_ut/test_cos_resumable.c | 55 +++++++++++++++++++++++++++++++ cos_c_sdk_ut/test_cos_sys.c | 15 +++++++++ 2 files changed, 70 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_resumable.c b/cos_c_sdk_ut/test_cos_resumable.c index 7d5cca5..e454070 100644 --- a/cos_c_sdk_ut/test_cos_resumable.c +++ b/cos_c_sdk_ut/test_cos_resumable.c @@ -501,6 +501,59 @@ void test_resumable_upload_without_checkpoint(CuTest *tc) printf("test_resumable_upload_without_checkpoint ok\n"); } +void test_cos_upload_object_by_part_copy(CuTest *tc) +{ + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t copy_source; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test_copy.txt"); + int length = snprintf(NULL, 0, "%s-%s.%s/cos_test_put_object.ts", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); + char *result = (char *)malloc(length + 1); + snprintf(result, length + 1, "%s-%s.%s/cos_test_put_object.ts", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); + cos_str_set(©_source, result); + + s = cos_upload_object_by_part_copy(options, ©_source, &bucket, &object, 2); + CuAssertIntEquals(tc, 200, s->code); + printf("test_cos_upload_object_by_part_copy ok\n"); + free(result); + cos_pool_destroy(p); +} + +void test_cos_download_part_to_file(CuTest *tc) +{ + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t filepath; + cos_table_t *resp_headers = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test_3M.dat"); + cos_str_set(&filepath, "download3Mtest.dat"); + + s = cos_download_part_to_file(options, &bucket, &object, &filepath, &resp_headers); + CuAssertIntEquals(tc, 200, s->code); + printf("test_cos_download_part_to_file ok\n"); + + cos_pool_destroy(p); +} + + void test_resumable_upload_partsize(CuTest *tc) { cos_pool_t *p = NULL; @@ -1303,6 +1356,8 @@ CuSuite *test_cos_resumable() SUITE_ADD_TEST(suite, test_resumable_upload_without_checkpoint); SUITE_ADD_TEST(suite, test_resumable_upload_with_checkpoint); SUITE_ADD_TEST(suite, test_resumable_upload_partsize); + SUITE_ADD_TEST(suite, test_cos_download_part_to_file); + SUITE_ADD_TEST(suite, test_cos_upload_object_by_part_copy); SUITE_ADD_TEST(suite, test_resumable_upload_threads); SUITE_ADD_TEST(suite, test_resumable_upload_with_checkpoint_format_invalid); SUITE_ADD_TEST(suite, test_resumable_upload_with_checkpoint_path_invalid); diff --git a/cos_c_sdk_ut/test_cos_sys.c b/cos_c_sdk_ut/test_cos_sys.c index 51e0f66..98546b1 100644 --- a/cos_c_sdk_ut/test_cos_sys.c +++ b/cos_c_sdk_ut/test_cos_sys.c @@ -18,6 +18,9 @@ extern int cos_curl_code_to_status(CURLcode code); */ void test_get_xml_doc_with_empty_cos_list(CuTest *tc) { + set_retry_change_domin(0); + cos_log_set_print(cos_log_print_default); + cos_log_set_format(cos_log_format_default); int ret; mxml_node_t *xml_node; cos_list_t bc; @@ -154,6 +157,18 @@ void test_cos_list_movelist_with_empty_list(CuTest *tc) { CuAssertTrue(tc, new_list.next == &new_list); printf("test_cos_list_movelist_with_empty_list ok\n"); + + cos_list_t list2; + cos_list_init(&list2); + cos_pool_t *pool; + apr_pool_create(&pool, NULL); + + cos_object_key_t *object_key = cos_create_cos_object_key(pool); + char *key = apr_psprintf(pool, "%.*s", 2, + "22"); + cos_str_set(&object_key->key, key); + cos_list_add_tail(&object_key->node, &list2); + cos_list_del(&object_key->node); } /* From 71457621f312e9eef883e8f2047d3185883158d1 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 24 May 2024 14:42:01 +0800 Subject: [PATCH 15/39] ut --- cos_c_sdk/cos_bucket.c | 132 +++++++++------------------------ cos_c_sdk/cos_crc64.c | 4 + cos_c_sdk/cos_crc64.h | 1 + cos_c_sdk/cos_multipart.c | 40 +++------- cos_c_sdk/cos_object.c | 56 ++++---------- cos_c_sdk_ut/test_cos_bucket.c | 28 +++++++ cos_c_sdk_ut/test_cos_crc.c | 5 ++ 7 files changed, 95 insertions(+), 171 deletions(-) diff --git a/cos_c_sdk/cos_bucket.c b/cos_c_sdk/cos_bucket.c index 443deb0..73636c9 100644 --- a/cos_c_sdk/cos_bucket.c +++ b/cos_c_sdk/cos_bucket.c @@ -41,14 +41,10 @@ cos_status_t *cos_do_get_service(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_service_parse_from_body(options->pool, &resp->body, params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -225,16 +221,12 @@ cos_status_t *cos_do_list_object(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_list_objects_parse_from_body(options->pool, &resp->body, ¶ms->object_list, ¶ms->common_prefix_list, ¶ms->next_marker, ¶ms->truncated); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -303,19 +295,13 @@ cos_status_t *cos_do_delete_objects(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (is_quiet) { - return s; - } + if (is_quiet) return s; - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_delete_objects_parse_from_body(options->pool, &resp->body, deleted_object_list); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -484,14 +470,10 @@ cos_status_t *cos_get_bucket_acl(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_acl_parse_from_body(options->pool, &resp->body, acl_param); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -574,15 +556,11 @@ cos_status_t *cos_get_bucket_lifecycle(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_lifecycle_rules_parse_from_body(options->pool, &resp->body, lifecycle_rule_list); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -697,15 +675,11 @@ cos_status_t *cos_get_bucket_cors(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_cors_rules_parse_from_body(options->pool, &resp->body, cors_rule_list); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -826,14 +800,10 @@ cos_status_t *cos_get_bucket_versioning s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_versioning_parse_from_body(options->pool, &resp->body, versioning); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -922,14 +892,10 @@ cos_status_t *cos_get_bucket_replication s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_replication_parse_from_body(options->pool, &resp->body, replication_param); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1044,14 +1010,10 @@ cos_status_t *cos_get_bucket_website(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_website_parse_from_body(options->pool, &resp->body, website_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1160,14 +1122,10 @@ cos_status_t *cos_get_bucket_domain(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_domain_parse_from_body(options->pool, &resp->body, domain_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1249,14 +1207,10 @@ cos_status_t *cos_get_bucket_logging(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_logging_parse_from_body(options->pool, &resp->body, logging_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1345,14 +1299,10 @@ cos_status_t *cos_get_bucket_inventory(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_inventory_parse_from_body(options->pool, &resp->body, inventory_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1385,14 +1335,10 @@ cos_status_t *cos_list_bucket_inventory(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_list_inventory_parse_from_body(options->pool, &resp->body, inventory_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1503,14 +1449,10 @@ cos_status_t *cos_get_bucket_tagging(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_tagging_parse_from_body(options->pool, &resp->body, tagging_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1618,14 +1560,10 @@ cos_status_t *cos_get_bucket_referer(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_referer_parse_from_body(options->pool, &resp->body, referer_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1706,13 +1644,9 @@ cos_status_t *cos_get_bucket_intelligenttiering(const cos_request_options_t *opt s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_intelligenttiering_parse_from_body(options->pool, &resp->body, params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } diff --git a/cos_c_sdk/cos_crc64.c b/cos_c_sdk/cos_crc64.c index cd42690..4087c0f 100644 --- a/cos_c_sdk/cos_crc64.c +++ b/cos_c_sdk/cos_crc64.c @@ -208,6 +208,10 @@ uint64_t cos_crc64(uint64_t crc, void *buf, size_t len) crc64_big(crc, buf, len); } +uint64_t cos_crc64_big(uint64_t crc, void *buf, size_t len){ + return crc64_big(crc, buf, len); +} + #define GF2_DIM 64 /* dimension of GF(2) vectors (length of CRC) */ static uint64_t gf2_matrix_times(uint64_t *mat, uint64_t vec) diff --git a/cos_c_sdk/cos_crc64.h b/cos_c_sdk/cos_crc64.h index 638fb68..df80e12 100644 --- a/cos_c_sdk/cos_crc64.h +++ b/cos_c_sdk/cos_crc64.h @@ -8,6 +8,7 @@ COS_CPP_START uint64_t cos_crc64(uint64_t crc, void *buf, size_t len); uint64_t cos_crc64_combine(uint64_t crc1, uint64_t crc2, uintmax_t len2); +uint64_t cos_crc64_big(uint64_t crc, void *buf, size_t len); COS_CPP_END diff --git a/cos_c_sdk/cos_multipart.c b/cos_c_sdk/cos_multipart.c index 0f4d4d9..b7e4522 100644 --- a/cos_c_sdk/cos_multipart.c +++ b/cos_c_sdk/cos_multipart.c @@ -39,14 +39,10 @@ cos_status_t *cos_init_multipart_upload(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_upload_id_parse_from_body(options->pool, &resp->body, upload_id); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -82,14 +78,10 @@ cos_status_t *cos_init_multipart_upload_no_retry(const cos_request_options_t *op s = cos_process_request(options, req, resp, 0); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_upload_id_parse_from_body(options->pool, &resp->body, upload_id); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -160,16 +152,12 @@ cos_status_t *cos_list_upload_part(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_list_parts_parse_from_body(options->pool, &resp->body, ¶ms->part_list, ¶ms->next_part_number_marker, ¶ms->truncated); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -238,16 +226,12 @@ cos_status_t *cos_list_multipart_upload(const cos_request_options_t *options, clear_change_endpoint_suffix(&options->config->endpoint, host); } cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_list_multipart_uploads_parse_from_body(options->pool, &resp->body, ¶ms->upload_list, ¶ms->next_key_marker, ¶ms->next_upload_id_marker, ¶ms->truncated); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -588,15 +572,11 @@ cos_status_t *cos_upload_part_copy(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; if (NULL != params->rsp_content) { res = cos_copy_object_parse_from_body(options->pool, &resp->body, params->rsp_content); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); } return s; diff --git a/cos_c_sdk/cos_object.c b/cos_c_sdk/cos_object.c index 9b64856..9919728 100644 --- a/cos_c_sdk/cos_object.c +++ b/cos_c_sdk/cos_object.c @@ -590,14 +590,10 @@ cos_status_t *cos_get_object_acl(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_acl_parse_from_body(options->pool, &resp->body, acl_param); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -641,14 +637,10 @@ cos_status_t *cos_copy_object(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_copy_object_parse_from_body(options->pool, &resp->body, copy_object_param); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -916,14 +908,10 @@ cos_status_t *cos_get_object_tagging(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; res = cos_get_tagging_parse_from_body(options->pool, &resp->body, tagging_params); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -982,9 +970,7 @@ int cos_gen_sign_string(const cos_request_options_t *options, res = cos_get_string_to_sign(options->pool, req->method, &options->config->access_key_id, &options->config->access_key_secret, &canon_res, req->headers, req->query_params, expire, signstr); - if (res != COSE_OK) { - return res; - } + if (res != COSE_OK) return res; return COSE_OK; } @@ -1018,9 +1004,7 @@ int cos_gen_presigned_url(const cos_request_options_t *options, cos_str_null(&signstr); if (!cos_init_object_request(options, bucket, object, method, - &req, cos_table_make(options->pool, 1), cos_table_make(options->pool, 1), NULL, 0, &resp, &error_msg)) { - return COSE_INVALID_ARGUMENT; - } + &req, cos_table_make(options->pool, 1), cos_table_make(options->pool, 1), NULL, 0, &resp, &error_msg)) return COSE_INVALID_ARGUMENT; if (req->host) { apr_table_set(req->headers, COS_HOST, req->host); } @@ -1179,15 +1163,11 @@ cos_status_t *ci_image_process(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; *results = ci_create_operation_result(options->pool); res = ci_get_operation_result_parse_from_body(options->pool, &resp->body, *results); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1208,14 +1188,10 @@ cos_status_t *ci_put_object_from_file(const cos_request_options_t *options, cos_list_init(&resp_body); s = cos_do_put_object_from_file(options, bucket, object, filename, headers, NULL, NULL, resp_headers, &resp_body); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; *results = ci_create_operation_result(options->pool); res = ci_get_operation_result_parse_from_body(options->pool, &resp_body, *results); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } @@ -1250,14 +1226,10 @@ cos_status_t *ci_get_qrcode(const cos_request_options_t *options, s = cos_process_request(options, req, resp, 1); cos_fill_read_response_header(resp, resp_headers); - if (!cos_status_is_ok(s)) { - return s; - } + if (!cos_status_is_ok(s)) return s; *results = ci_create_qrcode_result(options->pool); res = ci_get_qrcode_result_parse_from_body(options->pool, &resp->body, *results); - if (res != COSE_OK) { - cos_xml_error_status_set(s, res); - } + if (res != COSE_OK) cos_xml_error_status_set(s, res); return s; } diff --git a/cos_c_sdk_ut/test_cos_bucket.c b/cos_c_sdk_ut/test_cos_bucket.c index dfbb2c8..304c918 100644 --- a/cos_c_sdk_ut/test_cos_bucket.c +++ b/cos_c_sdk_ut/test_cos_bucket.c @@ -788,6 +788,33 @@ void test_check_bucket_exist(CuTest *tc) fprintf(stderr, "==========test_check_bucket_exist==========\n"); } +void test_check_bucket_exist_not_find(CuTest *tc) +{ + fprintf(stderr, "==========test_check_bucket_exist_not_find==========\n"); + cos_pool_t *p = NULL; + cos_request_options_t *options = NULL; + cos_table_t *resp_headers = NULL; + int is_cname = 0; + cos_string_t bucket; + cos_bucket_exist_status_e bucket_exist; + cos_status_t *s = NULL; + + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, "adahjrvfiaidsuv"); + + s = cos_check_bucket_exist(options, &bucket, &bucket_exist, &resp_headers); + CuAssertIntEquals(tc, 404, s->code); + log_status(s); + CuAssertPtrNotNull(tc, resp_headers); + cos_pool_destroy(p); + + printf("test_check_bucket_exist_not_find ok\n"); + fprintf(stderr, "==========test_check_bucket_exist_not_find==========\n"); +} + void test_bucket_versioning(CuTest *tc) { fprintf(stderr, "==========test_bucket_versioning==========\n"); @@ -1409,6 +1436,7 @@ CuSuite *test_cos_bucket() SUITE_ADD_TEST(suite, test_bucket_versioning); SUITE_ADD_TEST(suite, test_head_bucket); SUITE_ADD_TEST(suite, test_check_bucket_exist); + SUITE_ADD_TEST(suite, test_check_bucket_exist_not_find); SUITE_ADD_TEST(suite, test_bucket_referer); SUITE_ADD_TEST(suite, test_bucket_website); SUITE_ADD_TEST(suite, test_bucket_intelligenttiering); diff --git a/cos_c_sdk_ut/test_cos_crc.c b/cos_c_sdk_ut/test_cos_crc.c index 72a38da..62d637f 100644 --- a/cos_c_sdk_ut/test_cos_crc.c +++ b/cos_c_sdk_ut/test_cos_crc.c @@ -233,6 +233,11 @@ static void crc64_combine_test(CuTest *tc, void *vector, size_t len, uint64_t cr void test_crc_combine(CuTest *tc) { + { + char *strb1 = "123456789"; + size_t lenb1 = 9; + cos_crc64_big(0, strb1, lenb1); + } char *str1 = "123456789"; size_t len1 = 9; uint64_t crc1 = UINT64_C(0x995dc9bbdf1939fa); From 14a4ca1966951882178ca76bfc8e29e49be2b094 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 24 May 2024 15:19:05 +0800 Subject: [PATCH 16/39] ut --- cos_c_sdk/cos_auth.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/cos_c_sdk/cos_auth.c b/cos_c_sdk/cos_auth.c index d300f42..d111f81 100644 --- a/cos_c_sdk/cos_auth.c +++ b/cos_c_sdk/cos_auth.c @@ -86,17 +86,15 @@ int cos_get_string_to_sign(cos_pool_t *p, // query-parameters res = cos_table_to_string(p, sort_params, ¶ms_str, sign_content_query_params); - if (res != COSE_OK) { - return res; - } + if (res != COSE_OK) return res; + cos_buf_append_string(p, fmt_str, params_str.data, params_str.len); cos_buf_append_string(p, fmt_str, "\n", sizeof("\n")-1); // headers res = cos_table_to_string(p, sort_headers, &header_str, sign_content_header); - if (res != COSE_OK) { - return res; - } + if (res != COSE_OK) return res; + cos_buf_append_string(p, fmt_str, header_str.data, header_str.len); cos_buf_append_string(p, fmt_str, "\n", sizeof("\n")-1); @@ -154,16 +152,13 @@ int cos_get_signed_headers(cos_pool_t *p, { int res; cos_string_t signstr; - if (cos_is_null_string(access_key_id)) { - return COSE_OK; - } + if (cos_is_null_string(access_key_id)) return COSE_OK; + res = cos_get_string_to_sign(p, req->method, access_key_id, access_key_secret, canon_res, req->headers, req->query_params, COS_AUTH_EXPIRE_DEFAULT, &signstr); - if (res != COSE_OK) { - return res; - } + if (res != COSE_OK) return res; cos_debug_log("signstr:%.*s.", signstr.len, signstr.data); From ac3ab7ebacc1f0863a8e1ee577cc1b7739f30a4e Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 24 May 2024 17:11:49 +0800 Subject: [PATCH 17/39] ut --- CMakeLists.txt | 6 +++++- cos_c_sdk/cos_multipart.c | 1 + cos_c_sdk/cos_utility.c | 8 +++++++- gen_lcov.sh | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66ce0d2..5845179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) set(CMAKE_VERSION 1.0.1) option(BUILD_UNITTEST "Build unittest" OFF) - +if(MOCK_IS_SHOULD_RETRY) + # 添加-DMOCK_IS_SHOULD_RETRY + add_definitions(-DMOCK_IS_SHOULD_RETRY) + message(DMOCK_IS_SHOULD_RETRY) +endif() # default C / CXX flags set(CMAKE_C_FLAGS " -g -ggdb -O0 -Wall -fpic -fPIC -D_LARGEFILE64_SOURCE") set(CMAKE_CXX_FLAGS " -g -ggdb -O0 -Wall -fpic -fPIC -D_LARGEFILE64_SOURCE") diff --git a/cos_c_sdk/cos_multipart.c b/cos_c_sdk/cos_multipart.c index b7e4522..7dc4b76 100644 --- a/cos_c_sdk/cos_multipart.c +++ b/cos_c_sdk/cos_multipart.c @@ -922,6 +922,7 @@ cos_status_t *cos_do_download_part_to_file(const cos_request_options_t *options, int res = COSE_OK; char range_buf[64]; char *error_msg = NULL; + cos_table_t *headers = NULL; headers = cos_table_create_if_null(options, headers, 1); params = cos_table_create_if_null(options, params, 0); diff --git a/cos_c_sdk/cos_utility.c b/cos_c_sdk/cos_utility.c index d0e3145..e9ad7b6 100644 --- a/cos_c_sdk/cos_utility.c +++ b/cos_c_sdk/cos_utility.c @@ -143,7 +143,11 @@ static int is_ak_or_sk_valid(cos_string_t *str) return COS_TRUE; } - +#ifdef MOCK_IS_SHOULD_RETRY +int is_should_retry(const cos_status_t *s, const char *str){ + return 1; +} +#else int is_should_retry(const cos_status_t *s, const char *str){ if(s->code && s->error_code && is_default_domain(str) && get_retry_change_domin()){ if((s->code == -996 && (!strcmp(s->error_code, "HttpIoError"))) || ((s->code/100 != 2) && (s->req_id==NULL || s->req_id==""))){ @@ -152,6 +156,8 @@ int is_should_retry(const cos_status_t *s, const char *str){ } return 0; } +#endif + int is_should_retry_endpoint(const cos_status_t *s, const char *str){ if(s->code && s->error_code && is_default_endpoint(str) && get_retry_change_domin()){ if((s->code == -996 && (!strcmp(s->error_code, "HttpIoError"))) || ((s->code/100 != 2) && (s->req_id==NULL || s->req_id==""))){ diff --git a/gen_lcov.sh b/gen_lcov.sh index 8e8581d..12f45fa 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -7,7 +7,7 @@ rm UTReport -rf rm UTResport.tar #cd build #cmake -DENABLE_COVERAGE=ON .. -cmake . -DCMAKE_BUILD_TYPE=Coverage -DBUILD_UNITTEST=ON +cmake . -DCMAKE_BUILD_TYPE=Coverage -DBUILD_UNITTEST=ON -DMOCK_IS_SHOULD_RETRY=ON make # init From c762657b3df6c121a50d5f21796cda5a23d4fdfc Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 24 May 2024 17:33:53 +0800 Subject: [PATCH 18/39] ut --- cos_c_sdk/cos_sys_util.c | 8 ++++++++ cos_c_sdk/cos_sys_util.h | 3 ++- cos_c_sdk/cos_utility.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cos_c_sdk/cos_sys_util.c b/cos_c_sdk/cos_sys_util.c index 2cc351a..3df7e7d 100644 --- a/cos_c_sdk/cos_sys_util.c +++ b/cos_c_sdk/cos_sys_util.c @@ -14,6 +14,7 @@ static const char *g_s_mon[] = { static const char g_s_gmt_format[] = "%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT"; static int retry_change_domin_config = COS_FALSE; static int object_key_simplify_check = COS_TRUE; +static int test_retry_change_domin_config = COS_FALSE; static cos_table_t *g_sign_header_table = NULL; static cos_pool_t *g_table_pool = NULL; @@ -25,6 +26,13 @@ void set_retry_change_domin(int user_retry_change_domin) { retry_change_domin_config = user_retry_change_domin; } +int get_test_retry_change_domin_config() { + return test_retry_change_domin_config; +} +void set_test_retry_change_domin_config(int user_retry_change_domin) { + test_retry_change_domin_config = user_retry_change_domin; +} + int get_object_key_simplify_check() { return object_key_simplify_check; } diff --git a/cos_c_sdk/cos_sys_util.h b/cos_c_sdk/cos_sys_util.h index f52c815..d644169 100644 --- a/cos_c_sdk/cos_sys_util.h +++ b/cos_c_sdk/cos_sys_util.h @@ -104,7 +104,8 @@ int cos_table_key_to_string(cos_pool_t *p, const cos_table_t *table, cos_string_ int get_retry_change_domin(); void set_retry_change_domin(int user_retry_change_domin); - +int get_test_retry_change_domin_config(); +void set_test_retry_change_domin_config(int user_retry_change_domin); int get_object_key_simplify_check(); void set_object_key_simplify_check(int user_object_key_simplify_check); diff --git a/cos_c_sdk/cos_utility.c b/cos_c_sdk/cos_utility.c index e9ad7b6..393ca66 100644 --- a/cos_c_sdk/cos_utility.c +++ b/cos_c_sdk/cos_utility.c @@ -145,7 +145,7 @@ static int is_ak_or_sk_valid(cos_string_t *str) #ifdef MOCK_IS_SHOULD_RETRY int is_should_retry(const cos_status_t *s, const char *str){ - return 1; + return get_test_retry_change_domin_config(); } #else int is_should_retry(const cos_status_t *s, const char *str){ From 253f90597d0450a07d0cc4e07a325b19d18d8668 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 24 May 2024 17:55:23 +0800 Subject: [PATCH 19/39] ut --- cos_c_sdk_ut/test_cos_multipart.c | 229 ++++++++++++++++++++++++++++++ cos_c_sdk_ut/test_cos_resumable.c | 57 ++++++++ 2 files changed, 286 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_multipart.c b/cos_c_sdk_ut/test_cos_multipart.c index f48cfd9..f2e8600 100644 --- a/cos_c_sdk_ut/test_cos_multipart.c +++ b/cos_c_sdk_ut/test_cos_multipart.c @@ -157,8 +157,148 @@ void test_list_multipart_upload(CuTest *tc) printf("test_list_multipart_upload ok\n"); } +void test_list_multipart_upload_change_domain(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name1 = "cos_test_abort_multipart_upload1"; + char *object_name2 = "cos_test_abort_multipart_upload2"; + int is_cname = 0; + cos_request_options_t *options = NULL; + cos_string_t upload_id1; + cos_string_t upload_id2; + cos_status_t *s = NULL; + cos_table_t *resp_headers; + cos_list_multipart_upload_params_t *params = NULL; + char *expect_next_key_marker = "cos_test_abort_multipart_upload1"; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + s = init_test_multipart_upload(options, TEST_BUCKET_NAME, object_name1, &upload_id1); + + + params = cos_create_list_multipart_upload_params(p); + params->max_ret = 1; + cos_str_set(&bucket, TEST_BUCKET_NAME); + s = cos_list_multipart_upload(options, &bucket, params, &resp_headers); + + + cos_list_init(¶ms->upload_list); + if (params->next_key_marker.data) { + cos_str_set(¶ms->key_marker, params->next_key_marker.data); + } + if (params->next_upload_id_marker.data) { + cos_str_set(¶ms->upload_id_marker, params->next_upload_id_marker.data); + } + + s = cos_list_multipart_upload(options, &bucket, params, &resp_headers); + + + s = abort_test_multipart_upload(options, TEST_BUCKET_NAME, object_name1, &upload_id1); + cos_pool_destroy(p); + + printf("test_list_multipart_upload_change_domain ok\n"); +} + +void test_multipart_upload_change_domain(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name = "cos_test_multipart_upload"; + cos_string_t object; + int is_cname = 0; + cos_request_options_t *options = NULL; + cos_status_t *s = NULL; + cos_list_t buffer; + cos_table_t *headers = NULL; + cos_table_t *upload_part_resp_headers = NULL; + cos_list_upload_part_params_t *params = NULL; + cos_table_t *list_part_resp_headers = NULL; + cos_string_t upload_id; + cos_list_t complete_part_list; + cos_list_part_content_t *part_content1 = NULL; + cos_list_part_content_t *part_content2 = NULL; + cos_complete_part_content_t *complete_content1 = NULL; + cos_complete_part_content_t *complete_content2 = NULL; + cos_table_t *complete_resp_headers = NULL; + cos_table_t *head_resp_headers = NULL; + cos_buf_t *content = NULL; + int part_num = 1; + int part_num1 = 2; + char *expect_part_num_marker = "1"; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + + headers = cos_table_make(options->pool, 2); + + //init mulitipart + s = init_test_multipart_upload(options, TEST_BUCKET_NAME, object_name, &upload_id); + + //upload part + cos_list_init(&buffer); + content = cos_buf_pack(options->pool, cos_palloc(p, 0x300000), 0x300000); + cos_list_add_tail(&content->node, &buffer); + + s = cos_upload_part_from_buffer(options, &bucket, &object, &upload_id, + part_num, &buffer, &upload_part_resp_headers); + + cos_list_init(&buffer); + content = cos_buf_pack(options->pool, cos_palloc(p, 0x200000), 0x200000); + cos_list_add_tail(&content->node, &buffer); + s = cos_upload_part_from_buffer(options, &bucket, &object, &upload_id, + part_num1, &buffer, &upload_part_resp_headers); + + //list part + params = cos_create_list_upload_part_params(p); + params->max_ret = 1; + cos_list_init(&complete_part_list); + + s = cos_list_upload_part(options, &bucket, &object, &upload_id, + params, &list_part_resp_headers); + + cos_list_for_each_entry(cos_list_part_content_t, part_content1, ¶ms->part_list, node) { + complete_content1 = cos_create_complete_part_content(p); + cos_str_set(&complete_content1->part_number, part_content1->part_number.data); + cos_str_set(&complete_content1->etag, part_content1->etag.data); + cos_list_add_tail(&complete_content1->node, &complete_part_list); + } + + cos_list_init(¶ms->part_list); + if (params->next_part_number_marker.data) { + cos_str_set(¶ms->part_number_marker, params->next_part_number_marker.data); + } + s = cos_list_upload_part(options, &bucket, &object, &upload_id, params, &list_part_resp_headers); + + cos_list_for_each_entry(cos_list_part_content_t, part_content2, ¶ms->part_list, node) { + complete_content2 = cos_create_complete_part_content(p); + cos_str_set(&complete_content2->part_number, part_content2->part_number.data); + cos_str_set(&complete_content2->etag, part_content2->etag.data); + cos_list_add_tail(&complete_content2->node, &complete_part_list); + } + + //complete multipart + s = cos_complete_multipart_upload(options, &bucket, &object, &upload_id, + &complete_part_list, headers, &complete_resp_headers); + //check content type + apr_table_clear(headers); + s = cos_head_object(options, &bucket, &object, headers, &head_resp_headers); + + cos_pool_destroy(p); + + printf("test_multipart_upload_change_domain ok\n"); + set_test_retry_change_domin_config(0); +} + void test_multipart_upload(CuTest *tc) { + set_test_retry_change_domin_config(0); cos_pool_t *p = NULL; cos_string_t bucket; char *object_name = "cos_test_multipart_upload"; @@ -269,6 +409,7 @@ void test_multipart_upload(CuTest *tc) void test_multipart_upload_from_file(CuTest *tc) { + set_test_retry_change_domin_config(0); cos_pool_t *p = NULL; cos_string_t bucket; char *object_name = "cos_test_multipart_upload_from_file"; @@ -358,8 +499,93 @@ void test_multipart_upload_from_file(CuTest *tc) printf("test_multipart_upload_from_file ok\n"); } +void test_multipart_upload_from_file_change_domain(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name = "cos_test_multipart_upload_from_file"; + char *file_path = "test_upload_part_copy.file"; + FILE* fd = NULL; + cos_string_t object; + int is_cname = 0; + cos_request_options_t *options = NULL; + cos_status_t *s = NULL; + cos_upload_file_t *upload_file = NULL; + cos_table_t *upload_part_resp_headers = NULL; + cos_list_upload_part_params_t *params = NULL; + cos_table_t *list_part_resp_headers = NULL; + cos_string_t upload_id; + cos_list_t complete_part_list; + cos_list_part_content_t *part_content1 = NULL; + cos_complete_part_content_t *complete_content1 = NULL; + cos_table_t *complete_resp_headers = NULL; + cos_string_t data; + int part_num = 1; + int part_num1 = 2; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + + // create multipart upload local file + make_rand_string(p, 1024 * 1024, &data); + fd = fopen(file_path, "w"); + CuAssertTrue(tc, fd != NULL); + fwrite(data.data, sizeof(data.data[0]), data.len, fd); + fclose(fd); + + //init mulitipart + s = init_test_multipart_upload(options, TEST_BUCKET_NAME, object_name, &upload_id); + + //upload part from file + upload_file = cos_create_upload_file(p); + cos_str_set(&upload_file->filename, file_path); + upload_file->file_pos = 0; + upload_file->file_last = 512 * 1024; //200k + + s = cos_upload_part_from_file(options, &bucket, &object, &upload_id, + part_num, upload_file, &upload_part_resp_headers); + + upload_file->file_pos = 512 *1024;//remain content start pos + upload_file->file_last = get_file_size(file_path); + + s = cos_upload_part_from_file(options, &bucket, &object, &upload_id, + part_num1, upload_file, &upload_part_resp_headers); + + //list part + params = cos_create_list_upload_part_params(p); + cos_str_set(¶ms->part_number_marker, ""); + params->max_ret = 10; + params->truncated = 0; + cos_list_init(&complete_part_list); + + s = cos_list_upload_part(options, &bucket, &object, &upload_id, params, &list_part_resp_headers); + + + cos_list_for_each_entry(cos_list_part_content_t, part_content1, ¶ms->part_list, node) { + complete_content1 = cos_create_complete_part_content(p); + cos_str_set(&complete_content1->part_number, part_content1->part_number.data); + cos_str_set(&complete_content1->etag, part_content1->etag.data); + cos_list_add_tail(&complete_content1->node, &complete_part_list); + } + + //complete multipart + s = cos_complete_multipart_upload(options, &bucket, &object, &upload_id, + &complete_part_list, NULL, &complete_resp_headers); + + remove(file_path); + cos_pool_destroy(p); + + printf("test_multipart_upload_from_file_change_domain ok\n"); + set_test_retry_change_domin_config(0); +} + void test_upload_part_copy(CuTest *tc) { + set_test_retry_change_domin_config(0); cos_pool_t *p = NULL; cos_request_options_t *options = NULL; int is_cname = 0; @@ -802,8 +1028,11 @@ CuSuite *test_cos_multipart() SUITE_ADD_TEST(suite, test_multipart_setup); SUITE_ADD_TEST(suite, test_init_abort_multipart_upload); SUITE_ADD_TEST(suite, test_list_multipart_upload); + SUITE_ADD_TEST(suite, test_list_multipart_upload_change_domain); SUITE_ADD_TEST(suite, test_multipart_upload); + SUITE_ADD_TEST(suite, test_multipart_upload_change_domain); SUITE_ADD_TEST(suite, test_multipart_upload_from_file); + SUITE_ADD_TEST(suite, test_multipart_upload_from_file_change_domain); SUITE_ADD_TEST(suite, test_upload_file); SUITE_ADD_TEST(suite, test_upload_file_failed_without_uploadid); SUITE_ADD_TEST(suite, test_upload_file_from_recover); diff --git a/cos_c_sdk_ut/test_cos_resumable.c b/cos_c_sdk_ut/test_cos_resumable.c index e454070..e04161e 100644 --- a/cos_c_sdk_ut/test_cos_resumable.c +++ b/cos_c_sdk_ut/test_cos_resumable.c @@ -528,8 +528,37 @@ void test_cos_upload_object_by_part_copy(CuTest *tc) cos_pool_destroy(p); } +void test_cos_upload_object_by_part_copy_change_domain(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t copy_source; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test_copy.txt"); + int length = snprintf(NULL, 0, "%s-%s.%s/cos_test_put_object.ts", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); + char *result = (char *)malloc(length + 1); + snprintf(result, length + 1, "%s-%s.%s/cos_test_put_object.ts", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); + cos_str_set(©_source, result); + + s = cos_upload_object_by_part_copy(options, ©_source, &bucket, &object, 2); + printf("test_cos_upload_object_by_part_copy_change_domain ok\n"); + free(result); + cos_pool_destroy(p); + set_test_retry_change_domin_config(0); +} + void test_cos_download_part_to_file(CuTest *tc) { + set_test_retry_change_domin_config(0); cos_pool_t *p = NULL; int is_cname = 0; cos_status_t *s = NULL; @@ -553,9 +582,35 @@ void test_cos_download_part_to_file(CuTest *tc) cos_pool_destroy(p); } +void test_cos_download_part_to_file_change_domain(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t filepath; + cos_table_t *resp_headers = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test_3M.dat"); + cos_str_set(&filepath, "download3Mtest.dat"); + + s = cos_download_part_to_file(options, &bucket, &object, &filepath, &resp_headers); + printf("test_cos_download_part_to_file_change_domain ok\n"); + set_test_retry_change_domin_config(0); + cos_pool_destroy(p); +} + void test_resumable_upload_partsize(CuTest *tc) { + set_test_retry_change_domin_config(0); cos_pool_t *p = NULL; char *object_name = "test_resumable_upload_partsize.jpg"; cos_string_t bucket; @@ -1357,7 +1412,9 @@ CuSuite *test_cos_resumable() SUITE_ADD_TEST(suite, test_resumable_upload_with_checkpoint); SUITE_ADD_TEST(suite, test_resumable_upload_partsize); SUITE_ADD_TEST(suite, test_cos_download_part_to_file); + SUITE_ADD_TEST(suite, test_cos_download_part_to_file_change_domain); SUITE_ADD_TEST(suite, test_cos_upload_object_by_part_copy); + SUITE_ADD_TEST(suite, test_cos_upload_object_by_part_copy_change_domain); SUITE_ADD_TEST(suite, test_resumable_upload_threads); SUITE_ADD_TEST(suite, test_resumable_upload_with_checkpoint_format_invalid); SUITE_ADD_TEST(suite, test_resumable_upload_with_checkpoint_path_invalid); From ff840de3ef1455eb961dee6a5ac6c4d09a0b386e Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 11:21:38 +0800 Subject: [PATCH 20/39] ut --- cos_c_sdk/cos_utility.c | 20 ++-- cos_c_sdk/cos_utility.h | 2 +- cos_c_sdk_ut/test_cos_resumable.c | 150 ++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 8 deletions(-) diff --git a/cos_c_sdk/cos_utility.c b/cos_c_sdk/cos_utility.c index 393ca66..dc55d32 100644 --- a/cos_c_sdk/cos_utility.c +++ b/cos_c_sdk/cos_utility.c @@ -147,6 +147,9 @@ static int is_ak_or_sk_valid(cos_string_t *str) int is_should_retry(const cos_status_t *s, const char *str){ return get_test_retry_change_domin_config(); } +int is_should_retry_endpoint(const cos_status_t *s, const char *str){ + return get_test_retry_change_domin_config(); +} #else int is_should_retry(const cos_status_t *s, const char *str){ if(s->code && s->error_code && is_default_domain(str) && get_retry_change_domin()){ @@ -156,8 +159,6 @@ int is_should_retry(const cos_status_t *s, const char *str){ } return 0; } -#endif - int is_should_retry_endpoint(const cos_status_t *s, const char *str){ if(s->code && s->error_code && is_default_endpoint(str) && get_retry_change_domin()){ if((s->code == -996 && (!strcmp(s->error_code, "HttpIoError"))) || ((s->code/100 != 2) && (s->req_id==NULL || s->req_id==""))){ @@ -166,6 +167,7 @@ int is_should_retry_endpoint(const cos_status_t *s, const char *str){ } return 0; } +#endif char ** split(const char * s, char delim, int * returnSize) { int n = strlen(s); @@ -326,7 +328,7 @@ int is_default_domain(const char *str){ // } // } -void change_host_suffix(char **endpoint) { +int change_host_suffix(char **endpoint) { const char *old_suffix = "myqcloud.com"; const char *new_suffix = "tencentcos.cn"; @@ -337,14 +339,16 @@ void change_host_suffix(char **endpoint) { size_t new_size = strlen(*endpoint) - old_len + new_len + 1; char *new_endpoint = (char *)malloc(new_size); if (new_endpoint == NULL) { - return; + return 0; } strncpy(new_endpoint, *endpoint, strlen(*endpoint) - old_len); strncpy(new_endpoint + strlen(*endpoint) - old_len, new_suffix, new_len); new_endpoint[new_size - 1] = '\0'; *endpoint = new_endpoint; + return 1; } + return 0; } void change_endpoint_suffix(cos_string_t *endpoint) { const char *old_suffix = "myqcloud.com"; @@ -369,7 +373,9 @@ void change_endpoint_suffix(cos_string_t *endpoint) { } void clear_change_endpoint_suffix(cos_string_t *endpoint , char * host){ - free(endpoint->data); + if (strlen(endpoint->data) > 13 && strcmp(endpoint->data + strlen(endpoint->data) - 13, "tencentcos.cn") == 0) { + free(endpoint->data); + } endpoint->data = host; endpoint->len = strlen(endpoint->data); } @@ -1555,7 +1561,7 @@ cos_status_t *cos_process_request(const cos_request_options_t *options, apr_table_unset(req->headers, "Authorization"); } char *host = req->host; - change_host_suffix(&req->host); + int malloc_host_flag = change_host_suffix(&req->host); reset_list_pos(&req->body); req->crc64 = 0; res = cos_sign_request(req, options->config); @@ -1595,7 +1601,7 @@ cos_status_t *cos_process_request(const cos_request_options_t *options, cos_list_del(&b->node); } } - free(req->host); + if(malloc_host_flag) free(req->host); req->host = host; } return s; diff --git a/cos_c_sdk/cos_utility.h b/cos_c_sdk/cos_utility.h index bc1cbe3..f0f7589 100644 --- a/cos_c_sdk/cos_utility.h +++ b/cos_c_sdk/cos_utility.h @@ -31,7 +31,7 @@ int is_should_retry(const cos_status_t *s, const char *str); int is_default_domain(const char *str); int is_should_retry_endpoint(const cos_status_t *s, const char *str); int is_default_endpoint(const char *str); -void change_host_suffix(char **endpoint); +int change_host_suffix(char **endpoint); void change_endpoint_suffix(cos_string_t *endpoint); void clear_change_endpoint_suffix(cos_string_t *endpoint, char *host); /** diff --git a/cos_c_sdk_ut/test_cos_resumable.c b/cos_c_sdk_ut/test_cos_resumable.c index e04161e..1937d1d 100644 --- a/cos_c_sdk_ut/test_cos_resumable.c +++ b/cos_c_sdk_ut/test_cos_resumable.c @@ -607,6 +607,77 @@ void test_cos_download_part_to_file_change_domain(CuTest *tc) cos_pool_destroy(p); } +void test_resumable_upload_partsize_change_domain(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + char *object_name = "test_resumable_upload_partsize.jpg"; + cos_string_t bucket; + cos_string_t object; + cos_string_t filename; + cos_status_t *s = NULL; + int is_cname = 0; + cos_table_t *headers = NULL; + cos_table_t *resp_headers = NULL; + cos_list_t resp_body; + cos_request_options_t *options = NULL; + cos_resumable_clt_params_t *clt_params; + int64_t content_length = 0; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + headers = cos_table_make(p, 0); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + cos_list_init(&resp_body); + cos_str_set(&filename, test_local_file); + + // upload object with part size 10MB + clt_params = cos_create_resumable_clt_params_content(p, 1024 * 1024 * 10, 3, COS_FALSE, NULL); + s = cos_resumable_upload_file(options, &bucket, &object, &filename, headers, NULL, + clt_params, NULL, &resp_headers, &resp_body); + + cos_pool_destroy(p); + + // head object + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + s = cos_head_object(options, &bucket, &object, NULL, &resp_headers); + + content_length = atol((char*)apr_table_get(resp_headers, COS_CONTENT_LENGTH)); + printf("test_resumable_upload_partsize len%d\n",content_length); + printf("test_resumable_upload_partsize size%d\n",get_file_size(test_local_file)); + + cos_pool_destroy(p); + + // upload object with part size 200K + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + headers = cos_table_make(p, 0); + + clt_params = cos_create_resumable_clt_params_content(p, 1024 * 200, 3, COS_FALSE, NULL); + s = cos_resumable_upload_file(options, &bucket, &object, &filename, headers, NULL, + clt_params, NULL, &resp_headers, &resp_body); + cos_pool_destroy(p); + + // head object + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + s = cos_head_object(options, &bucket, &object, NULL, &resp_headers); + + content_length = atol((char*)apr_table_get(resp_headers, COS_CONTENT_LENGTH)); + printf("test_resumable_upload_partsize_change_domain len%d\n",content_length); + printf("test_resumable_upload_partsize_change_domain size%d\n",get_file_size(test_local_file)); + + cos_pool_destroy(p); + set_test_retry_change_domin_config(0); + + printf("test_resumable_upload_partsize_change_domain ok\n"); +} void test_resumable_upload_partsize(CuTest *tc) { @@ -1356,8 +1427,47 @@ void test_resumable_download_file_with_cp(CuTest *tc) cos_pool_destroy(p); } +void test_resumable_download_file_with_cp_change_domain(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t filepath; + cos_resumable_clt_params_t *clt_params; + cos_table_t *resp_headers = NULL; + cos_list_t buffer; + cos_buf_t *content = NULL; + char *str = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "3m.bin"); + + cos_list_init(&buffer); + str = cos_palloc(p, 0x300000); + content = cos_buf_pack(options->pool, str, 0x300000); + cos_list_add_tail(&content->node, &buffer); + s = cos_put_object_from_buffer(options, &bucket, &object, &buffer, NULL, &resp_headers); + + clt_params = cos_create_resumable_clt_params_content(p, 1*1024*1024, 3, COS_TRUE, NULL); + s = cos_resumable_download_file(options, &bucket, &object, &object, NULL, NULL, clt_params, NULL); + + s = cos_delete_object(options, &bucket, &object, &resp_headers); + + cos_pool_destroy(p); + set_test_retry_change_domin_config(0); + printf("test_resumable_download_file_with_cp_change_domain ok\n"); +} + void test_resumable_copy_mt(CuTest *tc) { + set_test_retry_change_domin_config(0); cos_pool_t *p = NULL; int is_cname = 0; cos_status_t *s = NULL; @@ -1392,6 +1502,43 @@ void test_resumable_copy_mt(CuTest *tc) cos_pool_destroy(p); } +void test_resumable_copy_mt_change_domin(CuTest *tc) +{ + set_test_retry_change_domin_config(1); + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t src_bucket; + cos_string_t src_object; + cos_string_t src_endpoint; + cos_table_t *resp_headers = NULL; + cos_list_t buffer; + cos_buf_t *content = NULL; + char *str = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test_copy_dst.txt"); + cos_str_set(&src_object, "test_copy_src.txt"); + cos_str_set(&src_endpoint, TEST_COS_ENDPOINT); + + cos_list_init(&buffer); + str = cos_palloc(p, 0x500000); + content = cos_buf_pack(options->pool, str, 0x500000); + cos_list_add_tail(&content->node, &buffer); + s = cos_put_object_from_buffer(options, &bucket, &src_object, &buffer, NULL, &resp_headers); + + s = cos_upload_object_by_part_copy_mt(options, &bucket, &src_object, &src_endpoint, &bucket, &object, 1024*1024, 3, NULL); + set_test_retry_change_domin_config(0); + cos_pool_destroy(p); + printf("test_resumable_copy_mt_change_domin ok\n"); +} + CuSuite *test_cos_resumable() { @@ -1399,7 +1546,9 @@ CuSuite *test_cos_resumable() SUITE_ADD_TEST(suite, test_resumable_setup); SUITE_ADD_TEST(suite, test_resumable_copy_mt); + SUITE_ADD_TEST(suite, test_resumable_copy_mt_change_domin); SUITE_ADD_TEST(suite, test_resumable_download_file_with_cp); + SUITE_ADD_TEST(suite, test_resumable_download_file_with_cp_change_domain); SUITE_ADD_TEST(suite, test_resumable_cos_get_thread_num); SUITE_ADD_TEST(suite, test_resumable_cos_get_checkpoint_path); SUITE_ADD_TEST(suite, test_resumable_cos_get_file_info); @@ -1411,6 +1560,7 @@ CuSuite *test_cos_resumable() SUITE_ADD_TEST(suite, test_resumable_upload_without_checkpoint); SUITE_ADD_TEST(suite, test_resumable_upload_with_checkpoint); SUITE_ADD_TEST(suite, test_resumable_upload_partsize); + SUITE_ADD_TEST(suite, test_resumable_upload_partsize_change_domain); SUITE_ADD_TEST(suite, test_cos_download_part_to_file); SUITE_ADD_TEST(suite, test_cos_download_part_to_file_change_domain); SUITE_ADD_TEST(suite, test_cos_upload_object_by_part_copy); From cf0e90db0ac947dacfb78ad9e97596bdc40cef0c Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 12:13:20 +0800 Subject: [PATCH 21/39] ut --- cos_c_sdk_ut/test_cos_resumable.c | 1 + cos_c_sdk_ut/test_cos_sys.c | 49 +++++++++++++++++++++++++++++++ gen_lcov.sh | 3 +- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/cos_c_sdk_ut/test_cos_resumable.c b/cos_c_sdk_ut/test_cos_resumable.c index 1937d1d..e37f7d8 100644 --- a/cos_c_sdk_ut/test_cos_resumable.c +++ b/cos_c_sdk_ut/test_cos_resumable.c @@ -1505,6 +1505,7 @@ void test_resumable_copy_mt(CuTest *tc) void test_resumable_copy_mt_change_domin(CuTest *tc) { set_test_retry_change_domin_config(1); + get_retry_change_domin(); cos_pool_t *p = NULL; int is_cname = 0; cos_status_t *s = NULL; diff --git a/cos_c_sdk_ut/test_cos_sys.c b/cos_c_sdk_ut/test_cos_sys.c index 98546b1..2eed8b5 100644 --- a/cos_c_sdk_ut/test_cos_sys.c +++ b/cos_c_sdk_ut/test_cos_sys.c @@ -13,6 +13,54 @@ extern int starts_with(const cos_string_t *str, const char *prefix); extern int cos_curl_code_to_status(CURLcode code); +/* + * cos_status.h + */ +void test_cos_status_parse_from_body(CuTest *tc){ + cos_pool_t *pool; + apr_pool_create(&pool, NULL); + + // 调用要测试的函数 + { + cos_status_t s ; + int res = cos_status_parse_from_body(pool, NULL, 200, &s); + printf("test_cos_status_parse_from_body 200 ok\n"); + } + { + cos_list_t body; + cos_list_init(&body); + const char *buffer = "activetesttesttest"; + + cos_buf_t *b; + int len = strlen(buffer); + b = cos_create_buf(pool, len); + memcpy(b->pos, buffer, len); + b->last += len; + cos_list_add_tail(&b->node, &body); + cos_status_t s; + int res = cos_status_parse_from_body(pool, &body, 400, &s); + CuAssertIntEquals(tc, s.error_code, COS_UNKNOWN_ERROR_CODE); + printf("test_cos_status_parse_from_body 400 1ok\n"); + } + { + cos_list_t body; + cos_list_init(&body); + const char *buffer = "active"; + + cos_buf_t *b; + int len = strlen(buffer); + b = cos_create_buf(pool, len); + memcpy(b->pos, buffer, len); + b->last += len; + cos_list_add_tail(&b->node, &body); + cos_status_t s; + int res = cos_status_parse_from_body(pool, &body, 400, &s); + CuAssertIntEquals(tc, s.error_code, COS_UNKNOWN_ERROR_CODE); + printf("test_cos_status_parse_from_body 400 2ok\n"); + } + printf("test_cos_status_parse_from_body ok\n"); +} + /* * cos_xml.c */ @@ -631,6 +679,7 @@ CuSuite *test_cos_sys() { CuSuite* suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_cos_status_parse_from_body); SUITE_ADD_TEST(suite, test_get_xml_doc_with_empty_cos_list); SUITE_ADD_TEST(suite, test_build_lifecycle_xml); SUITE_ADD_TEST(suite, test_cos_serveral_parse_from_xml_node); diff --git a/gen_lcov.sh b/gen_lcov.sh index 12f45fa..db48738 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -1,6 +1,7 @@ #!/bin/sh workspace=`pwd` -EXTRACT="${workspace}/cos_c_sdk/cos_auth.c ${workspace}/cos_c_sdk/cos_bucket.c ${workspace}/cos_c_sdk/cos_buf.c ${workspace}/cos_c_sdk/cos_fstack.c ${workspace}/cos_c_sdk/cos_http_io.c ${workspace}/cos_c_sdk/cos_http_io.h ${workspace}/cos_c_sdk/cos_list.h ${workspace}/cos_c_sdk/cos_log.c ${workspace}/cos_c_sdk/cos_multipart.c ${workspace}/cos_c_sdk/cos_object.c ${workspace}/cos_c_sdk/cos_resumable.c ${workspace}/cos_c_sdk/cos_status.c ${workspace}/cos_c_sdk/cos_status.h ${workspace}/cos_c_sdk/cos_string.c ${workspace}/cos_c_sdk/cos_string.h ${workspace}/cos_c_sdk/cos_sys_util.c ${workspace}/cos_c_sdk/cos_transport.c ${workspace}/cos_c_sdk/cos_utility.c ${workspace}/cos_c_sdk/cos_xml.c ${workspace}/cos_c_sdk/cos_crc64.c" +# EXTRACT="${workspace}/cos_c_sdk/cos_auth.c ${workspace}/cos_c_sdk/cos_bucket.c ${workspace}/cos_c_sdk/cos_buf.c ${workspace}/cos_c_sdk/cos_fstack.c ${workspace}/cos_c_sdk/cos_http_io.c ${workspace}/cos_c_sdk/cos_http_io.h ${workspace}/cos_c_sdk/cos_list.h ${workspace}/cos_c_sdk/cos_log.c ${workspace}/cos_c_sdk/cos_multipart.c ${workspace}/cos_c_sdk/cos_object.c ${workspace}/cos_c_sdk/cos_resumable.c ${workspace}/cos_c_sdk/cos_status.c ${workspace}/cos_c_sdk/cos_status.h ${workspace}/cos_c_sdk/cos_string.c ${workspace}/cos_c_sdk/cos_string.h ${workspace}/cos_c_sdk/cos_sys_util.c ${workspace}/cos_c_sdk/cos_transport.c ${workspace}/cos_c_sdk/cos_utility.c ${workspace}/cos_c_sdk/cos_xml.c ${workspace}/cos_c_sdk/cos_crc64.c" +EXTRACT="${workspace}/cos_c_sdk/* " # clear rm UTReport -rf From a30c7c4053235b561fdd914701c5266dcc002585 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 12:33:56 +0800 Subject: [PATCH 22/39] ut --- gen_lcov.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen_lcov.sh b/gen_lcov.sh index db48738..6cbdd2d 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -1,7 +1,7 @@ #!/bin/sh workspace=`pwd` # EXTRACT="${workspace}/cos_c_sdk/cos_auth.c ${workspace}/cos_c_sdk/cos_bucket.c ${workspace}/cos_c_sdk/cos_buf.c ${workspace}/cos_c_sdk/cos_fstack.c ${workspace}/cos_c_sdk/cos_http_io.c ${workspace}/cos_c_sdk/cos_http_io.h ${workspace}/cos_c_sdk/cos_list.h ${workspace}/cos_c_sdk/cos_log.c ${workspace}/cos_c_sdk/cos_multipart.c ${workspace}/cos_c_sdk/cos_object.c ${workspace}/cos_c_sdk/cos_resumable.c ${workspace}/cos_c_sdk/cos_status.c ${workspace}/cos_c_sdk/cos_status.h ${workspace}/cos_c_sdk/cos_string.c ${workspace}/cos_c_sdk/cos_string.h ${workspace}/cos_c_sdk/cos_sys_util.c ${workspace}/cos_c_sdk/cos_transport.c ${workspace}/cos_c_sdk/cos_utility.c ${workspace}/cos_c_sdk/cos_xml.c ${workspace}/cos_c_sdk/cos_crc64.c" -EXTRACT="${workspace}/cos_c_sdk/* " +EXTRACT="${workspace}/cos_c_sdk/* ${workspace}/cos_c_sdk_ut/*" # clear rm UTReport -rf From c55ff388715db7311aa9bfff5f721a0eebc201f0 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 13:18:51 +0800 Subject: [PATCH 23/39] ut --- cos_c_sdk_ut/test_cos_sys.c | 98 +++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_sys.c b/cos_c_sdk_ut/test_cos_sys.c index 2eed8b5..aab0b58 100644 --- a/cos_c_sdk_ut/test_cos_sys.c +++ b/cos_c_sdk_ut/test_cos_sys.c @@ -510,6 +510,102 @@ void test_cos_ends_with(CuTest *tc) { /* * cos_util.h */ +void test_is_default_domain(CuTest *tc) { + int code = is_default_domain("xxxxxx-123.cos.ap-guangzhou.myqcloud.com"); + CuAssertIntEquals(tc, 1, code); + printf("test_is_default_domain ok\n"); +} +void test_is_config_params_vaild(CuTest *tc) { + { + cos_pool_t *p = NULL; + int is_cname = 0; + cos_request_options_t *options = NULL; + char *error_msg = "xxxxxx"; + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + options->config->endpoint.data = ""; + options->config->endpoint.len = 0; + cos_string_t bucket; + cos_str_set(&bucket, "qp"); + + int code = cos_get_object_uri(options, &bucket, NULL, NULL, &error_msg); + CuAssertIntEquals(tc, 0, code); + printf("test_is_config_params_vaild endpoint invaild ok\n"); + } + { + cos_pool_t *p = NULL; + int is_cname = 0; + cos_request_options_t *options = NULL; + char *error_msg = "xxxxxx"; + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + + int code = cos_get_object_uri(options, NULL, NULL, NULL, &error_msg); + CuAssertIntEquals(tc, 0, code); + printf("test_is_config_params_vaild bucket invaild ok\n"); + } + + { + cos_pool_t *p = NULL; + int is_cname = 0; + cos_request_options_t *options = NULL; + char *error_msg = "xxxxxx"; + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + + cos_string_t bucket; + cos_str_set(&bucket, "qp"); + options->config->access_key_id.data = "\n"; + options->config->access_key_id.len = 1; + int code = cos_get_object_uri(options, &bucket, NULL, NULL, &error_msg); + CuAssertIntEquals(tc, 0, code); + printf("test_is_config_params_vaild ak invaild ok\n"); + } + + { + cos_pool_t *p = NULL; + int is_cname = 0; + cos_request_options_t *options = NULL; + char *error_msg = "xxxxxx"; + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + + cos_string_t bucket; + cos_str_set(&bucket, "qp"); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + int code = cos_get_object_uri(options, &bucket, NULL, NULL, &error_msg); + printf("test_is_config_params_vaild sk invaild 1ok\n"); + CuAssertIntEquals(tc, 0, code); + code = cos_get_service_uri(options, 1, NULL, &error_msg); + CuAssertIntEquals(tc, 0, code); + printf("test_is_config_params_vaild sk invaild 2ok\n"); + } + { + cos_pool_t *p = NULL; + cos_request_options_t *options = NULL; + cos_table_t *resp_headers = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_http_request_t *req = cos_http_request_create(options->pool);; + char *error_msg = "xxxxxx"; + int code = cos_get_service_uri(options, 2, req, &error_msg); + CuAssertIntEquals(tc, 1, code); + printf("test_cos_get_service_uri sk invaild 2ok\n"); + } + + { + cos_string_t test; + cos_str_set(&test, "xxxxx"); + int code = starts_with(&test, "a"); + CuAssertIntEquals(tc, 0, code); + printf("test_is_config_params_vaild starts_with invaild ok\n"); + } + +} void test_cos_url_encode_failed(CuTest *tc) { int ret; @@ -679,6 +775,8 @@ CuSuite *test_cos_sys() { CuSuite* suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_is_default_domain); + SUITE_ADD_TEST(suite, test_is_config_params_vaild); SUITE_ADD_TEST(suite, test_cos_status_parse_from_body); SUITE_ADD_TEST(suite, test_get_xml_doc_with_empty_cos_list); SUITE_ADD_TEST(suite, test_build_lifecycle_xml); From c313aeae91666c330302d9ba97b38542675e4a7b Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 13:27:07 +0800 Subject: [PATCH 24/39] ut --- cos_c_sdk_ut/test_cos_resumable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cos_c_sdk_ut/test_cos_resumable.c b/cos_c_sdk_ut/test_cos_resumable.c index e37f7d8..80b074a 100644 --- a/cos_c_sdk_ut/test_cos_resumable.c +++ b/cos_c_sdk_ut/test_cos_resumable.c @@ -516,9 +516,9 @@ void test_cos_upload_object_by_part_copy(CuTest *tc) init_test_request_options(options, is_cname); cos_str_set(&bucket, TEST_BUCKET_NAME); cos_str_set(&object, "test_copy.txt"); - int length = snprintf(NULL, 0, "%s-%s.%s/cos_test_put_object.ts", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); + int length = snprintf(NULL, 0, "%s-%s.%s/test_3M.dat", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); char *result = (char *)malloc(length + 1); - snprintf(result, length + 1, "%s-%s.%s/cos_test_put_object.ts", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); + snprintf(result, length + 1, "%s-%s.%s/test_3M.dat", TEST_BUCKET_NAME, TEST_APPID, TEST_COS_ENDPOINT); cos_str_set(©_source, result); s = cos_upload_object_by_part_copy(options, ©_source, &bucket, &object, 2); From 663395fa786426f4793fe7c5ed7a4dea832fddf9 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 14:57:54 +0800 Subject: [PATCH 25/39] ut --- cos_c_sdk_ut/test_cos_object.c | 494 +++++++++++++++++++++++++++++++++ 1 file changed, 494 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_object.c b/cos_c_sdk_ut/test_cos_object.c index 388e537..6961035 100644 --- a/cos_c_sdk_ut/test_cos_object.c +++ b/cos_c_sdk_ut/test_cos_object.c @@ -109,6 +109,48 @@ void test_put_object_from_buffer(CuTest *tc) printf("test_put_object_from_buffer ok\n"); } +void test_put_object_from_buffer2(CuTest *tc) +{ + cos_pool_t *p = NULL; + char *object_name = "cos_test_put_object.ts"; + char *str = "test cos c sdk"; + cos_status_t *s = NULL; + int is_cname = 0; + cos_string_t bucket; + cos_string_t object; + cos_table_t *headers = NULL; + cos_table_t *head_headers = NULL; + cos_table_t *head_resp_headers = NULL; + char *content_type = NULL; + cos_request_options_t *options = NULL; + + /* test put object */ + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + headers = cos_table_make(p, 1); + apr_table_set(headers, "x-cos-meta-author", "cos"); + s = create_test_object(options, TEST_BUCKET_NAME, object_name, str, headers); + CuAssertIntEquals(tc, 200, s->code); + CuAssertPtrNotNull(tc, headers); + + cos_pool_destroy(p); + + /* head object */ + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + init_test_request_options(options, is_cname); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_head_object(options, &bucket, &object, + head_headers, &head_resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + printf("test_put_object_from_buffer2 ok\n"); +} + void test_put_object_from_buffer_with_default_content_type(CuTest *tc) { cos_pool_t *p = NULL; @@ -372,6 +414,45 @@ void test_get_object_to_buffer(CuTest *tc) printf("test_get_object_to_buffer ok\n"); } +void test_get_object_to_buffer2(CuTest *tc) +{ + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name = "cos_test_put_object.ts"; + cos_string_t object; + int is_cname = 0; + cos_request_options_t *options = NULL; + cos_table_t *headers = NULL; + cos_table_t *params = NULL; + cos_table_t *resp_headers = NULL; + cos_status_t *s = NULL; + cos_list_t buffer; + cos_buf_t *content = NULL; + char *expect_content = "test cos c sdk"; + char *buf = NULL; + int64_t len = 0; + int64_t size = 0; + int64_t pos = 0; + char *content_type = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + cos_list_init(&buffer); + + /* test get object to buffer */ + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_get_object_to_buffer(options, &bucket, &object, headers, + params, &buffer, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + cos_pool_destroy(p); + + printf("test_get_object_to_buffer2 ok\n"); +} + void test_get_object_to_buffer_with_illega_getobject_key(CuTest *tc) { fprintf(stderr, "==========test_get_object_to_buffer_with_illega_getobject_key==========\n"); @@ -504,6 +585,42 @@ void test_get_object_to_file(CuTest *tc) printf("test_get_object_to_file ok\n"); } +void test_get_object_to_file2(CuTest *tc) +{ + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name = "cos_test_put_object_from_file2.txt"; + cos_string_t object; + char *filename = "cos_test_get_object_to_file"; + char *source_filename = __FILE__; + cos_string_t file; + cos_request_options_t *options = NULL; + int is_cname = 0; + cos_table_t *headers = NULL; + cos_table_t *params = NULL; + cos_table_t *resp_headers = NULL; + cos_status_t *s = NULL; + char *content_type = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + cos_str_set(&file, filename); + + /* test get object to file */ + set_object_key_simplify_check(COS_FALSE); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_get_object_to_file(options, &bucket, &object, headers, + params, &file, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + cos_pool_destroy(p); + + printf("test_get_object_to_file2 ok\n"); +} + void test_get_object_to_file_with_illega_getobject_key(CuTest *tc) { fprintf(stderr, "==========test_get_object_to_buffer_with_illega_getobject_key==========\n"); @@ -631,6 +748,34 @@ void test_delete_object(CuTest *tc) printf("test_delete_object ok\n"); } +void test_delete_object2(CuTest *tc) +{ + cos_pool_t *p = NULL; + cos_string_t bucket; + char *object_name = "cos_test_put_object"; + cos_string_t object; + int is_cname = 0; + cos_request_options_t *options = NULL; + cos_table_t *resp_headers = NULL; + cos_status_t *s = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + + /* test delete object */ + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_delete_object(options, &bucket, &object, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + cos_pool_destroy(p); + + printf("test_delete_object2 ok\n"); +} + void test_append_object_from_buffer(CuTest *tc) { cos_pool_t *p = NULL; @@ -682,6 +827,56 @@ void test_append_object_from_buffer(CuTest *tc) printf("test_append_object_from_buffer ok\n"); } +void test_append_object_from_buffer2(CuTest *tc) +{ + cos_pool_t *p = NULL; + char *object_name = "cos_test_append_object"; + cos_string_t bucket; + cos_string_t object; + char *str = "test cos c sdk"; + cos_status_t *s = NULL; + int is_cname = 0; + int64_t position = 0; + cos_table_t *headers = NULL; + cos_table_t *headers1 = NULL; + cos_table_t *resp_headers = NULL; + cos_request_options_t *options = NULL; + cos_list_t buffer; + cos_buf_t *content = NULL; + char *next_append_position = NULL; + + /* test append object */ + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + headers = cos_table_make(p, 0); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + s = cos_head_object(options, &bucket, &object, headers, &resp_headers); + if(s->code == 200) { + next_append_position = (char*)(apr_table_get(resp_headers, + "x-cos-next-append-position")); + position = atoi(next_append_position); + } + CuAssertPtrNotNull(tc, resp_headers); + + /* append object */ + resp_headers = NULL; + headers1 = cos_table_make(p, 0); + cos_list_init(&buffer); + content = cos_buf_pack(p, str, strlen(str)); + cos_list_add_tail(&content->node, &buffer); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_append_object_from_buffer(options, &bucket, &object, + position, &buffer, headers1, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + cos_pool_destroy(p); + + printf("test_append_object_from_buffer2 ok\n"); +} + void test_append_object_from_file(CuTest *tc) { cos_pool_t *p = NULL; @@ -716,6 +911,41 @@ void test_append_object_from_file(CuTest *tc) printf("test_append_object_from_file ok\n"); } +void test_append_object_from_file2(CuTest *tc) +{ + cos_pool_t *p = NULL; + char *object_name = "cos_test_append_object_from_file"; + cos_string_t bucket; + cos_string_t object; + char *filename = __FILE__; + cos_string_t append_file; + cos_status_t *s = NULL; + int is_cname = 0; + int64_t position = 0; + cos_table_t *headers = NULL; + cos_table_t *resp_headers = NULL; + cos_request_options_t *options = NULL; + + /* test append object */ + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + headers = cos_table_make(p, 0); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, object_name); + cos_str_set(&append_file, filename); + + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_append_object_from_file(options, &bucket, &object, position, + &append_file, headers, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + cos_pool_destroy(p); + + printf("test_append_object_from_file2 ok\n"); +} + void test_get_not_exist_object_to_file(CuTest *tc) { cos_pool_t *p = NULL; @@ -786,6 +1016,40 @@ void test_object_acl(CuTest *tc) cos_pool_destroy(p); } +void test_object_acl2(CuTest *tc) +{ + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_acl_e cos_acl = COS_ACL_PRIVATE; + cos_string_t bucket; + cos_string_t object; + cos_table_t *resp_headers = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "cos_test_put_object.ts"); + + //put acl + cos_string_t read; + cos_str_set(&read, "id=\"qcs::cam::uin/12345:uin/12345\", id=\"qcs::cam::uin/45678:uin/45678\""); + s = cos_put_object_acl(options, &bucket, &object, cos_acl, &read, NULL, NULL, &resp_headers); + CuAssertIntEquals(tc, 200, s->code); + + //get acl + cos_acl_params_t *acl_params2 = NULL; + acl_params2 = cos_create_acl_params(p); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_get_object_acl(options, &bucket, &object, acl_params2, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + printf("test_object_acl2 ok\n"); + cos_pool_destroy(p); +} + void test_object_copy(CuTest *tc) { cos_pool_t *p = NULL; @@ -816,6 +1080,39 @@ void test_object_copy(CuTest *tc) cos_pool_destroy(p); } + +void test_object_copy2(CuTest *tc) +{ + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t src_bucket; + cos_string_t src_object; + cos_string_t src_endpoint; + cos_table_t *resp_headers = NULL; + + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test_copy.txt"); + cos_str_set(&src_bucket, TEST_BUCKET_NAME); + cos_str_set(&src_object, "cos_test_put_object.ts"); + cos_str_set(&src_endpoint, options->config->endpoint.data); + + cos_copy_object_params_t *params = NULL; + params = cos_create_copy_object_params(p); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_copy_object(options, &src_bucket, &src_object, &src_endpoint, &bucket, &object, NULL, params, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + printf("test_object_copy2 ok\n"); + cos_pool_destroy(p); +} + void test_object_bigcopy(CuTest *tc) { cos_pool_t *p = NULL; @@ -849,6 +1146,10 @@ void test_object_bigcopy(CuTest *tc) s = copy(options, &src_bucket, &src_object, &src_endpoint, &bucket, &object, 1); CuAssertIntEquals(tc, 200, s->code); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = copy(options, &src_bucket, &src_object, &src_endpoint, &bucket, &object, 1); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); cos_pool_destroy(p); } @@ -870,6 +1171,10 @@ void test_presigned_url(CuTest *tc) res = cos_gen_presigned_url_safe(options, &bucket, &object, 300, HTTP_GET, NULL, NULL, 1, &presigned_url); CuAssertIntEquals(tc, 0, res); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + res = cos_gen_presigned_url_safe(options, &bucket, &object, 300, HTTP_GET, NULL, NULL, 1, &presigned_url); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, res); cos_pool_destroy(p); @@ -894,6 +1199,11 @@ void test_presigned_safe_url(CuTest *tc) res = cos_gen_presigned_url(options, &bucket, &object, 300, HTTP_GET, &presigned_url); CuAssertIntEquals(tc, 0, res); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + res = cos_gen_presigned_url(options, &bucket, &object, 300, HTTP_GET, &presigned_url); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, res); + cos_pool_destroy(p); } @@ -1001,6 +1311,64 @@ void test_object_tagging(CuTest *tc) printf("test_object_tagging ok\n"); } + +void test_object_tagging2(CuTest *tc) +{ + cos_pool_t *pool = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_table_t *resp_headers = NULL; + cos_string_t bucket; + cos_string_t object; + cos_string_t version_id = cos_string(""); + cos_tagging_params_t *params = NULL; + cos_tagging_params_t *result = NULL; + cos_tagging_tag_t *tag = NULL; + + //创建内存池 + cos_pool_create(&pool, NULL); + + //初始化请求选项 + options = cos_request_options_create(pool); + options->config = cos_config_create(options->pool); + + init_test_request_options(options, is_cname); + options->ctl = cos_http_controller_create(options->pool, 0); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test.xxxxxx"); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + + // put object tagging + params = cos_create_tagging_params(pool); + tag = cos_create_tagging_tag(pool); + cos_str_set(&tag->key, "age"); + cos_str_set(&tag->value, "18"); + cos_list_add_tail(&tag->node, ¶ms->node); + + tag = cos_create_tagging_tag(pool); + cos_str_set(&tag->key, "name"); + cos_str_set(&tag->value, "xiaoming"); + cos_list_add_tail(&tag->node, ¶ms->node); + + s = cos_put_object_tagging(options, &bucket, &object, &version_id, NULL, params, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + // get object tagging + result = cos_create_tagging_params(pool); + s = cos_get_object_tagging(options, &bucket, &object, &version_id, NULL, result, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + // delete tagging + s = cos_delete_object_tagging(options, &bucket, &object, &version_id, NULL, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + cos_pool_destroy(pool); + + printf("test_object_tagging2 ok\n"); +} + void test_object_restore(CuTest *tc) { cos_pool_t *p = NULL; @@ -1023,6 +1391,10 @@ void test_object_restore(CuTest *tc) s = cos_post_object_restore(options, &bucket, &object, restore_params, NULL, NULL, &resp_headers); CuAssertIntEquals(tc, 200, s->code); CuAssertPtrNotNull(tc, resp_headers); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = cos_post_object_restore(options, &bucket, &object, restore_params, NULL, NULL, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); cos_pool_destroy(p); @@ -1066,6 +1438,11 @@ void test_ci_image_process(CuTest *tc) CuAssertIntEquals(tc, 200, s->code); CuAssertPtrNotNull(tc, resp_headers); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = ci_put_object_from_file(options, &bucket, &object, &file, headers, &resp_headers, &results); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + cos_pool_destroy(p); } @@ -1092,6 +1469,10 @@ void test_ci_media_process_media_info(CuTest *tc) CuAssertIntEquals(tc, 200, s->code); CuAssertPtrNotNull(tc, resp_headers); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = ci_get_media_info(options, &bucket, &object, NULL, &resp_headers, &media_info); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); // 销毁内存池 cos_pool_destroy(p); } @@ -1154,6 +1535,50 @@ void test_ci_media_process_snapshot(CuTest *tc) cos_pool_destroy(p); } +void test_ci_media_process_snapshot2(CuTest *tc) +{ + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_table_t *resp_headers; + cos_list_t download_buffer; + cos_string_t object; + ci_get_snapshot_request_t *snapshot_request; + cos_buf_t *content = NULL; + cos_string_t pic_file = cos_string("snapshot.jpg"); + + // 基本配置 + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + init_test_request_options(options, is_cname); + cos_str_set(&bucket, TEST_BUCKET_NAME); + cos_str_set(&object, "test.mp4"); + + // 替换为您的配置信息，可参见文档 https://cloud.tencent.com/document/product/436/55671 + snapshot_request = ci_snapshot_request_create(p); + snapshot_request->time = 7.5; + snapshot_request->width = 0; + snapshot_request->height = 0; + cos_str_set(&snapshot_request->format, "jpg"); + cos_str_set(&snapshot_request->rotate, "auto"); + cos_str_set(&snapshot_request->mode, "exactframe"); + cos_list_init(&download_buffer); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + + s = ci_get_snapshot_to_buffer(options, &bucket, &object, snapshot_request, NULL, &download_buffer, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + + s = ci_get_snapshot_to_file(options, &bucket, &object, snapshot_request, NULL, &pic_file, &resp_headers); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + // 销毁内存池 + cos_pool_destroy(p); +} + void test_ci_media_process_media_bucket(CuTest *tc) { cos_pool_t *p = NULL; @@ -1186,6 +1611,10 @@ void test_ci_media_process_media_bucket(CuTest *tc) CuAssertIntEquals(tc, 200, s->code); CuAssertPtrNotNull(tc, resp_headers); + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = ci_describe_media_buckets(options, media_buckets_request, NULL, &resp_headers, &media_buckets_result); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); // 销毁内存池 cos_pool_destroy(p); } @@ -1245,6 +1674,56 @@ void test_ci_video_auditing(CuTest *tc) cos_pool_destroy(p); } +void test_ci_video_auditing2(CuTest *tc) +{ + cos_pool_t *p = NULL; + int is_cname = 0; + cos_status_t *s = NULL; + cos_request_options_t *options = NULL; + cos_string_t bucket; + cos_table_t *resp_headers; + ci_video_auditing_job_options_t *job_options; + ci_video_auditing_job_result_t *job_result; + ci_auditing_job_result_t *auditing_result; + + // 基本配置 + cos_pool_create(&p, NULL); + options = cos_request_options_create(p); + options->config = cos_config_create(options->pool); + cos_str_set(&options->config->endpoint, TEST_CI_ENDPOINT); // https://ci..myqcloud.com + cos_str_set(&options->config->access_key_id, TEST_ACCESS_KEY_ID); + cos_str_set(&options->config->access_key_secret, TEST_ACCESS_KEY_SECRET); + cos_str_set(&options->config->appid, TEST_APPID); + options->config->is_cname = is_cname; + options->ctl = cos_http_controller_create(options->pool, 0); + cos_str_set(&bucket, TEST_BUCKET_NAME); + + // 替换为您的配置信息，可参见文档 https://cloud.tencent.com/document/product/436/47316 + job_options = ci_video_auditing_job_options_create(p); + cos_str_set(&job_options->input_object, "test.mp4"); + cos_str_set(&job_options->job_conf.detect_type, "Porn,Terrorism,Politics,Ads"); + cos_str_set(&job_options->job_conf.callback_version, "Detail"); + job_options->job_conf.detect_content = 1; + cos_str_set(&job_options->job_conf.snapshot.mode, "Interval"); + job_options->job_conf.snapshot.time_interval = 1.5; + job_options->job_conf.snapshot.count = 10; + + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + // 提交一个视频审核任务 + + s = ci_create_video_auditing_job(options, &bucket, job_options, NULL, &resp_headers, &job_result); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + + cos_string_t job_id; + cos_str_set(&job_id, "test.mp4"); + // 获取审核任务结果 + s = ci_get_auditing_job(options, &bucket, &job_id, NULL, &resp_headers, &auditing_result); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); + // 销毁内存池 + cos_pool_destroy(p); +} + void test_ci_image_qrcode(CuTest *tc) { cos_pool_t *p = NULL; @@ -1301,6 +1780,10 @@ void test_ci_image_qrcode(CuTest *tc) printf("Point: %s\n", content->point[3].data); } + options->config->access_key_secret.data = "\n"; + options->config->access_key_secret.len = 1; + s = ci_get_qrcode(options, &bucket, &object, 1, NULL, NULL, &resp_headers, &result2); + CuAssertIntEquals(tc, COSE_INVALID_ARGUMENT, s->code); //销毁内存池 cos_pool_destroy(p); } @@ -1341,6 +1824,17 @@ CuSuite *test_cos_object() SUITE_ADD_TEST(suite, test_object_cleanup); SUITE_ADD_TEST(suite, test_get_object_to_file_with_illega_getobject_key); SUITE_ADD_TEST(suite, test_get_object_to_buffer_with_illega_getobject_key); + SUITE_ADD_TEST(suite, test_get_object_to_file2); + SUITE_ADD_TEST(suite, test_get_object_to_buffer2); + SUITE_ADD_TEST(suite, test_put_object_from_buffer2); + SUITE_ADD_TEST(suite, test_ci_video_auditing2); + SUITE_ADD_TEST(suite, test_ci_media_process_snapshot2); + SUITE_ADD_TEST(suite, test_object_tagging2); + SUITE_ADD_TEST(suite, test_object_copy2); + SUITE_ADD_TEST(suite, test_object_acl2); + SUITE_ADD_TEST(suite, test_append_object_from_file2); + SUITE_ADD_TEST(suite, test_append_object_from_buffer2); + SUITE_ADD_TEST(suite, test_delete_object2); return suite; } From 978d0ade183b1b83848a6019c133dd0889f3c973 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 15:11:53 +0800 Subject: [PATCH 26/39] ut --- gen_lcov.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gen_lcov.sh b/gen_lcov.sh index 6cbdd2d..63d3d2c 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -14,15 +14,15 @@ make # init #cd .. -lcov -d CMakeFiles -z -lcov -d CMakeFiles -b . -no-external -initial -c -o arvinzhu_init.info +lcov -d build -z +lcov -d build -b . -no-external -initial -c -o arvinzhu_init.info # run cd build/Coverage/bin ./cos_c_sdk_ut # second cd ../../.. -lcov -d CMakeFiles -b . -no-external -c -o arvinzhu.info +lcov -d build -b . -no-external -c -o arvinzhu.info # filt lcov -extract arvinzhu_init.info ${EXTRACT} -o arvinzhu_init_filted.info From 4ffca71556bfd6f9d8a50880ad548e9f995a5f67 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 15:47:59 +0800 Subject: [PATCH 27/39] ut --- gen_lcov.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gen_lcov.sh b/gen_lcov.sh index 63d3d2c..1e4bbee 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -6,20 +6,20 @@ EXTRACT="${workspace}/cos_c_sdk/* ${workspace}/cos_c_sdk_ut/*" # clear rm UTReport -rf rm UTResport.tar -#cd build +mkdir -p build +cd build #cmake -DENABLE_COVERAGE=ON .. -cmake . -DCMAKE_BUILD_TYPE=Coverage -DBUILD_UNITTEST=ON -DMOCK_IS_SHOULD_RETRY=ON +cmake .. -DCMAKE_BUILD_TYPE=Coverage -DBUILD_UNITTEST=ON -DMOCK_IS_SHOULD_RETRY=ON make # init -#cd .. +cd .. lcov -d build -z lcov -d build -b . -no-external -initial -c -o arvinzhu_init.info # run -cd build/Coverage/bin -./cos_c_sdk_ut +./build/Coverage/bin/cos_c_sdk_ut # second cd ../../.. lcov -d build -b . -no-external -c -o arvinzhu.info From b8b1d3d30beb194ab0d2a93360813dda55e6b3d1 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 16:00:24 +0800 Subject: [PATCH 28/39] ut --- gen_lcov.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gen_lcov.sh b/gen_lcov.sh index 1e4bbee..7c2cdc4 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -19,9 +19,9 @@ lcov -d build -z lcov -d build -b . -no-external -initial -c -o arvinzhu_init.info # run -./build/Coverage/bin/cos_c_sdk_ut +./build/build/Coverage/bin/cos_c_sdk_ut # second -cd ../../.. + lcov -d build -b . -no-external -c -o arvinzhu.info # filt From 3e851c09307b7f0fb6fffd7f13bf8fb0d49ac444 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 16:19:50 +0800 Subject: [PATCH 29/39] ut --- cos_c_sdk_ut/test_cos_multipart.c | 1 + gen_lcov.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/cos_c_sdk_ut/test_cos_multipart.c b/cos_c_sdk_ut/test_cos_multipart.c index f2e8600..82d3478 100644 --- a/cos_c_sdk_ut/test_cos_multipart.c +++ b/cos_c_sdk_ut/test_cos_multipart.c @@ -1035,6 +1035,7 @@ CuSuite *test_cos_multipart() SUITE_ADD_TEST(suite, test_multipart_upload_from_file_change_domain); SUITE_ADD_TEST(suite, test_upload_file); SUITE_ADD_TEST(suite, test_upload_file_failed_without_uploadid); + SUITE_ADD_TEST(suite, test_upload_part_copy); SUITE_ADD_TEST(suite, test_upload_file_from_recover); SUITE_ADD_TEST(suite, test_upload_file_from_recover_failed); SUITE_ADD_TEST(suite, test_list_upload_part_with_empty); diff --git a/gen_lcov.sh b/gen_lcov.sh index 7c2cdc4..16640e7 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -28,6 +28,10 @@ lcov -d build -b . -no-external -c -o arvinzhu.info lcov -extract arvinzhu_init.info ${EXTRACT} -o arvinzhu_init_filted.info lcov -extract arvinzhu.info ${EXTRACT} -o arvinzhu_filted.info +REMOVE="${workspace}/cos_c_sdk_ut/cjson.c ${workspace}/cos_c_sdk_ut/cjson_utils.c ${workspace}/cos_c_sdk_ut/test_all.c" +lcov -remove arvinzhu.info ${REMOVE} -o arvinzhu_filted.info +rm arvinzhu.info +mv arvinzhu_filted.info arvinzhu.info # genhtml and zip genhtml -o UTReport -prefix=`pwd` arvinzhu_init_filted.info arvinzhu_filted.info tar -cvf UTReport.tar UTReport From f8a845128659a44bd006c7b7a4bfe658fa3d113a Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Sun, 26 May 2024 16:38:26 +0800 Subject: [PATCH 30/39] ut --- gen_lcov.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gen_lcov.sh b/gen_lcov.sh index 16640e7..f8de2bb 100755 --- a/gen_lcov.sh +++ b/gen_lcov.sh @@ -19,9 +19,10 @@ lcov -d build -z lcov -d build -b . -no-external -initial -c -o arvinzhu_init.info # run -./build/build/Coverage/bin/cos_c_sdk_ut +cd build/build/Coverage/ +./bin/cos_c_sdk_ut # second - +cd ../../.. lcov -d build -b . -no-external -c -o arvinzhu.info # filt From e65a56ba55335d7c7f9c73870fa9294590a25c07 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Mon, 17 Jun 2024 11:19:31 +0800 Subject: [PATCH 31/39] do not reuse the curl handle when returned value is not CURLE_OK. --- cos_c_sdk/cos_http_io.c | 21 +++++++++++++++++++++ cos_c_sdk/cos_http_io.h | 1 + cos_c_sdk/cos_transport.c | 7 ++++--- cos_c_sdk/cos_transport.h | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/cos_c_sdk/cos_http_io.c b/cos_c_sdk/cos_http_io.c index 3df997d..4dc5597 100644 --- a/cos_c_sdk/cos_http_io.c +++ b/cos_c_sdk/cos_http_io.c @@ -63,6 +63,27 @@ void request_release(CURL *request) } } +void request_release2(cos_curl_http_transport_t* t) +{ + CURL* request = t->curl; + CURLcode code = t->curl_code; + apr_thread_mutex_lock(requestStackMutexG); + + // If the request stack is full, destroy this one + // else put this one at the front of the request stack; we do this because + // we want the most-recently-used curl handle to be re-used on the next + // request, to maximize our chances of re-using a TCP connection before it + // times out + if (requestStackCountG == COS_REQUEST_STACK_SIZE || code != CURLE_OK) { + apr_thread_mutex_unlock(requestStackMutexG); + curl_easy_cleanup(request); + } + else { + requestStackG[requestStackCountG++] = request; + apr_thread_mutex_unlock(requestStackMutexG); + } +} + void cos_set_default_request_options(cos_http_request_options_t *op) { cos_default_http_request_options = op; diff --git a/cos_c_sdk/cos_http_io.h b/cos_c_sdk/cos_http_io.h index 8dc0407..c4bb306 100644 --- a/cos_c_sdk/cos_http_io.h +++ b/cos_c_sdk/cos_http_io.h @@ -18,6 +18,7 @@ static APR_INLINE const char *cos_http_controller_get_reason(cos_http_controller CURL *cos_request_get(); void request_release(CURL *request); +void request_release2(cos_curl_http_transport_t* t); int cos_http_io_initialize(const char *user_agent_info, int flag); void cos_http_io_deinitialize(); diff --git a/cos_c_sdk/cos_transport.c b/cos_c_sdk/cos_transport.c index 6a0a50e..283985c 100644 --- a/cos_c_sdk/cos_transport.c +++ b/cos_c_sdk/cos_transport.c @@ -152,8 +152,8 @@ cos_http_transport_t *cos_curl_http_transport_create(cos_pool_t *p) cos_fstack_push(t->cleanup, t, func, 1); t->curl = cos_request_get(); - func.func1 = (cos_func1_pt)request_release; - cos_fstack_push(t->cleanup, t->curl, func, 1); + func.func1 = (cos_func1_pt)request_release2; + cos_fstack_push(t->cleanup, t, func, 1); t->header_callback = cos_curl_default_header_callback; t->read_callback = cos_curl_default_read_callback; @@ -487,7 +487,8 @@ int cos_curl_http_transport_perform(cos_http_transport_t *t_) code = curl_easy_perform(t->curl); t->controller->finish_time = apr_time_now(); cos_move_transport_state(t, TRANS_STATE_DONE); - + + t->curl_code = code; if ((code != CURLE_OK) && (t->controller->error_code == COSE_OK)) { ecode = cos_curl_code_to_status(code); if (ecode != COSE_OK) { diff --git a/cos_c_sdk/cos_transport.h b/cos_c_sdk/cos_transport.h index e29204d..682a933 100644 --- a/cos_c_sdk/cos_transport.h +++ b/cos_c_sdk/cos_transport.h @@ -144,6 +144,7 @@ struct cos_http_transport_s { struct cos_curl_http_transport_s { COS_HTTP_BASE_TRANSPORT_DEFINE CURL *curl; + CURLcode curl_code; char *url; struct curl_slist *headers; curl_read_callback header_callback; From 9416d7ef3b7f2399df3407712492c72dc51d5f32 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Mon, 17 Jun 2024 11:22:32 +0800 Subject: [PATCH 32/39] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_sys_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cos_c_sdk/cos_sys_define.h b/cos_c_sdk/cos_sys_define.h index a7901bf..7184527 100644 --- a/cos_c_sdk/cos_sys_define.h +++ b/cos_c_sdk/cos_sys_define.h @@ -132,7 +132,7 @@ typedef apr_array_header_t cos_array_header_t; #define CR (char) 13 #define CRLF "\x0d\x0a" -#define COS_VERSION "5.0.17" +#define COS_VERSION "5.0.18" #define COS_VER "cos-sdk-c/" COS_VERSION #define COS_HTTP_PREFIX "http://" From e98a2f25229f787bf158f9d2d03c5d68b3916ace Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Thu, 4 Jul 2024 19:40:58 +0800 Subject: [PATCH 33/39] =?UTF-8?q?Copy&Complete=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_multipart.c | 3 +++ cos_c_sdk/cos_object.c | 3 +++ cos_c_sdk/cos_status.c | 2 ++ cos_c_sdk/cos_status.h | 1 + cos_c_sdk/cos_utility.c | 18 ++++++++++++++++++ cos_c_sdk/cos_utility.h | 1 + cos_c_sdk_ut/test_cos_sys.c | 32 ++++++++++++++++++++++++++++++++ 7 files changed, 60 insertions(+) diff --git a/cos_c_sdk/cos_multipart.c b/cos_c_sdk/cos_multipart.c index 7dc4b76..aefff07 100644 --- a/cos_c_sdk/cos_multipart.c +++ b/cos_c_sdk/cos_multipart.c @@ -315,6 +315,9 @@ cos_status_t *cos_do_complete_multipart_upload(const cos_request_options_t *opti } cos_fill_read_response_header(resp, resp_headers); cos_fill_read_response_body(resp, resp_body); + if (resp->body_len == 0 || check_status_with_resp_body(&resp->body, resp->body_len, "ETag") != COS_TRUE){ + cos_status_set(s, COSE_SERVICE_ERROR, COS_SERVER_ERROR_CODE, "Server Error"); + } return s; } diff --git a/cos_c_sdk/cos_object.c b/cos_c_sdk/cos_object.c index 9919728..2614443 100644 --- a/cos_c_sdk/cos_object.c +++ b/cos_c_sdk/cos_object.c @@ -642,6 +642,9 @@ cos_status_t *cos_copy_object(const cos_request_options_t *options, res = cos_copy_object_parse_from_body(options->pool, &resp->body, copy_object_param); if (res != COSE_OK) cos_xml_error_status_set(s, res); + if (resp->body_len == 0 || check_status_with_resp_body(&resp->body, resp->body_len, "ETag") != COS_TRUE){ + cos_status_set(s, COSE_SERVICE_ERROR, COS_SERVER_ERROR_CODE, "Server Error"); + } return s; } diff --git a/cos_c_sdk/cos_status.c b/cos_c_sdk/cos_status.c index 6991a3a..f0ce03b 100644 --- a/cos_c_sdk/cos_status.c +++ b/cos_c_sdk/cos_status.c @@ -15,6 +15,7 @@ const char COS_INCONSISTENT_ERROR_CODE[] = "InconsistentError"; const char COS_CREATE_QUEUE_ERROR_CODE[] = "CreateQueueFail"; const char COS_CREATE_THREAD_POOL_ERROR_CODE[] = "CreateThreadPoolFail"; const char COS_LACK_OF_CONTENT_LEN_ERROR_CODE[] = "LackOfContentLength"; +const char COS_SERVER_ERROR_CODE[] = "ServerError"; cos_status_t *cos_status_create(cos_pool_t *p) @@ -28,6 +29,7 @@ cos_status_t *cos_status_dup(cos_pool_t *p, cos_status_t *src) dst->code = src->code; dst->error_code = apr_pstrdup(p, src->error_code); dst->error_msg = apr_pstrdup(p, src->error_msg); + dst->req_id = apr_pstrdup(p, src->req_id); return dst; } diff --git a/cos_c_sdk/cos_status.h b/cos_c_sdk/cos_status.h index de8d7e3..1bbbfd8 100644 --- a/cos_c_sdk/cos_status.h +++ b/cos_c_sdk/cos_status.h @@ -54,6 +54,7 @@ extern const char COS_INCONSISTENT_ERROR_CODE[]; extern const char COS_CREATE_QUEUE_ERROR_CODE[]; extern const char COS_CREATE_THREAD_POOL_ERROR_CODE[]; extern const char COS_LACK_OF_CONTENT_LEN_ERROR_CODE[]; +extern const char COS_SERVER_ERROR_CODE[]; COS_CPP_END diff --git a/cos_c_sdk/cos_utility.c b/cos_c_sdk/cos_utility.c index dc55d32..d1f6f81 100644 --- a/cos_c_sdk/cos_utility.c +++ b/cos_c_sdk/cos_utility.c @@ -169,6 +169,24 @@ int is_should_retry_endpoint(const cos_status_t *s, const char *str){ } #endif +int check_status_with_resp_body(cos_list_t *body, int64_t body_len,const char *target){ + cos_list_t *current = body->next; + int target_len = strlen(target); + while (current != body) + { + cos_buf_t *buf = (cos_buf_t *)current; + uint8_t *p; + for (p = buf->start; p < buf->last - target_len +1 ; ++p) + { + if (memcmp(p, target, target_len) == 0) { + return COS_TRUE; + } + } + current = current->next; + } + return COS_FALSE; +} + char ** split(const char * s, char delim, int * returnSize) { int n = strlen(s); char ** ans = (char **)malloc(sizeof(char *) * n); diff --git a/cos_c_sdk/cos_utility.h b/cos_c_sdk/cos_utility.h index f0f7589..9ab275d 100644 --- a/cos_c_sdk/cos_utility.h +++ b/cos_c_sdk/cos_utility.h @@ -30,6 +30,7 @@ int is_cos_domain(const cos_string_t *str); int is_should_retry(const cos_status_t *s, const char *str); int is_default_domain(const char *str); int is_should_retry_endpoint(const cos_status_t *s, const char *str); +int check_status_with_resp_body(cos_list_t *body, int64_t body_len, const char *target); int is_default_endpoint(const char *str); int change_host_suffix(char **endpoint); void change_endpoint_suffix(cos_string_t *endpoint); diff --git a/cos_c_sdk_ut/test_cos_sys.c b/cos_c_sdk_ut/test_cos_sys.c index aab0b58..bcdec1f 100644 --- a/cos_c_sdk_ut/test_cos_sys.c +++ b/cos_c_sdk_ut/test_cos_sys.c @@ -42,6 +42,38 @@ void test_cos_status_parse_from_body(CuTest *tc){ CuAssertIntEquals(tc, s.error_code, COS_UNKNOWN_ERROR_CODE); printf("test_cos_status_parse_from_body 400 1ok\n"); } + { + cos_list_t body; + cos_list_init(&body); + const char *buffer = "activetesttesttest"; + + cos_buf_t *b; + int len = strlen(buffer); + b = cos_create_buf(pool, len); + memcpy(b->pos, buffer, len); + b->last += len; + cos_list_add_tail(&b->node, &body); + cos_status_t s; + int res = check_status_with_resp_body(&body, strlen(buffer), "ETag"); + CuAssertIntEquals(tc, res, COS_TRUE); + printf("test_cos_status_parse_from_body 400 1ok\n"); + } + { + cos_list_t body; + cos_list_init(&body); + const char *buffer = "activetesttest"; + + cos_buf_t *b; + int len = strlen(buffer); + b = cos_create_buf(pool, len); + memcpy(b->pos, buffer, len); + b->last += len; + cos_list_add_tail(&b->node, &body); + cos_status_t s; + int res = check_status_with_resp_body(&body, strlen(buffer), "ETag"); + CuAssertIntEquals(tc, res, COS_FALSE); + printf("test_cos_status_parse_from_body 400 1ok\n"); + } { cos_list_t body; cos_list_init(&body); From dad63b0e3e966141c52a56f05bdb687820428a25 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 5 Jul 2024 10:34:31 +0800 Subject: [PATCH 34/39] =?UTF-8?q?=E5=88=86=E5=9D=97=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3complete=E5=A2=9E=E5=8A=A0=E5=A4=8D=E7=94=A8h?= =?UTF-8?q?eader=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_resumable.c | 45 +++++++++++++++++++++++++++++++ cos_c_sdk_ut/test_cos_resumable.c | 1 + 2 files changed, 46 insertions(+) diff --git a/cos_c_sdk/cos_resumable.c b/cos_c_sdk/cos_resumable.c index 8453423..3323da6 100644 --- a/cos_c_sdk/cos_resumable.c +++ b/cos_c_sdk/cos_resumable.c @@ -503,6 +503,20 @@ cos_status_t *cos_resumable_upload_file_without_cp(cos_request_options_t *option cos_build_thread_params(thr_params, part_num, parent_pool, options, bucket, object, filepath, headers , params, &upload_id, parts, results); + //提前拷贝header + int pos; + const cos_array_header_t *tarr; + const cos_table_entry_t *telts; + cos_table_t *cb_headers_temp = NULL; + if ( headers != NULL){ + cb_headers_temp = cos_table_make(parent_pool, 1); + tarr = cos_table_elts(headers); + telts = (cos_table_entry_t*)tarr->elts; + for (pos = 0; pos < tarr->nelts; ++pos) { + apr_table_set(cb_headers_temp, telts[pos].key, telts[pos].val); + } + } + // init upload cos_pool_create(&subpool, parent_pool); options->pool = subpool; @@ -600,6 +614,15 @@ cos_status_t *cos_resumable_upload_file_without_cp(cos_request_options_t *option apr_table_set(cb_headers, COS_CALLBACK_VAR, apr_table_get(headers, COS_CALLBACK_VAR)); } } + //增加header复用逻辑 + if (cb_headers_temp != NULL){ + if (cb_headers == NULL) cb_headers = cos_table_make(subpool, 1); + tarr = cos_table_elts(cb_headers_temp); + telts = (cos_table_entry_t*)tarr->elts; + for (pos = 0; pos < tarr->nelts; ++pos) { + apr_table_set(cb_headers, telts[pos].key, telts[pos].val); + } + } s = cos_do_complete_multipart_upload(options, bucket, object, &upload_id, &completed_part_list, cb_headers, NULL, resp_headers, resp_body); s = cos_status_dup(parent_pool, s); @@ -665,6 +688,19 @@ cos_status_t *cos_resumable_upload_file_with_cp(cos_request_options_t *options, apr_file_remove(checkpoint_path->data, parent_pool); } } + //提前拷贝header + int pos; + const cos_array_header_t *tarr; + const cos_table_entry_t *telts; + cos_table_t *cb_headers_temp = NULL; + if ( headers != NULL){ + cb_headers_temp = cos_table_make(parent_pool, 1); + tarr = cos_table_elts(headers); + telts = (cos_table_entry_t*)tarr->elts; + for (pos = 0; pos < tarr->nelts; ++pos) { + apr_table_set(cb_headers_temp, telts[pos].key, telts[pos].val); + } + } if (need_init_upload) { // init upload @@ -801,6 +837,15 @@ cos_status_t *cos_resumable_upload_file_with_cp(cos_request_options_t *options, apr_table_set(cb_headers, COS_CALLBACK_VAR, apr_table_get(headers, COS_CALLBACK_VAR)); } } + //增加header复用逻辑 + if (cb_headers_temp != NULL){ + if (cb_headers == NULL) cb_headers = cos_table_make(subpool, 1); + tarr = cos_table_elts(cb_headers_temp); + telts = (cos_table_entry_t*)tarr->elts; + for (pos = 0; pos < tarr->nelts; ++pos) { + apr_table_set(cb_headers, telts[pos].key, telts[pos].val); + } + } s = cos_do_complete_multipart_upload(options, bucket, object, &upload_id, &completed_part_list, cb_headers, NULL, resp_headers, resp_body); s = cos_status_dup(parent_pool, s); diff --git a/cos_c_sdk_ut/test_cos_resumable.c b/cos_c_sdk_ut/test_cos_resumable.c index 80b074a..6120aba 100644 --- a/cos_c_sdk_ut/test_cos_resumable.c +++ b/cos_c_sdk_ut/test_cos_resumable.c @@ -478,6 +478,7 @@ void test_resumable_upload_without_checkpoint(CuTest *tc) cos_str_set(&filename, "../../../cos_c_sdk_ut/test_3M.dat"); // upload object + apr_table_addn(headers, "test-header", "testheader"); clt_params = cos_create_resumable_clt_params_content(p, 1024 * 1024, 4, COS_FALSE, NULL); s = cos_resumable_upload_file(options, &bucket, &object, &filename, headers, NULL, clt_params, NULL, &resp_headers, &resp_body); From a6852a52b2be36e8a4d3d780be275fc79f17252f Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 5 Jul 2024 10:49:10 +0800 Subject: [PATCH 35/39] ut --- cos_c_sdk_ut/test_cos_resumable.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cos_c_sdk_ut/test_cos_resumable.c b/cos_c_sdk_ut/test_cos_resumable.c index 6120aba..7a5727a 100644 --- a/cos_c_sdk_ut/test_cos_resumable.c +++ b/cos_c_sdk_ut/test_cos_resumable.c @@ -888,6 +888,7 @@ void test_resumable_upload_with_checkpoint(CuTest *tc) cos_str_set(&filename, test_local_file); // upload object + apr_table_addn(headers, "test-header", "testheader"); clt_params = cos_create_resumable_clt_params_content(p, 1024 * 100, 3, COS_TRUE, NULL); s = cos_resumable_upload_file(options, &bucket, &object, &filename, headers, NULL, clt_params, NULL, &resp_headers, &resp_body); From 620ce1082eae9c66423f27c8b52b60a7a9864da6 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 5 Jul 2024 11:41:43 +0800 Subject: [PATCH 36/39] --- cos_c_sdk/cos_sys_util.c | 18 +++++++++--------- cos_c_sdk/cos_sys_util.h | 4 ++-- cos_c_sdk/cos_transport.c | 2 +- cos_c_sdk_test/cos_demo.c | 4 ++-- cos_c_sdk_ut/cos_test_util.c | 4 ++-- cos_c_sdk_ut/cos_test_util.h | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cos_c_sdk/cos_sys_util.c b/cos_c_sdk/cos_sys_util.c index 3df7e7d..d9980e1 100644 --- a/cos_c_sdk/cos_sys_util.c +++ b/cos_c_sdk/cos_sys_util.c @@ -557,16 +557,16 @@ int cos_url_decode(const char *in, char *out) } /* - * Convert a string to a long long integer. + * Convert a string to a int64_t integer. * * Ignores `locale' stuff. Assumes that the upper and lower case * alphabets and digits are each contiguous. */ -long long cos_strtoll(const char *nptr, char **endptr, int base) +int64_t cos_strtoll(const char *nptr, char **endptr, int base) { const char *s; /* LONGLONG */ - long long int acc, cutoff; + int64_t acc, cutoff; int c; int neg, any, cutlim; @@ -610,7 +610,7 @@ long long cos_strtoll(const char *nptr, char **endptr, int base) * followed by a legal input character, is too big. One that * is equal to this value may be valid or not; the limit * between valid and invalid numbers is then based on the last - * digit. For instance, if the range for long longs is + * digit. For instance, if the range for int64_ts is * [-9223372036854775808..9223372036854775807] and the input base * is 10, cutoff will be set to 922337203685477580 and cutlim to * either 7 (neg==0) or 8 (neg==1), meaning that if we have @@ -675,10 +675,10 @@ int64_t cos_atoi64(const char *nptr) return cos_strtoull(nptr, NULL, 10); } -unsigned long long cos_strtoull(const char *nptr, char **endptr, int base) +uint64_t cos_strtoull(const char *nptr, char **endptr, int base) { const char *s; - unsigned long long acc, cutoff; + uint64_t acc, cutoff; int c; int neg, any, cutlim; @@ -706,8 +706,8 @@ unsigned long long cos_strtoull(const char *nptr, char **endptr, int base) if (base == 0) base = c == '0' ? 8 : 10; - cutoff = ULLONG_MAX / (unsigned long long)base; - cutlim = ULLONG_MAX % (unsigned long long)base; + cutoff = ULLONG_MAX / (uint64_t)base; + cutlim = ULLONG_MAX % (uint64_t)base; for (acc = 0, any = 0;; c = (unsigned char) *s++) { if (isdigit(c)) c -= '0'; @@ -725,7 +725,7 @@ unsigned long long cos_strtoull(const char *nptr, char **endptr, int base) errno = ERANGE; } else { any = 1; - acc *= (unsigned long long)base; + acc *= (uint64_t)base; acc += c; } } diff --git a/cos_c_sdk/cos_sys_util.h b/cos_c_sdk/cos_sys_util.h index d644169..6ed7f33 100644 --- a/cos_c_sdk/cos_sys_util.h +++ b/cos_c_sdk/cos_sys_util.h @@ -68,7 +68,7 @@ int cos_url_decode(const char *in, char *out); * Ignores `locale' stuff. Assumes that the upper and lower case * alphabets and digits are each contiguous. */ -long long cos_strtoll(const char *nptr, char **endptr, int base); +int64_t cos_strtoll(const char *nptr, char **endptr, int base); /* * @brief Convert a string to int64_t. @@ -81,7 +81,7 @@ int64_t cos_atoi64(const char *nptr); * Ignores `locale' stuff. Assumes that the upper and lower case * alphabets and digits are each contiguous. **/ -unsigned long long cos_strtoull(const char *nptr, char **endptr, int base); +uint64_t cos_strtoull(const char *nptr, char **endptr, int base); /* * @brief Convert a string to uint64_t. diff --git a/cos_c_sdk/cos_transport.c b/cos_c_sdk/cos_transport.c index 283985c..23cc861 100644 --- a/cos_c_sdk/cos_transport.c +++ b/cos_c_sdk/cos_transport.c @@ -217,7 +217,7 @@ size_t cos_curl_default_header_callback(char *buffer, size_t size, size_t nitems static void cos_curl_transport_headers_done(cos_curl_http_transport_t *t) { - long http_code; + int32_t http_code; CURLcode code; const char *value; diff --git a/cos_c_sdk_test/cos_demo.c b/cos_c_sdk_test/cos_demo.c index 0c8e8d5..cdf802d 100644 --- a/cos_c_sdk_test/cos_demo.c +++ b/cos_c_sdk_test/cos_demo.c @@ -1387,9 +1387,9 @@ void make_rand_string(cos_pool_t *p, int len, cos_string_t *data) cos_str_set(data, str); } -unsigned long get_file_size(const char *file_path) +int64_t get_file_size(const char *file_path) { - unsigned long filesize = -1; + int64_t filesize = -1; struct stat statbuff; if(stat(file_path, &statbuff) < 0){ diff --git a/cos_c_sdk_ut/cos_test_util.c b/cos_c_sdk_ut/cos_test_util.c index 7f90ff5..1d0a15c 100644 --- a/cos_c_sdk_ut/cos_test_util.c +++ b/cos_c_sdk_ut/cos_test_util.c @@ -227,9 +227,9 @@ cos_status_t *abort_test_multipart_upload(const cos_request_options_t *options, return s; } -unsigned long get_file_size(const char *file_path) +int64_t get_file_size(const char *file_path) { - unsigned long filesize = -1; + int64_t filesize = -1; struct stat statbuff; if(stat(file_path, &statbuff) < 0){ diff --git a/cos_c_sdk_ut/cos_test_util.h b/cos_c_sdk_ut/cos_test_util.h index 7798d7e..062b747 100644 --- a/cos_c_sdk_ut/cos_test_util.h +++ b/cos_c_sdk_ut/cos_test_util.h @@ -47,7 +47,7 @@ cos_status_t *init_test_multipart_upload(const cos_request_options_t *options, c cos_status_t *abort_test_multipart_upload(const cos_request_options_t *options, const char *bucket_name, const char *object_name, cos_string_t *upload_id); -unsigned long get_file_size(const char *file_path); +int64_t get_file_size(const char *file_path); char *decrypt(const char *encrypted_str, cos_pool_t *pool); From 32a6252049b4c12a7602ad7dde07cda69e4684e6 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Fri, 5 Jul 2024 15:30:27 +0800 Subject: [PATCH 37/39] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_sys_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cos_c_sdk/cos_sys_define.h b/cos_c_sdk/cos_sys_define.h index 7184527..f7615f0 100644 --- a/cos_c_sdk/cos_sys_define.h +++ b/cos_c_sdk/cos_sys_define.h @@ -132,7 +132,7 @@ typedef apr_array_header_t cos_array_header_t; #define CR (char) 13 #define CRLF "\x0d\x0a" -#define COS_VERSION "5.0.18" +#define COS_VERSION "5.0.19" #define COS_VER "cos-sdk-c/" COS_VERSION #define COS_HTTP_PREFIX "http://" From 4ed339e724c7289706944b2bbb81dbc370336002 Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Mon, 8 Jul 2024 17:36:08 +0800 Subject: [PATCH 38/39] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dobject=5Fkey=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_utility.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cos_c_sdk/cos_utility.c b/cos_c_sdk/cos_utility.c index d1f6f81..c684f4e 100644 --- a/cos_c_sdk/cos_utility.c +++ b/cos_c_sdk/cos_utility.c @@ -213,11 +213,20 @@ char ** split(const char * s, char delim, int * returnSize) { return ans; } -int object_key_simplify_check(const char * path){ +int object_key_simplify_check(const char * object_path){ if (!get_object_key_simplify_check()){ return 1; } int namesSize = 0; + char *path; + if (object_path[0] == '/'){ + path = (char *)malloc(sizeof(char *) * (strlen(object_path) + 1)); + strcpy(path, object_path); + }else { + path = (char *)malloc(sizeof(char *) * (strlen(object_path) + 2)); + path[0] = '/'; + strcpy(path + 1, object_path); + } int n = strlen(path); char ** names = split(path, '/', &namesSize); char ** stack = (char **)malloc(sizeof(char *) * namesSize); @@ -253,6 +262,7 @@ int object_key_simplify_check(const char * path){ } free(names); free(stack); + free(path); if (strlen(ans) == 1 && ans[0] == '/'){ free(ans); return 0; From 32ee8f2c392826c4d531da6764b5d03b8589d06a Mon Sep 17 00:00:00 2001 From: huberyxxiao Date: Mon, 8 Jul 2024 17:43:32 +0800 Subject: [PATCH 39/39] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cos_c_sdk/cos_sys_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cos_c_sdk/cos_sys_define.h b/cos_c_sdk/cos_sys_define.h index f7615f0..a7b3a43 100644 --- a/cos_c_sdk/cos_sys_define.h +++ b/cos_c_sdk/cos_sys_define.h @@ -132,7 +132,7 @@ typedef apr_array_header_t cos_array_header_t; #define CR (char) 13 #define CRLF "\x0d\x0a" -#define COS_VERSION "5.0.19" +#define COS_VERSION "5.0.20" #define COS_VER "cos-sdk-c/" COS_VERSION #define COS_HTTP_PREFIX "http://"