support x-oss-sign-origin-only sub resource

oss_c_sdk/oss_auth.c

@@ -37,6 +37,7 @@ static const char *g_s_oss_sub_resource_list[] = {
     "security-token",
     "objectMeta",
     "tagging",
+    "x-oss-sign-origin-only",
     NULL,
 };
 

oss_c_sdk/oss_define.c

@@ -81,4 +81,5 @@ const int MAX_SUFFIX_LEN = 1024;
 const char OSS_OBJECT_META[] = "objectMeta";
 const char OSS_SELECT_OBJECT_OUTPUT_RAW[] = "x-oss-select-output-raw";
 const char OSS_TAGGING[] = "tagging";
+const char OSS_SIGN_ORIGIN_ONLY[] = "x-oss-sign-origin-only";
 

oss_c_sdk/oss_define.h

@@ -112,6 +112,7 @@ extern const int MAX_SUFFIX_LEN;
 extern const char OSS_OBJECT_META[];
 extern const char OSS_SELECT_OBJECT_OUTPUT_RAW[];
 extern const char OSS_TAGGING[];
+extern const char OSS_SIGN_ORIGIN_ONLY[];
 
 typedef struct oss_lib_curl_initializer_s oss_lib_curl_initializer_t;
 

oss_c_sdk_test/test_oss_image.c

@@ -409,6 +409,96 @@ void put_example_image(CuTest *tc)
     aos_pool_destroy(p);
 }
 
+void test_get_object_with_sign_origin_only(CuTest *tc)
+{
+    aos_pool_t *p = NULL;
+    oss_request_options_t *options = NULL;
+    aos_table_t *headers = NULL;
+    aos_table_t *params = NULL;
+    aos_table_t *resp_headers = NULL;
+    aos_http_request_t *req = NULL;
+    aos_list_t buffer;
+    aos_status_t *s = NULL;
+    aos_string_t url;
+    apr_time_t now;
+    int two_minute = 120;
+    int is_cname = 0;
+    aos_string_t bucket;
+    aos_string_t object;
+    int64_t effective_time;
+    char *url_str = NULL;
+    char tmp_buff[1024];
+    image_info_t image_info;
+
+    /* put original image */
+    put_example_image(tc);
+
+    aos_pool_create(&p, NULL);
+    options = oss_request_options_create(p);
+    init_test_request_options(options, is_cname);
+    req = aos_http_request_create(p);
+    headers = aos_table_make(p, 0);
+    aos_str_set(&bucket, TEST_BUCKET_NAME);
+    aos_str_set(&object, original_image);
+
+    now = apr_time_now();
+    effective_time = now / 1000000 + two_minute;
+
+    /* not use x-oss-sign-origin-only for get_object_to_buffer */
+    req->method = HTTP_GET;
+    url_str = gen_test_signed_url(options, TEST_BUCKET_NAME,
+        original_image, effective_time, req);
+    aos_str_set(&url, url_str);
+    aos_list_init(&buffer);
+
+    s = oss_get_object_to_buffer_by_url(options, &url, headers, params,
+        &buffer, &resp_headers);
+    CuAssertIntEquals(tc, 200, s->code);
+
+    sprintf(tmp_buff, "%s&%s", url_str, "x-oss-process=image/crop,w_100,h_100,x_100,y_100,r_1");
+    aos_str_set(&url, tmp_buff);
+    aos_list_init(&buffer);
+    s = oss_get_object_to_buffer_by_url(options, &url, headers, params,
+        &buffer, &resp_headers);
+    CuAssertIntEquals(tc, 403, s->code);
+
+    /* use x-oss-sign-origin-only for get_object_to_buffer */
+    req->method = HTTP_GET;
+    apr_table_set(req->query_params, OSS_SIGN_ORIGIN_ONLY, "");
+    url_str = gen_test_signed_url(options, TEST_BUCKET_NAME,
+        original_image, effective_time, req);
+    aos_str_set(&url, url_str);
+    CuAssertTrue(tc, strstr(url_str, "x-oss-sign-origin-only") != NULL);
+    aos_list_init(&buffer);
+    s = oss_get_object_to_buffer_by_url(options, &url, headers, params,
+        &buffer, &resp_headers);
+    CuAssertIntEquals(tc, 200, s->code);
+
+    sprintf(tmp_buff, "%s&%s", url_str, "x-oss-process=image/crop,w_110,h_120,x_100,y_100,r_1");
+    aos_str_set(&url, tmp_buff);
+    aos_list_init(&buffer);
+    s = oss_get_object_to_buffer_by_url(options, &url, headers, params,
+        &buffer, &resp_headers);
+    CuAssertIntEquals(tc, 200, s->code);
+
+    /* put processed image */
+    aos_str_set(&object, processed_image);
+    s = oss_put_object_from_buffer(options, &bucket, &object, &buffer,
+        headers, &resp_headers);
+    CuAssertIntEquals(tc, 200, s->code);
+
+    /* check processed image */
+    s = get_image_info(options, TEST_BUCKET_NAME, processed_image, &image_info);
+    CuAssertIntEquals(tc, 200, s->code);
+    CuAssertIntEquals(tc, 120, image_info.height);
+    CuAssertIntEquals(tc, 110, image_info.width);
+    CuAssertStrEquals(tc, "jpg", image_info.format);
+
+    aos_pool_destroy(p);
+
+    printf("test_get_object_with_sign_origin_only ok\n");
+}
+
 CuSuite *test_oss_image()
 {
     CuSuite* suite = CuSuiteNew();
@@ -420,6 +510,7 @@ CuSuite *test_oss_image()
     SUITE_ADD_TEST(suite, test_sharpen_image);
     SUITE_ADD_TEST(suite, test_watermark_image);
     SUITE_ADD_TEST(suite, test_format_image);
+    SUITE_ADD_TEST(suite, test_get_object_with_sign_origin_only);
     SUITE_ADD_TEST(suite, test_image_cleanup);
 
     return suite;

oss_c_sdk_test/test_oss_object_tagging.c

@@ -256,7 +256,7 @@ void test_object_tagging_tag_list(CuTest *tc)
     aos_list_init(&tag_list);
     s = oss_put_object_tagging(options, &bucket, &object,
         &tag_list, &head_resp_headers);
-    CuAssertIntEquals(tc, 400, s->code);
+    CuAssertIntEquals(tc, 200, s->code);
     CuAssertPtrNotNull(tc, head_resp_headers);
 
     aos_pool_destroy(p);