From f927bdf57c9e02b4cbe64fcb6d323cb6dd87fc69 Mon Sep 17 00:00:00 2001 From: Huberyxiao <62415191+Huberyxiao@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#163)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 安全问题修复 * 单测补充 * 代码规范 --------- Co-authored-by: huberyxxiao Co-authored-by: wqingzhang --- .code.yml | 10 ++ include/cos_defines.h | 4 +- include/cos_params.h | 258 +++++++++++++++++------------------ src/op/cos_result.cpp | 2 +- src/response/bucket_resp.cpp | 6 +- src/response/object_resp.cpp | 6 +- src/util/string_util.cpp | 2 +- 7 files changed, 149 insertions(+), 139 deletions(-) create mode 100644 .code.yml diff --git a/.code.yml b/.code.yml new file mode 100644 index 0000000..013e03e --- /dev/null +++ b/.code.yml @@ -0,0 +1,10 @@ +version: 2022050909 + +source: + + test_source: + filepath_regex: ["unittest/.*", "unittest/src/.*"] + + third_party_source: + # 填写相对路径的正则表达式(相对于代码库根目录)，要求匹配到文件层级。 + filepath_regex: ["include/rapidxml/1.13/.*"] \ No newline at end of file diff --git a/include/cos_defines.h b/include/cos_defines.h index 5871d91..ad1a075 100644 --- a/include/cos_defines.h +++ b/include/cos_defines.h @@ -11,10 +11,10 @@ namespace qcloud_cos { -#define COS_CPP_SDK_VERSON "v5.5.11" +#define COS_CPP_SDK_VERSON "v5.5.12" /// 路径分隔符 -const std::string kPathDelimiter = "/"; +const char kPathDelimiter[] = "/"; /// 路径分隔符 const unsigned char kPathDelimiterChar = '/'; diff --git a/include/cos_params.h b/include/cos_params.h index 9e879fe..d3b5872 100644 --- a/include/cos_params.h +++ b/include/cos_params.h @@ -6,31 +6,31 @@ namespace qcloud_cos{ /// http header中的Authorization字段 -const std::string kHttpHeaderAuthorization = "Authorization"; +const char kHttpHeaderAuthorizatio[] = "Authorization"; //const std::string kParaCustomHeaders = "custom_headers"; -const std::string kHttpHeaderCacheControl = "Cache-Control"; -const std::string kHttpHeaderContentType = "Content-Type"; -const std::string kHttpHeaderContentLength = "Content-Length"; -const std::string kHttpHeaderContentDisposition = "Content-Disposition"; -const std::string kHttpHeaderContentLanguage = "Content-Language"; -const std::string kHttpHeaderContentEncoding = "Content-Encoding"; -const std::string kHttpHeaderContentRange = "Content-Range"; -const std::string kHttpHeaderExpires = "Expires"; -const std::string kHttpHeaderLastModified = "Last-Modified"; -const std::string kHttpHeaderConnection = "Connection"; -const std::string kHttpHeaderDate = "Date"; -const std::string kHttpHeaderServer = "Server"; -const std::string kHttpHeaderEtag = "ETag"; -const std::string kHttpHeaderLowerCaseEtag = "Etag"; - -const std::string kParaXCosMetaPrefix = "x-cos-meta-"; - -const std::string kParaMoveDstFileid = "dest_fileid"; -const std::string kParaMoveOverWrite = "to_over_write"; - -const std::string kParaListNum = "num"; -const std::string kParaListFlag = "list_flag"; -const std::string kParaListContext = "context"; +const char kHttpHeaderCacheControl[] = "Cache-Control"; +const char kHttpHeaderContentType[] = "Content-Type"; +const char kHttpHeaderContentLength[] = "Content-Length"; +const char kHttpHeaderContentDisposition[] = "Content-Disposition"; +const char kHttpHeaderContentLanguage[] = "Content-Language"; +const char kHttpHeaderContentEncoding[] = "Content-Encoding"; +const char kHttpHeaderContentRange[] = "Content-Range"; +const char kHttpHeaderExpires[] = "Expires"; +const char kHttpHeaderLastModified[] = "Last-Modified"; +const char kHttpHeaderConnection[] = "Connection"; +const char kHttpHeaderDate[] = "Date"; +const char kHttpHeaderServer[] = "Server"; +const char kHttpHeaderEtag[] = "ETag"; +const char kHttpHeaderLowerCaseEtag[] = "Etag"; + +const char kParaXCosMetaPrefix[] = "x-cos-meta-"; + +const char kParaMoveDstFileid[] = "dest_fileid"; +const char kParaMoveOverWrite[] = "to_over_write"; + +const char kParaListNum[] = "num"; +const char kParaListFlag[] = "list_flag"; +const char kParaListContext[] = "context"; // const std::string kParaErrorDesc = "parameter error"; // const std::string kNetworkErrorDesc = "network error"; @@ -39,137 +39,137 @@ const std::string kParaListContext = "context"; // const std::string kCanNotOpRootPath = "can not operator root folder"; // x-cos-meta-前缀 -const std::string kXCosMetaPrefix = "x-cos-meta-"; +const char kXCosMetaPrefix[] = "x-cos-meta-"; // Request Header -const std::string kReqHeaderEtag = "ETag"; -const std::string kReqHeaderLowerCaseEtag = "Etag"; -const std::string kReqHeaderContentLen = "Content-Length"; -const std::string kReqHeaderContentType = "Content-Type"; -const std::string kReqHeaderConnection = "Connection"; -const std::string kReqHeaderDate = "Date"; -const std::string kReqHeaderServer = "Server"; -const std::string kReqHeaderXCosReqId = "x-cos-request-id"; -const std::string kReqHeaderXCosTraceId = "x-cos-trace-id"; +const char kReqHeaderEtag[] = "ETag"; +const char kReqHeaderLowerCaseEtag[] = "Etag"; +const char kReqHeaderContentLen[] = "Content-Length"; +const char kReqHeaderContentType[] = "Content-Type"; +const char kReqHeaderConnection[] = "Connection"; +const char kReqHeaderDate[] = "Date"; +const char kReqHeaderServer[] = "Server"; +const char kReqHeaderXCosReqId[] = "x-cos-request-id"; +const char kReqHeaderXCosTraceId[] = "x-cos-trace-id"; // Response Header -const std::string kRespHeaderLastModified = "Last-Modified"; -const std::string kRespHeaderXCosObjectType = "x-cos-object-type"; -const std::string kRespHeaderXCosStorageClass = "x-cos-storage-class"; -const std::string kRespHeaderXCosHashCrc64Ecma = "x-cos-hash-crc64ecma"; -const std::string kRespHeaderXCosStorageTier = "x-cos-storage-tier"; -const std::string kRespHeaderXCosReqId = "x-cos-request-id"; -const std::string kRespHeaderXCosTraceId = "x-cos-trace-id"; -const std::string kRespHeaderXCosNextAppendPosition = "x-cos-next-append-position"; -const std::string kRespHeaderXCosContentSha1 = "x-cos-content-sha1"; -const std::string kRespHeaderXCosTaggingCount = "x-cos-tagging-count"; +const char kRespHeaderLastModified[] = "Last-Modified"; +const char kRespHeaderXCosObjectType[] = "x-cos-object-type"; +const char kRespHeaderXCosStorageClass[] = "x-cos-storage-class"; +const char kRespHeaderXCosHashCrc64Ecma[] = "x-cos-hash-crc64ecma"; +const char kRespHeaderXCosStorageTier[] = "x-cos-storage-tier"; +const char kRespHeaderXCosReqId[] = "x-cos-request-id"; +const char kRespHeaderXCosTraceId[] = "x-cos-trace-id"; +const char kRespHeaderXCosNextAppendPosition[] = "x-cos-next-append-position"; +const char kRespHeaderXCosContentSha1[] = "x-cos-content-sha1"; +const char kRespHeaderXCosTaggingCount[] = "x-cos-tagging-count"; // doc preview response header -const std::string kRespHeaderXTotalPage = "X-Total-Page"; -const std::string kRespHeaderXErrNo = "X-ErrNo"; -const std::string kRespHeaderXTotalSheet = "X-Total-Sheet"; -const std::string kRespHeaderXSheetName = "X-Sheet-Name"; +const char kRespHeaderXTotalPage[] = "X-Total-Page"; +const char kRespHeaderXErrNo[] = "X-ErrNo"; +const char kRespHeaderXTotalSheet[] = "X-Total-Sheet"; +const char kRespHeaderXSheetName[] = "X-Sheet-Name"; // V5 返回错误信息的xml node名 -const std::string kErrorRoot = "Error"; -const std::string kErrorCode = "Code"; -const std::string kErrorMessage = "Message"; -const std::string kErrorResource = "Resource"; -const std::string kErrorTraceId = "TraceId"; -const std::string kErrorRequestId = "RequestId"; -const std::string kErrorServerTime = "ServerTime"; +const char kErrorRoot[] = "Error"; +const char kErrorCode[] = "Code"; +const char kErrorMessage[] = "Message"; +const char kErrorResource[] = "Resource"; +const char kErrorTraceId[] = "TraceId"; +const char kErrorRequestId[] = "RequestId"; +const char kErrorServerTime[] = "ServerTime"; // GetBucketResponse XML node -const std::string kGetBucketRoot = "ListBucketResult"; -const std::string kGetBucketName = "Name"; -const std::string kGetBucketDelimiter = "Delimiter"; -const std::string kGetBucketEncodingType = "EncodingType"; -const std::string kGetBucketNextMarker = "NextMarker"; -const std::string kGetBucketPrefix = "Prefix"; -const std::string kGetBucketMarker = "Marker"; -const std::string kGetBucketMaxKeys = "MaxKeys"; -const std::string kGetBucketIsTruncated = "IsTruncated"; -const std::string kGetBucketCommonPrefixes = "CommonPrefixes"; -const std::string kGetBucketContents = "Contents"; -const std::string kGetBucketContentsKey = "Key"; -const std::string kGetBucketContentsLastModified = "LastModified"; -const std::string kGetBucketContentsETag = "ETag"; -const std::string kGetBucketContentsSize = "Size"; -const std::string kGetBucketContentsStorageClass = "StorageClass"; -const std::string kGetBucketContentsOwner = "Owner"; -const std::string kGetBucketContentsOwnerID = "ID"; +const char kGetBucketRoot[] = "ListBucketResult"; +const char kGetBucketName[] = "Name"; +const char kGetBucketDelimiter[] = "Delimiter"; +const char kGetBucketEncodingType[] = "EncodingType"; +const char kGetBucketNextMarker[] = "NextMarker"; +const char kGetBucketPrefix[] = "Prefix"; +const char kGetBucketMarker[] = "Marker"; +const char kGetBucketMaxKeys[] = "MaxKeys"; +const char kGetBucketIsTruncated[] = "IsTruncated"; +const char kGetBucketCommonPrefixes[] = "CommonPrefixes"; +const char kGetBucketContents[] = "Contents"; +const char kGetBucketContentsKey[] = "Key"; +const char kGetBucketContentsLastModified[] = "LastModified"; +const char kGetBucketContentsETag[] = "ETag"; +const char kGetBucketContentsSize[] = "Size"; +const char kGetBucketContentsStorageClass[] = "StorageClass"; +const char kGetBucketContentsOwner[] = "Owner"; +const char kGetBucketContentsOwnerID[] = "ID"; // ListMultipartUpload XML node -const std::string kListMultipartUploadRoot = "ListMultipartUploadsResult"; -const std::string kListMultipartUploadBucket = "Bucket"; -const std::string kListMultipartUploadMarker = "KeyMarker"; -const std::string kListMultipartUploadIdMarker = "UploadIdMarker"; -const std::string kListMultipartUploadNextKeyMarker = "NextKeyMarker"; -const std::string kListMultipartUploadNextUploadIdMarker = "NextUploadIdMarker"; -const std::string kListMultipartUploadMaxUploads = "MaxUploads"; -const std::string kListMultipartUploadUpload = "Upload"; -const std::string kListMultipartUploadKey = "Key"; -const std::string kListMultipartUploadId = "UploadId"; -const std::string kListMultipartUploadStorageClass = "StorageClass"; -const std::string kListMultipartUploadInitiator = "Initiator"; -const std::string kListMultipartUploadOwner = "Owner"; -const std::string kListMultipartUploadInitiated = "Initiated"; -const std::string kListMultipartUploadID = "ID"; -const std::string kListMultipartUploadDisplayName = "DisplayName"; +const char kListMultipartUploadRoot[] = "ListMultipartUploadsResult"; +const char kListMultipartUploadBucket[] = "Bucket"; +const char kListMultipartUploadMarker[] = "KeyMarker"; +const char kListMultipartUploadIdMarker[] = "UploadIdMarker"; +const char kListMultipartUploadNextKeyMarker[] = "NextKeyMarker"; +const char kListMultipartUploadNextUploadIdMarker[] = "NextUploadIdMarker"; +const char kListMultipartUploadMaxUploads[] = "MaxUploads"; +const char kListMultipartUploadUpload[] = "Upload"; +const char kListMultipartUploadKey[] = "Key"; +const char kListMultipartUploadId[] = "UploadId"; +const char kListMultipartUploadStorageClass[] = "StorageClass"; +const char kListMultipartUploadInitiator[] = "Initiator"; +const char kListMultipartUploadOwner[] = "Owner"; +const char kListMultipartUploadInitiated[] = "Initiated"; +const char kListMultipartUploadID[] = "ID"; +const char kListMultipartUploadDisplayName[] = "DisplayName"; // BucketReplicationResponse XML node -const std::string kBucketReplicationRoot = "ReplicationConfiguration"; -const std::string kBucketReplicationRule = "Rule"; -const std::string kBucketReplicationID = "ID"; -const std::string kBucketReplicationRole = "Role"; -const std::string kBucketReplicationPrefix = "Prefix"; -const std::string kBucketReplicationStatus = "Status"; -const std::string kBucketReplicationDestination = "Destination"; -const std::string kBucketReplicationBucket = "Bucket"; -const std::string kBucketReplicationStorageClass = "StorageClass"; +const char kBucketReplicationRoot[] = "ReplicationConfiguration"; +const char kBucketReplicationRule[] = "Rule"; +const char kBucketReplicationID[] = "ID"; +const char kBucketReplicationRole[] = "Role"; +const char kBucketReplicationPrefix[] = "Prefix"; +const char kBucketReplicationStatus[] = "Status"; +const char kBucketReplicationDestination[] = "Destination"; +const char kBucketReplicationBucket[] = "Bucket"; +const char kBucketReplicationStorageClass[] = "StorageClass"; // InitMultiUploadResp XML node -const std::string kInitiateMultipartUploadRoot = "InitiateMultipartUploadResult"; -const std::string kInitiateMultipartUploadBucket = "Bucket"; -const std::string kInitiateMultipartUploadKey = "Key"; -const std::string kInitiateMultipartUploadId = "UploadId"; +const char kInitiateMultipartUploadRoot[] = "InitiateMultipartUploadResult"; +const char kInitiateMultipartUploadBucket[] = "Bucket"; +const char kInitiateMultipartUploadKey[] = "Key"; +const char kInitiateMultipartUploadId[] = "UploadId"; // CompleteMultiUploadResp XML node -const std::string kCompleteMultiUploadRoot = "CompleteMultipartUploadResult"; -const std::string kCompleteMultiUploadLocation = "Location"; -const std::string kCompleteMultiUploadBucket = "Bucket"; -const std::string kCompleteMultiUploadKey = "Key"; -const std::string kCompleteMultiUploadETag = "ETag"; +const char kCompleteMultiUploadRoot[] = "CompleteMultipartUploadResult"; +const char kCompleteMultiUploadLocation[] = "Location"; +const char kCompleteMultiUploadBucket[] = "Bucket"; +const char kCompleteMultiUploadKey[] = "Key"; +const char kCompleteMultiUploadETag[] = "ETag"; // StorageClass -const std::string kStorageClassStandard = "STANDARD"; -const std::string kStorageClassStandardIA = "STANDARD_IA"; -const std::string kStorageClassMAZStandard = "MAZ_STANDARD"; -const std::string kStorageClassMAZStandardIA = "MAZ_STANDARD_IA"; -const std::string kStorageClassIntelligentTiering = "INTELLIGENT_TIERING"; -const std::string kStorageClassArchive = "ARCHIVE"; -const std::string kStorageClassDeepArchive = "DEEP_ARCHIVE"; +const char kStorageClassStandard[] = "STANDARD"; +const char kStorageClassStandardIA[] = "STANDARD_IA"; +const char kStorageClassMAZStandard[] = "MAZ_STANDARD"; +const char kStorageClassMAZStandardIA[] = "MAZ_STANDARD_IA"; +const char kStorageClassIntelligentTiering[] = "INTELLIGENT_TIERING"; +const char kStorageClassArchive[] = "ARCHIVE"; +const char kStorageClassDeepArchive[] = "DEEP_ARCHIVE"; // Resumable download -const std::string kResumableDownloadTaskFileSuffix = ".cosresumabletask"; -const std::string kResumableDownloadFileName = "fileName"; -const std::string kResumableDownloadTaskLastModified = "lastModified"; -const std::string kResumableDownloadTaskContentLength = "contentLength"; -const std::string kResumableDownloadTaskEtag = "eTag"; -const std::string kResumableDownloadTaskCrc64ecma = "crc64ecma"; -const std::string kResumableDownloadResumeOffset = "resumeOffset"; +const char kResumableDownloadTaskFileSuffix[] = ".cosresumabletask"; +const char kResumableDownloadFileName[] = "fileName"; +const char kResumableDownloadTaskLastModified[] = "lastModified"; +const char kResumableDownloadTaskContentLength[] = "contentLength"; +const char kResumableDownloadTaskEtag[] = "eTag"; +const char kResumableDownloadTaskCrc64ecma[] = "crc64ecma"; +const char kResumableDownloadResumeOffset[] = "resumeOffset"; // 预设ACL -const std::string kAclDefault = "default"; -const std::string kAclPrivate = "private"; -const std::string kAclPublicRead = "public-read"; -const std::string kAclPublicReadWrite = "public-read-write"; -const std::string kAclAuthenticatedRead = "authenticated-read"; -const std::string kAclBucketOwnerRead = "bucket-owner-read"; +const char kAclDefault[] = "default"; +const char kAclPrivate[] = "private"; +const char kAclPublicRead[] = "public-read"; +const char kAclPublicReadWrite[] = "public-read-write"; +const char kAclAuthenticatedRead[] = "authenticated-read"; +const char kAclBucketOwnerRead[] = "bucket-owner-read"; // object type -const std::string kObjectTypeAppendable = "appendable"; -const std::string kObjectTypeNormal = "normal"; +const char kObjectTypeAppendable[] = "appendable"; +const char kObjectTypeNormal[] = "normal"; } // namespace qcloud_cos #endif diff --git a/src/op/cos_result.cpp b/src/op/cos_result.cpp index e25d351..3bf0500 100644 --- a/src/op/cos_result.cpp +++ b/src/op/cos_result.cpp @@ -41,7 +41,7 @@ bool CosResult::ParseFromHttpResponse( return false; } - rapidxml::xml_node<>* root = doc.first_node(kErrorRoot.c_str()); + rapidxml::xml_node<>* root = doc.first_node(kErrorRoot); if (NULL == root) { // SDK_LOG_INFO("Miss root node=Error, xml_body=%s", body.c_str()); // SetErrorMsg(body); diff --git a/src/response/bucket_resp.cpp b/src/response/bucket_resp.cpp index f9ad906..b9cd728 100644 --- a/src/response/bucket_resp.cpp +++ b/src/response/bucket_resp.cpp @@ -30,7 +30,7 @@ bool GetBucketResp::ParseFromXmlString(const std::string& body) { return false; } - rapidxml::xml_node<>* root = doc.first_node(kGetBucketRoot.c_str()); + rapidxml::xml_node<>* root = doc.first_node(kGetBucketRoot); if (NULL == root) { SDK_LOG_ERR("Miss root node=kGetBucketRoot, xml_body=%s", body.c_str()); return false; @@ -109,7 +109,7 @@ bool ListMultipartUploadResp::ParseFromXmlString(const std::string& body) { return false; } - rapidxml::xml_node<>* root = doc.first_node(kListMultipartUploadRoot.c_str()); + rapidxml::xml_node<>* root = doc.first_node(kListMultipartUploadRoot); if (NULL == root) { SDK_LOG_ERR("Miss root node=kListMultipartUploadRoot, xml_body=%s", body.c_str()); @@ -213,7 +213,7 @@ bool GetBucketReplicationResp::ParseFromXmlString(const std::string& body) { return false; } - rapidxml::xml_node<>* root = doc.first_node(kBucketReplicationRoot.c_str()); + rapidxml::xml_node<>* root = doc.first_node(kBucketReplicationRoot); if (NULL == root) { SDK_LOG_ERR("Miss root node=BucketReplicationRoot, xml_body=%s", body.c_str()); diff --git a/src/response/object_resp.cpp b/src/response/object_resp.cpp index d84da51..8b30b5f 100644 --- a/src/response/object_resp.cpp +++ b/src/response/object_resp.cpp @@ -36,7 +36,7 @@ bool InitMultiUploadResp::ParseFromXmlString(const std::string& body) { } rapidxml::xml_node<>* root = - doc.first_node(kInitiateMultipartUploadRoot.c_str()); + doc.first_node(kInitiateMultipartUploadRoot); if (NULL == root) { SDK_LOG_ERR("Miss root node=InitiateMultipartUploadResult, xml_body=%s", body.c_str()); @@ -71,7 +71,7 @@ bool CompleteMultiUploadResp::ParseFromXmlString(const std::string& body) { return false; } - rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot.c_str()); + rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot); if (NULL == root) { SDK_LOG_ERR("Miss root node=CompleteMultipartUploadResult, xml_body=%s", body.c_str()); @@ -105,7 +105,7 @@ bool MultiPutObjectResp::ParseFromXmlString(const std::string& body) { return false; } - rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot.c_str()); + rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot); if (NULL == root) { SDK_LOG_ERR("Miss root node=CompleteMultipartUploadResult, xml_body=%s", body.c_str()); diff --git a/src/util/string_util.cpp b/src/util/string_util.cpp index e3de424..38836e9 100644 --- a/src/util/string_util.cpp +++ b/src/util/string_util.cpp @@ -111,7 +111,7 @@ std::string StringUtil::JoinStrings(const std::vector& str_vec, } uint64_t StringUtil::StringToUint64(const std::string& str) { - unsigned long long temp = strtoull(str.c_str(), NULL, 10); + uint64_t temp = strtoull(str.c_str(), NULL, 10); return temp; }