review

arangodb · KVS85 · Sep 28, 2021 · Jul 22, 2021 · Jul 28, 2021 · Aug 10, 2021
commit 55c2cb1511aa98a7991d48e3515c4f0916e89410
diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js
@@ -369,7 +369,8 @@
     "ERROR_LICENSE_FEATURE_NOT_ENABLED" : { "code" : 9004, "message" : "feature is not enabled by the license" },
     "ERROR_LICENSE_RESOURCE_EXHAUSTED" : { "code" : 9005, "message" : "the resource is exhausted" },
     "ERROR_LICENSE_INVALID"        : { "code" : 9006, "message" : "invalid license" },
-    "ERROR_LICENSE_CONFLICT"       : { "code" : 9007, "message" : "conflicting license" }
+    "ERROR_LICENSE_CONFLICT"       : { "code" : 9007, "message" : "conflicting license" },
+    "ERROR_LICENSE_VALIDATION_FAILED" : { "code" : 9008, "message" : "failed to validate license signature" }
   };
 
   // For compatibility with <= 3.3

diff --git a/lib/Basics/error-registry.h b/lib/Basics/error-registry.h
@@ -18,7 +18,7 @@ struct elsa<ErrorCode> {
 #include <cinttypes>
 
 namespace arangodb::error {
-constexpr static frozen::unordered_map<ErrorCode, const char*, 362> ErrorMessages = {
+constexpr static frozen::unordered_map<ErrorCode, const char*, 363> ErrorMessages = {
     {TRI_ERROR_NO_ERROR,  // 0
       "no error"},
     {TRI_ERROR_FAILED,  // 1
@@ -743,5 +743,7 @@ constexpr static frozen::unordered_map<ErrorCode, const char*, 362> ErrorMessage
       "invalid license"},
     {TRI_ERROR_LICENSE_CONFLICT,  // 9007
       "conflicting license"},
+    {TRI_ERROR_LICENSE_VALIDATION_FAILED,  // 9008
+      "failed to validate license signature"},
 };
 }
diff --git a/lib/Basics/errors.dat b/lib/Basics/errors.dat
@@ -533,4 +533,5 @@ ERROR_LICENSE_NON_MATCHING_ID,9003,"non-matching license id","The ID of the lice
 ERROR_LICENSE_FEATURE_NOT_ENABLED,9004,"feature is not enabled by the license","The installed license does not cover this feature."
 ERROR_LICENSE_RESOURCE_EXHAUSTED,9005,"the resource is exhausted","The installed license does not cover a higher number of this resource."
 ERROR_LICENSE_INVALID,9006,"invalid license","The license does not hold features of an ArangoDB license."
-ERROR_LICENSE_CONFLICT,9007,"conflicting license","The license has one or more inferior features."
+ERROR_LICENSE_CONFLICT,9007,"conflicting license","The license has one or more inferior features."
+ERROR_LICENSE_VALIDATION_FAILED,9008,"failed to validate license signature","Could not verify the license's signature."
diff --git a/lib/Basics/voc-errors.h b/lib/Basics/voc-errors.h
@@ -1952,3 +1952,8 @@ constexpr auto TRI_ERROR_LICENSE_INVALID
 /// The license has one or more inferior features.
 constexpr auto TRI_ERROR_LICENSE_CONFLICT                                        = ErrorCode{9007};
 
+/// 9008: ERROR_LICENSE_VALIDATION_FAILED
+/// "failed to validate license signature"
+/// Could not verify the license's signature.
+constexpr auto TRI_ERROR_LICENSE_VALIDATION_FAILED                               = ErrorCode{9008};
+
diff --git a/tests/Mocks/Servers.cpp b/tests/Mocks/Servers.cpp
@@ -859,7 +859,7 @@ MockCoordinator::MockCoordinator(bool start, bool useAgencyMock, bool injectClus
                         injectClusterIndexes) {
   if (start) {
     MockCoordinator::startFeatures();
-    agencyTrx(".agency", "{\"op\":\"set\",\"new\":{\"timeoutMult\":1,\"term\":1,\"size\":3,\"pool\":{\"AGNT-ca355865-7e34-40b8-91d4-198811e52f44\":\"tcp://[::1]:4001\",\"AGNT-93fa47f7-9f79-493e-b2da-b74487baccae\":\"tcp://[::1]:4003\",\"AGNT-93908f62-5414-4456-be37-2226651b8358\":\"tcp://[::1]:4002\"},\"id\":\"AGNT-ca355865-7e34-40b8-91d4-198811e52f44\",\"active\":[\"AGNT-93908f62-5414-4456-be37-2226651b8358\",\"AGNT-ca355865-7e34-40b8-91d4-198811e52f44\",\"AGNT-93fa47f7-9f79-493e-b2da-b74487baccae\"]}}");
+    agencyTrx("/.agency", R"=({"op":"set","new":{"timeoutMult":1,"term":1,"size":3,"pool":{"AGNT-ca355865-7e34-40b8-91d4-198811e52f44":"tcp://[::1]:4001","AGNT-93fa47f7-9f79-493e-b2da-b74487baccae":"tcp://[::1]:4003","AGNT-93908f62-5414-4456-be37-2226651b8358":"tcp://[::1]:4002"},"id":"AGNT-ca355865-7e34-40b8-91d4-198811e52f44","active":["AGNT-93908f62-5414-4456-be37-2226651b8358","AGNT-ca355865-7e34-40b8-91d4-198811e52f44","AGNT-93fa47f7-9f79-493e-b2da-b74487baccae"]}})=");
     MockCoordinator::createDatabase("_system");
   }
 }