Cherry pick v3.0.1 (#4027)

* unify leader change and machine not found (#4022) Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com> * delete src/common/encryption src/common/base/stringunorderedmap (#3867) * delete src/common/encryption * encryption format code * Update error message when connect with an out-of-date client (#4021) * Update error message * Do clientAddr check before FLAGS_enable_authorize check * Fix typo Co-authored-by: yaphet <4414314+darionyaphet@users.noreply.github.com> Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com> Co-authored-by: yuehua.jia <3423893+jiayuehua@users.noreply.github.com>
vesoft-inc · Mar 14, 2022 · 2e938c7 · 2e938c7
1 parent db575a8
commit 2e938c7
Show file tree

Hide file tree

Showing 35 changed files with 48 additions and 280 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -746,7 +746,8 @@ void MetaClient::getResponse(Request req,
                 // succeeded
                 pro.setValue(respGen(std::move(resp)));
                 return;
-              } else if (code == nebula::cpp2::ErrorCode::E_LEADER_CHANGED) {
+              } else if (code == nebula::cpp2::ErrorCode::E_LEADER_CHANGED ||
+                         code == nebula::cpp2::ErrorCode::E_MACHINE_NOT_FOUND) {
                 updateLeader(resp.get_leader());
                 if (retry < retryLimit) {
                   evb->runAfterDelay(
@@ -772,8 +773,6 @@ void MetaClient::getResponse(Request req,
               } else if (code == nebula::cpp2::ErrorCode::E_CLIENT_SERVER_INCOMPATIBLE) {
                 pro.setValue(respGen(std::move(resp)));
                 return;
-              } else if (resp.get_code() == nebula::cpp2::ErrorCode::E_MACHINE_NOT_FOUND) {
-                updateLeader();
               }
               pro.setValue(this->handleResponse(resp));
             });  // then

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -15,7 +15,6 @@ nebula_add_subdirectory(http)
 nebula_add_subdirectory(stats)
 nebula_add_subdirectory(charset)
 nebula_add_subdirectory(algorithm)
-nebula_add_subdirectory(encryption)
 nebula_add_subdirectory(datatypes)
 nebula_add_subdirectory(conf)
 nebula_add_subdirectory(meta)

diff --git a/src/common/base/StringUnorderedMap.h b/src/common/base/StringUnorderedMap.h
diff --git a/src/common/encryption/Base64.cpp b/src/common/encryption/Base64.cpp
diff --git a/src/common/encryption/Base64.h b/src/common/encryption/Base64.h
diff --git a/src/common/encryption/CMakeLists.txt b/src/common/encryption/CMakeLists.txt
diff --git a/src/common/encryption/MD5Utils.cpp b/src/common/encryption/MD5Utils.cpp
diff --git a/src/common/encryption/MD5Utils.h b/src/common/encryption/MD5Utils.h
diff --git a/src/common/expression/test/CMakeLists.txt b/src/common/expression/test/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(expression_test_common_libs
     $<TARGET_OBJECTS:parser_obj>
     $<TARGET_OBJECTS:expression_obj>
-    $<TARGET_OBJECTS:encryption_obj>
     $<TARGET_OBJECTS:network_obj>
     $<TARGET_OBJECTS:fs_obj>
     $<TARGET_OBJECTS:stats_obj>

diff --git a/src/common/plugin/fulltext/FTUtils.h b/src/common/plugin/fulltext/FTUtils.h
@@ -6,14 +6,14 @@
 #ifndef COMMON_PLUGIN_FULLTEXT_UTILS_H_
 #define COMMON_PLUGIN_FULLTEXT_UTILS_H_
 
+#include <proxygen/lib/utils/CryptUtil.h>
+
 #include <boost/algorithm/string/replace.hpp>
 #include <iomanip>
 
 #include "common/base/Base.h"
 #include "common/base/CommonMacro.h"
 #include "common/datatypes/HostAddr.h"
-#include "common/encryption/Base64.h"
-#include "common/encryption/MD5Utils.h"
 
 #define CURL "/usr/bin/curl"
 #define XPUT " -XPUT"
@@ -141,7 +141,7 @@ struct DocIDTraits {
 
   static std::string column(const std::string& col) {
     // normalized column name is 32 bytes
-    return encryption::MD5Utils::md5Encode(col);
+    return proxygen::md5Encode(folly::StringPiece(col));
   }
 
   static std::string val(const std::string& v) {
@@ -158,9 +158,9 @@ struct DocIDTraits {
     // docId structure : partId(10bytes) + schemaId(10Bytes) +
     //                   columnName(32bytes) + encoded_val(max 344bytes)
     // the max length of docId is 512 bytes, still have about 100 bytes reserved
-    auto encoded = encryption::Base64::encode((item.val.size() > MAX_INDEX_TYPE_LENGTH)
-                                                  ? item.val.substr(0, MAX_INDEX_TYPE_LENGTH)
-                                                  : item.val);
+    auto encoded = proxygen::base64Encode(folly::StringPiece(
+        (item.val.size() > MAX_INDEX_TYPE_LENGTH) ? item.val.substr(0, MAX_INDEX_TYPE_LENGTH)
+                                                  : item.val));
     std::replace(encoded.begin(), encoded.end(), '/', '_');
     std::stringstream ss;
     ss << id(item.part) << column(item.column) << encoded;

diff --git a/src/common/plugin/fulltext/test/CMakeLists.txt b/src/common/plugin/fulltext/test/CMakeLists.txt
@@ -11,7 +11,6 @@ nebula_add_test(
         $<TARGET_OBJECTS:base_obj>
         $<TARGET_OBJECTS:network_obj>
         $<TARGET_OBJECTS:fs_obj>
-        $<TARGET_OBJECTS:encryption_obj>
         $<TARGET_OBJECTS:process_obj>
         $<TARGET_OBJECTS:ft_es_storage_adapter_obj>
         $<TARGET_OBJECTS:ft_es_graph_adapter_obj>

diff --git a/src/common/plugin/fulltext/test/FulltextPluginTest.cpp b/src/common/plugin/fulltext/test/FulltextPluginTest.cpp
@@ -6,7 +6,6 @@
 #include <gtest/gtest.h>
 
 #include "common/base/Base.h"
-#include "common/encryption/MD5Utils.h"
 #include "common/network/NetworkUtils.h"
 #include "common/plugin/fulltext/FTUtils.h"
 #include "common/plugin/fulltext/elasticsearch/ESGraphAdapter.h"

diff --git a/src/common/utils/test/CMakeLists.txt b/src/common/utils/test/CMakeLists.txt
@@ -93,7 +93,6 @@ nebula_add_test(
         $<TARGET_OBJECTS:datatypes_obj>
         $<TARGET_OBJECTS:wkt_wkb_io_obj>
         $<TARGET_OBJECTS:process_obj>
-        $<TARGET_OBJECTS:encryption_obj>
         $<TARGET_OBJECTS:ft_es_storage_adapter_obj>
     LIBRARIES
         ${THRIFT_LIBRARIES}

diff --git a/src/daemons/CMakeLists.txt b/src/daemons/CMakeLists.txt
@@ -16,7 +16,6 @@ set(common_deps
     $<TARGET_OBJECTS:ws_common_obj>
     $<TARGET_OBJECTS:process_obj>
     $<TARGET_OBJECTS:stats_obj>
-    $<TARGET_OBJECTS:encryption_obj>
     $<TARGET_OBJECTS:fs_obj>
     $<TARGET_OBJECTS:time_obj>
     $<TARGET_OBJECTS:network_obj>

diff --git a/src/graph/context/test/CMakeLists.txt b/src/graph/context/test/CMakeLists.txt
@@ -5,7 +5,6 @@
 SET(CONTEXT_TEST_LIBS
     $<TARGET_OBJECTS:charset_obj>
     $<TARGET_OBJECTS:datatypes_obj>
-    $<TARGET_OBJECTS:encryption_obj>
     $<TARGET_OBJECTS:expression_obj>
     $<TARGET_OBJECTS:function_manager_obj>
     $<TARGET_OBJECTS:wkt_wkb_io_obj>

diff --git a/src/graph/executor/admin/ChangePasswordExecutor.cpp b/src/graph/executor/admin/ChangePasswordExecutor.cpp
@@ -5,7 +5,8 @@
 
 #include "graph/executor/admin/ChangePasswordExecutor.h"
 
-#include "common/encryption/MD5Utils.h"
+#include <proxygen/lib/utils/CryptUtil.h>
+
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
@@ -22,8 +23,8 @@ folly::Future<Status> ChangePasswordExecutor::changePassword() {
   return qctx()
       ->getMetaClient()
       ->changePassword(*cpNode->username(),
-                       encryption::MD5Utils::md5Encode(*cpNode->newPassword()),
-                       encryption::MD5Utils::md5Encode(*cpNode->password()))
+                       proxygen::md5Encode(folly::StringPiece(*cpNode->newPassword())),
+                       proxygen::md5Encode(folly::StringPiece(*cpNode->password())))
       .via(runner())
       .thenValue([this](StatusOr<bool> &&resp) {
         SCOPED_TIMER(&execTime_);

diff --git a/src/graph/executor/admin/CreateUserExecutor.cpp b/src/graph/executor/admin/CreateUserExecutor.cpp
@@ -5,7 +5,8 @@
 
 #include "graph/executor/admin/CreateUserExecutor.h"
 
-#include "common/encryption/MD5Utils.h"
+#include <proxygen/lib/utils/CryptUtil.h>
+
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
@@ -22,7 +23,7 @@ folly::Future<Status> CreateUserExecutor::createUser() {
   return qctx()
       ->getMetaClient()
       ->createUser(*cuNode->username(),
-                   encryption::MD5Utils::md5Encode(*cuNode->password()),
+                   proxygen::md5Encode(folly::StringPiece(*cuNode->password())),
                    cuNode->ifNotExist())
       .via(runner())
       .thenValue([this](StatusOr<bool> resp) {

diff --git a/src/graph/executor/admin/UpdateUserExecutor.cpp b/src/graph/executor/admin/UpdateUserExecutor.cpp
@@ -2,10 +2,10 @@
  *
  * This source code is licensed under Apache 2.0 License.
  */
-
 #include "graph/executor/admin/UpdateUserExecutor.h"
 
-#include "common/encryption/MD5Utils.h"
+#include <proxygen/lib/utils/CryptUtil.h>
+
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
@@ -21,7 +21,7 @@ folly::Future<Status> UpdateUserExecutor::updateUser() {
   auto *uuNode = asNode<UpdateUser>(node());
   return qctx()
       ->getMetaClient()
-      ->alterUser(*uuNode->username(), encryption::MD5Utils::md5Encode(*uuNode->password()))
+      ->alterUser(*uuNode->username(), proxygen::md5Encode(folly::StringPiece(*uuNode->password())))
       .via(runner())
       .thenValue([this](StatusOr<bool> resp) {
         SCOPED_TIMER(&execTime_);