Merge pull request #57 from volcengine/release_2.6.16

2.6.16 support set request header

Author: lingyun-tos

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Release Note
+
+### 2025.6.23 Version 2.6.16
+- 支持 请求指定请求头域
+
 ### 2025.4.19 Version 2.6.15
 - 支持 请求时携带客户端证书
 - 修复 默认流控实现中返回时间单位错误问题

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 project(ve-tos-cpp-sdk
-        VERSION 2.6.15
+        VERSION 2.6.16
         LANGUAGES CXX)
 
 # project settings

example/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-example
-        VERSION 2.6.15
+        VERSION 2.6.16
         LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} example.cc)

sdk/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-lib
-        VERSION 2.6.15
+        VERSION 2.6.16
         LANGUAGES CXX)
 set(SDK_HEADER
         include/auth/Credential.h

sdk/include/RequestBuilder.h

@@ -115,6 +115,13 @@ class RequestBuilder {
         requestDate_ = requestDate;
     }
 
+    const std::map<std::string, std::string>& getRequestHeader() const {
+        return requestHeader_;
+    }
+    void setRequestHeader(const std::map<std::string, std::string>& requestHeader) {
+        requestHeader_ = requestHeader;
+    }
+
     std::shared_ptr<TosRequest> Build(const std::string& method);
     std::shared_ptr<TosRequest> BuildControlRequest(const std::string& method);
     std::shared_ptr<TosRequest> Build(const std::string& method, std::shared_ptr<std::iostream> content);
@@ -142,5 +149,6 @@ class RequestBuilder {
     bool isCustomDomain_ = false;
 
     std::time_t requestDate_ = 0;
+    std::map<std::string, std::string> requestHeader_ = {};
 };
 }  // namespace VolcengineTos

sdk/include/TosClient.h

@@ -57,7 +57,7 @@
 #include "model/object/ModifyObjectInput.h"
 #include "model/object/ModifyObjectOutput.h"
 namespace VolcengineTos {
-static const char* TOS_SDK_VERSION = "v2.6.15";
+static const char* TOS_SDK_VERSION = "v2.6.16";
 #ifdef WIN32
 static const char* PLATFORM_NAME = "windows";
 #elif __linux__

sdk/include/model/GenericInput.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <ctime>
+#include <map>
 namespace VolcengineTos {
 
 class GenericInput {
@@ -16,7 +17,16 @@ class GenericInput {
     std::time_t getRequestDate() const {
         return requestDate_;
     }
+
+    const std::map<std::string, std::string>& getRequestHeader() const {
+        return requestHeader_;
+    }
+    void setRequestHeader(const std::map<std::string, std::string>& requestHeader) {
+        requestHeader_ = requestHeader;
+    }
+
 private:
     std::time_t requestDate_ = 0;
+    std::map<std::string, std::string> requestHeader_ = {};
 };
-}  // namespace VolcengineTos
+}  // namespace VolcengineTos

sdk/src/RequestBuilder.cc

@@ -3,6 +3,37 @@
 #include "auth/SignV4.h"
 using namespace VolcengineTos;
 
+// 合并 GenericInput RequestHeader 和请求中的 header
+void mergeRequestHeaderAndHeader(const std::map<std::string, std::string> &reqHeader, std::map<std::string, std::string> &header) {
+    if (reqHeader.empty())
+        return;
+
+    std::map<std::string, std::string> lower_header;
+    for (const auto& pair : header) {
+        lower_header[StringUtils::toLower(pair.first)] = pair.second;
+    }
+
+    auto iter = reqHeader.begin();
+    for (; iter != reqHeader.end(); iter++) {
+        if (iter->first.empty()) {
+            continue;
+        }
+
+        std::string key(iter->first);
+        std::string kk = StringUtils::toLower(key);
+
+        if (kk == "content-length" || kk == "host" || kk == "x-tos-date" ||
+            kk == "range" || kk == "transfer-encoding" || kk == "authorization" ||
+            kk == "date") {
+            continue;
+        }
+
+        if (lower_header.find(kk) == lower_header.end()) {
+            header.insert({iter->first, iter->second});  // 如果不存在，插入键值对
+        }
+    }
+}
+
 std::shared_ptr<TosRequest> RequestBuilder::build(const std::string& method) {
     std::string host, path;
     if (isCustomDomain_){
@@ -20,13 +51,15 @@ std::shared_ptr<TosRequest> RequestBuilder::build(const std::string& method) {
         }
     }
 
+    mergeRequestHeaderAndHeader(requestHeader_, headers_);
     auto req = std::make_shared<TosRequest>(scheme_, method, host, path, headers_, query_);
     req->setRequestDate(requestDate_);
     return req;
 }
 
 std::shared_ptr<TosRequest> RequestBuilder::buildControlRequest(const std::string& method) {
     std::string host = accountID_ + "." + controlHost_;
+    mergeRequestHeaderAndHeader(requestHeader_, headers_);
     auto req = std::make_shared<TosRequest>(scheme_, method, host, "/qospolicy", headers_, query_);
     req->setRequestDate(requestDate_);
     return req;
@@ -46,6 +79,7 @@ std::shared_ptr<TosRequest> RequestBuilder::buildSignedURL(const std::string& me
         path += object_;
     }
 
+    mergeRequestHeaderAndHeader(requestHeader_, headers_);
     auto req = std::make_shared<TosRequest>(scheme_, method, host, path, headers_, query_);
     req->setRequestDate(requestDate_);
     return req;

sdk/src/TosClientImpl.cc

@@ -7863,6 +7863,7 @@ RequestBuilder TosClientImpl::newBuilder(const std::string& accountID, const Gen
                              config_.isCustomDomain());
     rb.withHeader(http::HEADER_USER_AGENT, userAgent_);
     rb.setRequestDate(genericInput.getRequestDate());
+    rb.setRequestHeader(genericInput.getRequestHeader());
     return rb;
 }
 
@@ -7873,6 +7874,7 @@ RequestBuilder TosClientImpl::newBuilder(const std::string& bucket, const std::s
                              urlMode_, headers, queries,config_.isCustomDomain());
     rb.withHeader(http::HEADER_USER_AGENT, userAgent_);
     rb.setRequestDate(genericInput.getRequestDate());
+    rb.setRequestHeader(genericInput.getRequestHeader());
     return rb;
 }
 
@@ -7889,6 +7891,7 @@ RequestBuilder TosClientImpl::newBuilder(const std::string& bucket, const std::s
                              queries, config_.isCustomDomain());
     rb.withHeader(http::HEADER_USER_AGENT, userAgent_);
     rb.setRequestDate(genericInput.getRequestDate());
+    rb.setRequestHeader(genericInput.getRequestHeader());
     return rb;
 }
 RequestBuilder TosClientImpl::newBuilder(const std::string& bucket, const std::string& object,
@@ -7910,6 +7913,7 @@ RequestBuilder TosClientImpl::newBuilder(const std::string& bucket, const std::s
     rb.setAutoRecognizeContentType(builder.isAutoRecognizeContentType());
     rb.setRange(builder.getRange());
     rb.setRequestDate(genericInput.getRequestDate());
+    rb.setRequestHeader(genericInput.getRequestHeader());
     return rb;
 }
 

test/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-test
-        VERSION 2.6.15
+        VERSION 2.6.16
         LANGUAGES CXX)
 
 include(FetchContent)