diff --git a/VERSION b/VERSION index 5aa50598f..9d37f5ab1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.2031 \ No newline at end of file +1.36.2032 \ No newline at end of file diff --git a/alb/include/alibabacloud/alb/model/CreateListenerRequest.h b/alb/include/alibabacloud/alb/model/CreateListenerRequest.h index 09259fd7f..4daea9c0d 100644 --- a/alb/include/alibabacloud/alb/model/CreateListenerRequest.h +++ b/alb/include/alibabacloud/alb/model/CreateListenerRequest.h @@ -55,6 +55,8 @@ public: std::string xForwardedForClientCertSubjectDNAlias; bool xForwardedForClientSourceIpsEnabled; bool xForwardedForClientCertIssuerDNEnabled; + bool xForwardedForHostEnabled; + std::string xForwardedForProcessingMode; bool xForwardedForClientCertFingerprintEnabled; std::string xForwardedForClientCertIssuerDNAlias; bool xForwardedForProtoEnabled; diff --git a/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h b/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h index ae1e4bd2b..80d3cfded 100644 --- a/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h +++ b/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h @@ -63,6 +63,7 @@ namespace AlibabaCloud bool xForwardedForClientSourceIpsEnabled; std::string xForwardedForClientCertFingerprintAlias; bool xForwardedForClientCertFingerprintEnabled; + bool xForwardedForHostEnabled; std::string xForwardedForClientSourceIpsTrusted; std::string xForwardedForClientCertIssuerDNAlias; std::string xForwardedForClientCertClientVerifyAlias; @@ -72,6 +73,7 @@ namespace AlibabaCloud bool xForwardedForProtoEnabled; bool xForwardedForClientSrcPortEnabled; bool xForwardedForEnabled; + std::string xForwardedForProcessingMode; bool xForwardedForSLBPortEnabled; bool xForwardedForClientCertIssuerDNEnabled; bool xForwardedForClientCertClientVerifyEnabled; diff --git a/alb/include/alibabacloud/alb/model/ListListenersResult.h b/alb/include/alibabacloud/alb/model/ListListenersResult.h index c55748c1b..ee5022dfc 100644 --- a/alb/include/alibabacloud/alb/model/ListListenersResult.h +++ b/alb/include/alibabacloud/alb/model/ListListenersResult.h @@ -55,6 +55,7 @@ namespace AlibabaCloud bool xForwardedForClientSourceIpsEnabled; std::string xForwardedForClientCertFingerprintAlias; bool xForwardedForClientCertFingerprintEnabled; + bool xForwardedForHostEnabled; std::string xForwardedForClientSourceIpsTrusted; std::string xForwardedForClientCertIssuerDNAlias; std::string xForwardedForClientCertClientVerifyAlias; @@ -64,6 +65,7 @@ namespace AlibabaCloud bool xForwardedForProtoEnabled; bool xForwardedForClientSrcPortEnabled; bool xForwardedForEnabled; + std::string xForwardedForProcessingMode; bool xForwardedForSLBPortEnabled; bool xForwardedForClientCertIssuerDNEnabled; bool xForwardedForClientCertClientVerifyEnabled; diff --git a/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h b/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h index daef5e14a..aab6bdbb6 100644 --- a/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h +++ b/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h @@ -51,6 +51,8 @@ public: std::string xForwardedForClientCertSubjectDNAlias; bool xForwardedForClientSourceIpsEnabled; bool xForwardedForClientCertIssuerDNEnabled; + bool xForwardedForHostEnabled; + std::string xForwardedForProcessingMode; bool xForwardedForClientCertFingerprintEnabled; std::string xForwardedForClientCertIssuerDNAlias; bool xForwardedForProtoEnabled; diff --git a/alb/src/model/CreateListenerRequest.cc b/alb/src/model/CreateListenerRequest.cc index c5bd46852..594c9e381 100644 --- a/alb/src/model/CreateListenerRequest.cc +++ b/alb/src/model/CreateListenerRequest.cc @@ -136,6 +136,8 @@ void CreateListenerRequest::setXForwardedForConfig(const CreateListenerRequest:: setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertSubjectDNAlias", xForwardedForConfig.xForwardedForClientCertSubjectDNAlias); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientSourceIpsEnabled", xForwardedForConfig.xForwardedForClientSourceIpsEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNEnabled", xForwardedForConfig.xForwardedForClientCertIssuerDNEnabled ? "true" : "false"); + setParameter(std::string("XForwardedForConfig") + ".XForwardedForHostEnabled", xForwardedForConfig.xForwardedForHostEnabled ? "true" : "false"); + setParameter(std::string("XForwardedForConfig") + ".XForwardedForProcessingMode", xForwardedForConfig.xForwardedForProcessingMode); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertFingerprintEnabled", xForwardedForConfig.xForwardedForClientCertFingerprintEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNAlias", xForwardedForConfig.xForwardedForClientCertIssuerDNAlias); setParameter(std::string("XForwardedForConfig") + ".XForwardedForProtoEnabled", xForwardedForConfig.xForwardedForProtoEnabled ? "true" : "false"); diff --git a/alb/src/model/GetListenerAttributeResult.cc b/alb/src/model/GetListenerAttributeResult.cc index 29424734b..ff66f2281 100644 --- a/alb/src/model/GetListenerAttributeResult.cc +++ b/alb/src/model/GetListenerAttributeResult.cc @@ -151,6 +151,8 @@ void GetListenerAttributeResult::parse(const std::string &payload) xForwardedForConfig_.xForwardedForClientSrcPortEnabled = xForwardedForConfigNode["XForwardedForClientSrcPortEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForEnabled"].isNull()) xForwardedForConfig_.xForwardedForEnabled = xForwardedForConfigNode["XForwardedForEnabled"].asString() == "true"; + if(!xForwardedForConfigNode["XForwardedForProcessingMode"].isNull()) + xForwardedForConfig_.xForwardedForProcessingMode = xForwardedForConfigNode["XForwardedForProcessingMode"].asString(); if(!xForwardedForConfigNode["XForwardedForProtoEnabled"].isNull()) xForwardedForConfig_.xForwardedForProtoEnabled = xForwardedForConfigNode["XForwardedForProtoEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForSLBIdEnabled"].isNull()) @@ -161,6 +163,8 @@ void GetListenerAttributeResult::parse(const std::string &payload) xForwardedForConfig_.xForwardedForClientSourceIpsEnabled = xForwardedForConfigNode["XForwardedForClientSourceIpsEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].isNull()) xForwardedForConfig_.xForwardedForClientSourceIpsTrusted = xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].asString(); + if(!xForwardedForConfigNode["XForwardedForHostEnabled"].isNull()) + xForwardedForConfig_.xForwardedForHostEnabled = xForwardedForConfigNode["XForwardedForHostEnabled"].asString() == "true"; if(!value["CaEnabled"].isNull()) caEnabled_ = value["CaEnabled"].asString() == "true"; if(!value["GzipEnabled"].isNull()) diff --git a/alb/src/model/ListListenersResult.cc b/alb/src/model/ListListenersResult.cc index 718339c42..e966e9770 100644 --- a/alb/src/model/ListListenersResult.cc +++ b/alb/src/model/ListListenersResult.cc @@ -148,6 +148,8 @@ void ListListenersResult::parse(const std::string &payload) listenersObject.xForwardedForConfig.xForwardedForClientSrcPortEnabled = xForwardedForConfigNode["XForwardedForClientSrcPortEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForEnabled"].isNull()) listenersObject.xForwardedForConfig.xForwardedForEnabled = xForwardedForConfigNode["XForwardedForEnabled"].asString() == "true"; + if(!xForwardedForConfigNode["XForwardedForProcessingMode"].isNull()) + listenersObject.xForwardedForConfig.xForwardedForProcessingMode = xForwardedForConfigNode["XForwardedForProcessingMode"].asString(); if(!xForwardedForConfigNode["XForwardedForProtoEnabled"].isNull()) listenersObject.xForwardedForConfig.xForwardedForProtoEnabled = xForwardedForConfigNode["XForwardedForProtoEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForSLBIdEnabled"].isNull()) @@ -158,6 +160,8 @@ void ListListenersResult::parse(const std::string &payload) listenersObject.xForwardedForConfig.xForwardedForClientSourceIpsEnabled = xForwardedForConfigNode["XForwardedForClientSourceIpsEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].isNull()) listenersObject.xForwardedForConfig.xForwardedForClientSourceIpsTrusted = xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].asString(); + if(!xForwardedForConfigNode["XForwardedForHostEnabled"].isNull()) + listenersObject.xForwardedForConfig.xForwardedForHostEnabled = xForwardedForConfigNode["XForwardedForHostEnabled"].asString() == "true"; listeners_.push_back(listenersObject); } if(!value["MaxResults"].isNull()) diff --git a/alb/src/model/UpdateListenerAttributeRequest.cc b/alb/src/model/UpdateListenerAttributeRequest.cc index c4cb08e95..359d636ad 100644 --- a/alb/src/model/UpdateListenerAttributeRequest.cc +++ b/alb/src/model/UpdateListenerAttributeRequest.cc @@ -124,6 +124,8 @@ void UpdateListenerAttributeRequest::setXForwardedForConfig(const UpdateListener setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertSubjectDNAlias", xForwardedForConfig.xForwardedForClientCertSubjectDNAlias); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientSourceIpsEnabled", xForwardedForConfig.xForwardedForClientSourceIpsEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNEnabled", xForwardedForConfig.xForwardedForClientCertIssuerDNEnabled ? "true" : "false"); + setParameter(std::string("XForwardedForConfig") + ".XForwardedForHostEnabled", xForwardedForConfig.xForwardedForHostEnabled ? "true" : "false"); + setParameter(std::string("XForwardedForConfig") + ".XForwardedForProcessingMode", xForwardedForConfig.xForwardedForProcessingMode); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertFingerprintEnabled", xForwardedForConfig.xForwardedForClientCertFingerprintEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNAlias", xForwardedForConfig.xForwardedForClientCertIssuerDNAlias); setParameter(std::string("XForwardedForConfig") + ".XForwardedForProtoEnabled", xForwardedForConfig.xForwardedForProtoEnabled ? "true" : "false");