SKALE-3023 add serverConfiguration command

SGXInfoServer.cpp

@@ -43,8 +43,14 @@
 shared_ptr <SGXInfoServer> SGXInfoServer::server = nullptr;
 shared_ptr <HttpServer> SGXInfoServer::httpServer = nullptr;
 
-SGXInfoServer::SGXInfoServer(AbstractServerConnector &connector, serverVersion_t type)
-        : AbstractInfoServer(connector, type) {}
+SGXInfoServer::SGXInfoServer(AbstractServerConnector &connector, serverVersion_t type,
+                             uint32_t _logLevel, bool _autoSign, bool _checkCerts, bool _generateTestKeys)
+        : AbstractInfoServer(connector, type) {
+    logLevel_ = _logLevel;
+    autoSign_ = _autoSign;
+    checkCerts_ = _checkCerts;
+    generateTestKeys_ = _generateTestKeys;
+}
 
 Json::Value SGXInfoServer::getAllKeysInfo() {
     Json::Value result;
@@ -72,13 +78,13 @@ Json::Value SGXInfoServer::getServerConfiguration() {
     Json::Value result;
 
     try {
-        result["autoConfirm"] = false;
-        result["logLevel"] = false;
-        result["enclaveLogLevel"] = false;
-        result["backupOption"] = false;
-        result["HTTPS"] = false;
-        result["autoSign"] = false;
-        result["createTestKeys"] = false;
+        result["autoConfirm"] = autoconfirm;
+        result["logLevel"] = logLevel_;
+        result["enterBackupKey"] = enterBackupKey;
+        result["useHTTPS"] = useHTTPS;
+        result["autoSign"] = autoSign_;
+        result["checkCerts"] = checkCerts_;
+        result["generateTestKeys"] = generateTestKeys_;
     } HANDLE_SGX_EXCEPTION(result)
 
     RETURN_SUCCESS(result)
@@ -99,9 +105,9 @@ Json::Value SGXInfoServer::isKeyExist(const string& key) {
     RETURN_SUCCESS(result)
 }
 
-int SGXInfoServer::initInfoServer() {
+int SGXInfoServer::initInfoServer(uint32_t _logLevel, bool _autoSign, bool _checkCerts, bool _generateTestKeys) {
     httpServer = make_shared<HttpServer>(BASE_PORT + 5);
-    server = make_shared<SGXInfoServer>(*httpServer, JSONRPC_SERVER_V2); // hybrid server (json-rpc 1.0 & 2.0)
+    server = make_shared<SGXInfoServer>(*httpServer, JSONRPC_SERVER_V2, _logLevel, _autoSign, _checkCerts, _generateTestKeys); // hybrid server (json-rpc 1.0 & 2.0)
 
     if (!server->StartListening()) {
         spdlog::error("Info server could not start listening on port {}", BASE_PORT + 5);

SGXInfoServer.h

@@ -35,7 +35,10 @@ using namespace std;
 class SGXInfoServer : public AbstractInfoServer {
     recursive_mutex m;
 
-    bool autoSign;
+    uint32_t logLevel_;
+    bool autoSign_;
+    bool checkCerts_;
+    bool generateTestKeys_;
 
     static shared_ptr <HttpServer> httpServer;
 
@@ -45,7 +48,8 @@ public:
 
     static shared_ptr <SGXInfoServer> getServer();
 
-    SGXInfoServer(AbstractServerConnector &connector, serverVersion_t type);
+    SGXInfoServer(AbstractServerConnector &connector, serverVersion_t type,
+                  uint32_t _logLevel, bool _autoSign, bool _checkCerts, bool _generateTestKeys);
 
     virtual Json::Value getAllKeysInfo();
 
@@ -55,7 +59,7 @@ public:
 
     virtual Json::Value isKeyExist(const string& key);
 
-    static int initInfoServer();
+    static int initInfoServer(uint32_t _logLevel, bool _autoSign, bool _checkCerts, bool _generateTestKeys);
 
 };
 

ServerInit.cpp

@@ -163,7 +163,7 @@ uint64_t initEnclave() {
 
 
 
-void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign) {
+void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign, bool _generateTestKeys) {
 
     static atomic<bool> sgxServerInited(false);
     static mutex initMutex;
@@ -203,7 +203,7 @@ void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign) {
         } else {
             SGXWalletServer::initHttpServer();
         }
-        SGXInfoServer::initInfoServer();
+        SGXInfoServer::initInfoServer(_logLevel, _checkCert, _autoSign, _generateTestKeys);
 
         sgxServerInited = true;
     } catch (SGXException &_e) {

ServerInit.h

@@ -32,7 +32,7 @@
 #define EXTERNC
 #endif
 
-EXTERNC void initAll(uint32_t  _logLevel, bool _checkCert, bool _autoSign);
+EXTERNC void initAll(uint32_t  _logLevel, bool _checkCert, bool _autoSign, bool _generateTestKeys);
 
 EXTERNC void initUserSpace();
 

sgx_util.cpp

@@ -29,19 +29,19 @@
 #include <unistd.h>
 
 int print_hashes(){
-  jsonrpc::HttpClient client("http://localhost:1028");
-  StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2);
-  std::cout << "Client inited" << std::endl;
-  std::cout << c.getUnsignedCSRs() << std::endl;
-  exit(0);
+    jsonrpc::HttpClient client("http://localhost:1028");
+    StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2);
+    std::cout << "Client inited" << std::endl;
+    std::cout << c.getUnsignedCSRs() << std::endl;
+    exit(0);
 }
 
 void sign_by_hash(std::string & hash, int status){
-  jsonrpc::HttpClient client("http://localhost:1028");
-  StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2);
-  std::cout << "Client inited" << std::endl;
-  std::cout << c.signByHash(hash, status) << std::endl;
-  exit(0);
+    jsonrpc::HttpClient client("http://localhost:1028");
+    StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2);
+    std::cout << "Client inited" << std::endl;
+    std::cout << c.signByHash(hash, status) << std::endl;
+    exit(0);
 }
 
 void getAllKeysInfo() {
@@ -67,7 +67,13 @@ void getServerConfiguration() {
     StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2);
     std::cout << "Info client inited" << std::endl;
     Json::Value response = c.getServerConfiguration();
-
+    std::cout << "OPTION autoConfitm certificates switched to " << response["autoConfitm"] << '\n';
+    std::cout << "OPTION logLevel switched to " << response["logLevel"] << '\n';
+    std::cout << "OPTION enterBackupKey switched to " << response["enterBackupKey"] << '\n';
+    std::cout << "OPTION useHTTPS switched to " << response["useHTTPS"] << '\n';
+    std::cout << "OPTION autoSign certificates switched to " << response["autoSign"] << '\n';
+    std::cout << "OPTION checkCerts switched to " << response["checkCerts"] << '\n';
+    std::cout << "OPTION generateTestKeys switched to " << response["generateTestKeys"] << '\n';
     exit(0);
 }
 
@@ -103,7 +109,7 @@ int main(int argc, char *argv[]) {
     exit(0);
   }
   std::string hash;
-  while ((opt = getopt(argc, argv, "ps:r:")) != -1) {
+  while ((opt = getopt(argc, argv, "ps:r:alci:")) != -1) {
       switch (opt) {
           case 'p': print_hashes();
                     break;

sgxwall.cpp

@@ -171,7 +171,7 @@ int main(int argc, char *argv[]) {
         enclaveLogLevel = L_TRACE;
     }
 
-    initAll(enclaveLogLevel, checkClientCertOption, autoSignClientCertOption);
+    initAll(enclaveLogLevel, checkClientCertOption, autoSignClientCertOption, generateTestKeys);
 
     ifstream is("sgx_data/4node.json");
 

testw.cpp

@@ -72,7 +72,7 @@ public:
     TestFixture() {
         TestUtils::resetDB();
         setOptions(L_INFO, false, true);
-        initAll(L_INFO, false, true);
+        initAll(L_INFO, false, true, false);
     }
 
     ~TestFixture() {
@@ -85,7 +85,7 @@ public:
     TestFixtureHTTPS() {
         TestUtils::resetDB();
         setOptions(L_INFO, true, true);
-        initAll(L_INFO, false, true);
+        initAll(L_INFO, false, true, false);
     }
 
     ~TestFixtureHTTPS() {
@@ -97,7 +97,7 @@ class TestFixtureNoResetFromBackup {
 public:
     TestFixtureNoResetFromBackup() {
         setFullOptions(L_INFO, false, true, true);
-        initAll(L_INFO, false, true);
+        initAll(L_INFO, false, true, false);
     }
 
     ~TestFixtureNoResetFromBackup() {
@@ -110,7 +110,7 @@ class TestFixtureNoReset {
 public:
     TestFixtureNoReset() {
         setOptions(L_INFO, false, true);
-        initAll(L_INFO, false, true);
+        initAll(L_INFO, false, true, false);
     }
 
     ~TestFixtureNoReset() {