diff --git a/services/tunnelbroker/docker-server/contents/server/src/Constants.h b/services/tunnelbroker/docker-server/contents/server/src/Constants.h index 5644993f2..96ed7292b 100644 --- a/services/tunnelbroker/docker-server/contents/server/src/Constants.h +++ b/services/tunnelbroker/docker-server/contents/server/src/Constants.h @@ -1,49 +1,50 @@ #pragma once #include #include #include namespace comm { namespace network { // AWS DynamoDB const std::string DEVICE_SESSIONS_TABLE_NAME = "tunnelbroker-device-session"; const std::string DEVICE_SESSIONS_VERIFICATION_MESSAGES_TABLE_NAME = "tunnelbroker-verification-message"; const std::string DEVICE_PUBLIC_KEY_TABLE_NAME = "tunnelbroker-public-key"; +const std::string MESSAGES_TABLE_NAME = "tunnelbroker-message"; // Sessions const size_t SIGNATURE_REQUEST_LENGTH = 64; const size_t SESSION_ID_LENGTH = 64; const size_t SESSION_RECORD_TTL = 30 * 24 * 3600; // 30 days const size_t SESSION_SIGN_RECORD_TTL = 24 * 3600; // 24 hours // gRPC Server const std::string SERVER_LISTEN_ADDRESS = "0.0.0.0:50051"; // AMQP (RabbitMQ) const std::string AMQP_FANOUT_EXCHANGE_NAME = "allBrokers"; // message TTL const size_t AMQP_MESSAGE_TTL = 300 * 1000; // 5 min // queue TTL in case of no consumers (tunnelbroker is down) const size_t AMQP_QUEUE_TTL = 24 * 3600 * 1000; // 24 hours // routing message headers name const std::string AMQP_HEADER_FROM_DEVICEID = "fromDeviceid"; const std::string AMQP_HEADER_TO_DEVICEID = "toDeviceid"; const long long AMQP_SHORTEST_RECONNECTION_ATTEMPT_INTERVAL = 1000 * 60; // 1 min // DeviceID const size_t DEVICEID_CHAR_LENGTH = 64; const std::regex DEVICEID_FORMAT_REGEX( "^(ks|mobile|web):[a-zA-Z0-9]{" + std::to_string(DEVICEID_CHAR_LENGTH) + "}$"); // Config const std::string CONFIG_FILE_PATH = std::string(std::getenv("HOME")) + "/tunnelbroker/tunnelbroker.ini"; } // namespace network } // namespace comm diff --git a/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.cpp b/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.cpp index 4ab9f8b15..afb729ac9 100644 --- a/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.cpp @@ -1,95 +1,102 @@ #include "ConfigManager.h" #include "Constants.h" #include namespace comm { namespace network { namespace config { const std::string ConfigManager::OPTION_TUNNELBROKER_ID = "tunnelbroker.instance-id"; const std::string ConfigManager::OPTION_DEFAULT_KEYSERVER_ID = "keyserver.default_keyserver_id"; const std::string ConfigManager::OPTION_AMQP_URI = "amqp.uri"; const std::string ConfigManager::OPTION_AMQP_FANOUT_EXCHANGE = "amqp.fanout_exchange_name"; const std::string ConfigManager::OPTION_DYNAMODB_SESSIONS_TABLE = "dynamodb.sessions_table_name"; const std::string ConfigManager::OPTION_DYNAMODB_SESSIONS_VERIFICATION_TABLE = "dynamodb.sessions_verification_table_name"; const std::string ConfigManager::OPTION_DYNAMODB_SESSIONS_PUBLIC_KEY_TABLE = "dynamodb.sessions_public_key_table_name"; +const std::string ConfigManager::OPTION_DYNAMODB_MESSAGES_TABLE = + "dynamodb.messages_table_name"; ConfigManager &ConfigManager::getInstance() { static ConfigManager instance; return instance; } void ConfigManager::load() { try { std::ifstream fileStream; fileStream.open(CONFIG_FILE_PATH.c_str(), std::ifstream::in); if (!fileStream.is_open()) { throw std::runtime_error("Error: can not open file " + CONFIG_FILE_PATH); } boost::program_options::options_description description{ "Tunnelbroker options"}; description.add_options()( this->OPTION_TUNNELBROKER_ID.c_str(), boost::program_options::value()->required(), "Tunnelbroker unique identification"); description.add_options()( this->OPTION_DEFAULT_KEYSERVER_ID.c_str(), boost::program_options::value()->required(), "Default and only allowed keyserver deviceID"); description.add_options()( this->OPTION_AMQP_URI.c_str(), boost::program_options::value()->required(), "AMQP URI connection string"); description.add_options()( this->OPTION_AMQP_FANOUT_EXCHANGE.c_str(), boost::program_options::value()->default_value( AMQP_FANOUT_EXCHANGE_NAME), "AMQP Fanout exchange name"); description.add_options()( this->OPTION_DYNAMODB_SESSIONS_TABLE.c_str(), boost::program_options::value()->default_value( DEVICE_SESSIONS_TABLE_NAME), "DynamoDB table name for sessions"); description.add_options()( this->OPTION_DYNAMODB_SESSIONS_VERIFICATION_TABLE.c_str(), boost::program_options::value()->default_value( DEVICE_SESSIONS_VERIFICATION_MESSAGES_TABLE_NAME), "DynamoDB table name for sessions verification messages"); description.add_options()( this->OPTION_DYNAMODB_SESSIONS_PUBLIC_KEY_TABLE.c_str(), boost::program_options::value()->default_value( DEVICE_PUBLIC_KEY_TABLE_NAME), "DynamoDB table name for public keys"); + description.add_options()( + this->OPTION_DYNAMODB_MESSAGES_TABLE.c_str(), + boost::program_options::value()->default_value( + MESSAGES_TABLE_NAME), + "DynamoDB table name for messages"); boost::program_options::parsed_options parsedDescription = boost::program_options::parse_config_file( fileStream, description, true); boost::program_options::store(parsedDescription, this->variablesMap); boost::program_options::notify(this->variablesMap); fileStream.close(); } catch (const std::exception &e) { throw std::runtime_error( "Got an exception at ConfigManager: " + std::string(e.what())); } } std::string ConfigManager::getParameter(std::string param) { if (!this->variablesMap.count(param) && !this->variablesMap[param].defaulted()) { throw std::runtime_error( "ConfigManager Error: config parameter " + param + " is not set."); } return this->variablesMap[param].as(); } } // namespace config } // namespace network } // namespace comm diff --git a/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.h b/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.h index 7b72afa77..3132cedac 100644 --- a/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.h +++ b/services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.h @@ -1,32 +1,33 @@ #pragma once #include #include #include namespace comm { namespace network { namespace config { class ConfigManager { private: boost::program_options::variables_map variablesMap; public: static const std::string OPTION_TUNNELBROKER_ID; static const std::string OPTION_DEFAULT_KEYSERVER_ID; static const std::string OPTION_AMQP_URI; static const std::string OPTION_AMQP_FANOUT_EXCHANGE; static const std::string OPTION_DYNAMODB_SESSIONS_TABLE; static const std::string OPTION_DYNAMODB_SESSIONS_VERIFICATION_TABLE; static const std::string OPTION_DYNAMODB_SESSIONS_PUBLIC_KEY_TABLE; + static const std::string OPTION_DYNAMODB_MESSAGES_TABLE; static ConfigManager &getInstance(); void load(); std::string getParameter(std::string param); }; } // namespace config } // namespace network } // namespace comm