This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-4.0-preview
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0-preview by this
push:
new f42e0fb0096 decrypt sk (#34174)
f42e0fb0096 is described below
commit f42e0fb0096db533d81fe79be01caba23dfd67b7
Author: AlexYue <yj976240...@gmail.com>
AuthorDate: Fri Apr 26 20:31:57 2024 +0800
decrypt sk (#34174)
---
be/src/util/s3_util.h | 4 ++--
cloud/src/meta-service/meta_service_resource.cpp | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/be/src/util/s3_util.h b/be/src/util/s3_util.h
index f2800abf042..2f3eedce748 100644
--- a/be/src/util/s3_util.h
+++ b/be/src/util/s3_util.h
@@ -111,8 +111,8 @@ struct S3Conf {
cloud::ObjectStoreInfoPB::Provider provider;
std::string to_string() const {
- return fmt::format("(bucket={}, prefix={}, client_conf={})", bucket,
prefix,
- client_conf.to_string());
+ return fmt::format("(bucket={}, prefix={}, client_conf={},
sse_enabled={})", bucket, prefix,
+ client_conf.to_string(), sse_enabled);
}
};
diff --git a/cloud/src/meta-service/meta_service_resource.cpp
b/cloud/src/meta-service/meta_service_resource.cpp
index a6b676ba6db..8d7a420ab59 100644
--- a/cloud/src/meta-service/meta_service_resource.cpp
+++ b/cloud/src/meta-service/meta_service_resource.cpp
@@ -277,6 +277,14 @@ void
MetaServiceImpl::get_obj_store_info(google::protobuf::RpcController* contro
storage_vault_start.push_back('\x00'); // Update to next smallest
key for iteration
} while (it->more());
}
+ for (auto& vault : *response->mutable_storage_vault()) {
+ if (vault.has_obj_info()) {
+ if (auto ret = decrypt_and_update_ak_sk(*vault.mutable_obj_info(),
code, msg);
+ ret != 0) {
+ return;
+ }
+ }
+ }
response->mutable_obj_info()->CopyFrom(instance.obj_info());
if (instance.has_default_storage_vault_id()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
