From f0cbed81f3df8fd342f4a5c80659acb74e6b24b6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 20 Sep 2021 12:22:56 +0200 Subject: [PATCH 1/2] disable auto-resend of not finished transactions on login-server restart --- login_server/src/cpp/ServerConfig.cpp | 19 ++----------------- login_server/src/cpp/ServerConfig.h | 1 + .../src/cpp/model/gradido/Transaction.cpp | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/login_server/src/cpp/ServerConfig.cpp b/login_server/src/cpp/ServerConfig.cpp index 81a7b2511..23cfba76a 100644 --- a/login_server/src/cpp/ServerConfig.cpp +++ b/login_server/src/cpp/ServerConfig.cpp @@ -57,6 +57,7 @@ namespace ServerConfig { int g_FakeLoginSleepTime = 820; std::string g_versionString = ""; bool g_disableEmail = false; + bool g_resendTransactionOnStart = false; ServerSetupType g_ServerSetupType = SERVER_TYPE_PRODUCTION; std::string g_devDefaultGroup = ""; std::string g_gRPCRelayServerFullURL; @@ -259,23 +260,7 @@ namespace ServerConfig { g_AllowUnsecureFlags = (AllowUnsecure)(g_AllowUnsecureFlags | UNSECURE_ALLOW_ALL_PASSWORDS); } - - g_gRPCRelayServerFullURL = cfg.getString("grpc.server", ""); - - // unsecure flags - //g_AllowUnsecureFlags - if (cfg.getInt("unsecure.allow_passwort_via_json_request", 0) == 1) { - g_AllowUnsecureFlags = (AllowUnsecure)(g_AllowUnsecureFlags | UNSECURE_PASSWORD_REQUESTS); - } - if (cfg.getInt("unsecure.allow_auto_sign_transactions", 0) == 1) { - g_AllowUnsecureFlags = (AllowUnsecure)(g_AllowUnsecureFlags | UNSECURE_AUTO_SIGN_TRANSACTIONS); - } - if (cfg.getInt("unsecure.allow_cors_all", 0) == 1) { - g_AllowUnsecureFlags = (AllowUnsecure)(g_AllowUnsecureFlags | UNSECURE_CORS_ALL); - } - if (cfg.getInt("unsecure.allow_all_passwords", 0) == 1) { - g_AllowUnsecureFlags = (AllowUnsecure)(g_AllowUnsecureFlags | UNSECURE_ALLOW_ALL_PASSWORDS); - } + g_resendTransactionOnStart = cfg.getBool("dev.resend_unfinished_transactions_on_start", false); return true; } diff --git a/login_server/src/cpp/ServerConfig.h b/login_server/src/cpp/ServerConfig.h index a5d4a7a38..7202cd62e 100644 --- a/login_server/src/cpp/ServerConfig.h +++ b/login_server/src/cpp/ServerConfig.h @@ -73,6 +73,7 @@ namespace ServerConfig { extern int g_FakeLoginSleepTime; extern std::string g_versionString; extern bool g_disableEmail; + extern bool g_resendTransactionOnStart; extern ServerSetupType g_ServerSetupType; extern std::string g_devDefaultGroup; extern std::string g_gRPCRelayServerFullURL; diff --git a/login_server/src/cpp/model/gradido/Transaction.cpp b/login_server/src/cpp/model/gradido/Transaction.cpp index 253d7b5f4..2bdbb9410 100644 --- a/login_server/src/cpp/model/gradido/Transaction.cpp +++ b/login_server/src/cpp/model/gradido/Transaction.cpp @@ -204,7 +204,7 @@ namespace model { } } // try not finished but signed transactions again - if (!finished) { + if (!finished && ServerConfig::g_resendTransactionOnStart) { transaction->ifEnoughSignsProceed(nullptr); } From 102fc586e9264965911be4217a597782ff7a1cdc Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 20 Sep 2021 18:51:05 +0200 Subject: [PATCH 2/2] change variable name according to name in config --- login_server/src/cpp/ServerConfig.cpp | 4 ++-- login_server/src/cpp/ServerConfig.h | 2 +- login_server/src/cpp/model/gradido/Transaction.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/login_server/src/cpp/ServerConfig.cpp b/login_server/src/cpp/ServerConfig.cpp index 23cfba76a..081d16768 100644 --- a/login_server/src/cpp/ServerConfig.cpp +++ b/login_server/src/cpp/ServerConfig.cpp @@ -57,7 +57,7 @@ namespace ServerConfig { int g_FakeLoginSleepTime = 820; std::string g_versionString = ""; bool g_disableEmail = false; - bool g_resendTransactionOnStart = false; + bool g_resendUnfinishedTransactionOnStart = false; ServerSetupType g_ServerSetupType = SERVER_TYPE_PRODUCTION; std::string g_devDefaultGroup = ""; std::string g_gRPCRelayServerFullURL; @@ -260,7 +260,7 @@ namespace ServerConfig { g_AllowUnsecureFlags = (AllowUnsecure)(g_AllowUnsecureFlags | UNSECURE_ALLOW_ALL_PASSWORDS); } - g_resendTransactionOnStart = cfg.getBool("dev.resend_unfinished_transactions_on_start", false); + g_resendUnfinishedTransactionOnStart = cfg.getBool("dev.resend_unfinished_transactions_on_start", false); return true; } diff --git a/login_server/src/cpp/ServerConfig.h b/login_server/src/cpp/ServerConfig.h index 7202cd62e..15ad52b2c 100644 --- a/login_server/src/cpp/ServerConfig.h +++ b/login_server/src/cpp/ServerConfig.h @@ -73,7 +73,7 @@ namespace ServerConfig { extern int g_FakeLoginSleepTime; extern std::string g_versionString; extern bool g_disableEmail; - extern bool g_resendTransactionOnStart; + extern bool g_resendUnfinishedTransactionOnStart; extern ServerSetupType g_ServerSetupType; extern std::string g_devDefaultGroup; extern std::string g_gRPCRelayServerFullURL; diff --git a/login_server/src/cpp/model/gradido/Transaction.cpp b/login_server/src/cpp/model/gradido/Transaction.cpp index 2bdbb9410..a1fd5790c 100644 --- a/login_server/src/cpp/model/gradido/Transaction.cpp +++ b/login_server/src/cpp/model/gradido/Transaction.cpp @@ -204,7 +204,7 @@ namespace model { } } // try not finished but signed transactions again - if (!finished && ServerConfig::g_resendTransactionOnStart) { + if (!finished && ServerConfig::g_resendUnfinishedTransactionOnStart) { transaction->ifEnoughSignsProceed(nullptr); }