feat(encryption): add kms key management

Samunroyu · Nov 22, 2023 · 8b64b58 · 8b64b58
1 parent 331ad18
commit 8b64b58
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 8 deletions.
diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt
@@ -58,7 +58,7 @@ set(MY_PROJ_SRC
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS 
-    absl::strings
+    absl_strings
     curl
     dsn_replication_common
     dsn.failure_detector

diff --git a/src/server/key_provider.h → src/replica/key_provider.h b/src/server/key_provider.h → src/replica/key_provider.h
diff --git a/src/utils/kms_client.cpp → src/replica/kms_client.cpp b/src/utils/kms_client.cpp → src/replica/kms_client.cpp
@@ -23,7 +23,7 @@
 #include "http/http_client.h"
 #include "http/http_method.h"
 #include "nlohmann/json.hpp"
-#include "utils/kms_client.h"
+#include "replica/kms_client.h"
 
 namespace dsn {
 namespace security {

diff --git a/src/runtime/security/kms_client.h → src/replica/kms_client.h b/src/runtime/security/kms_client.h → src/replica/kms_client.h
diff --git a/src/server/pegasus_kms_key_provider.cpp → src/replica/pegasus_kms_key_provider.cpp b/src/server/pegasus_kms_key_provider.cpp → src/replica/pegasus_kms_key_provider.cpp
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "server/pegasus_kms_key_provider.h"
+#include "replica/pegasus_kms_key_provider.h"
 #include "utils/errors.h"
 
 namespace dsn {

diff --git a/src/server/pegasus_kms_key_provider.h → src/replica/pegasus_kms_key_provider.h b/src/server/pegasus_kms_key_provider.h → src/replica/pegasus_kms_key_provider.h
@@ -20,8 +20,8 @@
 #include <string>
 #include <utility>
 
-#include "runtime/security/kms_client.h"
-#include "server/key_provider.h"
+#include "replica/kms_client.h"
+#include "replica/key_provider.h"
 #include "utils/errors.h"
 
 namespace dsn {

diff --git a/src/replica/replica_stub.cpp b/src/replica/replica_stub.cpp
@@ -80,7 +80,7 @@
 #include "runtime/rpc/serialization.h"
 #include "runtime/security/access_controller.h"
 #include "runtime/task/async_calls.h"
-#include "server/pegasus_kms_key_provider.h"
+#include "replica/pegasus_kms_key_provider.h"
 #include "split/replica_split_manager.h"
 #include "utils/command_manager.h"
 #include "utils/errors.h"

diff --git a/src/replica/replica_stub.h b/src/replica/replica_stub.h
@@ -70,6 +70,8 @@
 #include "runtime/task/task.h"
 #include "runtime/task/task_code.h"
 #include "runtime/task/task_tracker.h"
+#include "replica/pegasus_kms_key_provider.h"
+#include "replica_stub.h"
 #include "utils/autoref_ptr.h"
 #include "utils/error_code.h"
 #include "utils/flags.h"
@@ -493,6 +495,7 @@ class replica_stub : public serverlet<replica_stub>, public ref_counter
 
     std::unique_ptr<duplication_sync_timer> _duplication_sync_timer;
     std::unique_ptr<replica_backup_server> _backup_server;
+    std::unique_ptr<dsn::security::KeyProvider> key_provider;
 
     // command_handlers
     std::vector<std::unique_ptr<command_deregister>> _cmds;

diff --git a/src/runtime/security/CMakeLists.txt b/src/runtime/security/CMakeLists.txt
@@ -32,7 +32,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_INC_PATH "")
 
-set(MY_PROJ_LIBS absl::strings dsn_http curl gssapi_krb5)
+set(MY_PROJ_LIBS "")
 
 set(MY_PROJ_LIB_PATH "")
 

diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
@@ -31,7 +31,8 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
 
-set(MY_PROJ_LIBS absl::strings dsn_http curl gssapi_krb5 rocksdb)
+# set(MY_PROJ_LIBS absl::strings dsn_http curl gssapi_krb5 rocksdb)
+set(MY_PROJ_LIBS dsn_http rocksdb)
 
 # Extra files that will be installed
 set(MY_BINPLACES "")