diff --git a/services/tunnelbroker/docker-server/contents/server/src/Amqp/AmqpManager.cpp b/services/tunnelbroker/docker-server/contents/server/src/Amqp/AmqpManager.cpp --- a/services/tunnelbroker/docker-server/contents/server/src/Amqp/AmqpManager.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Amqp/AmqpManager.cpp @@ -17,7 +17,7 @@ void AMQPConnectInternal() { const std::string amqpUri = config::ConfigManager::getInstance().getParameter( config::ConfigManager::OPTION_AMQP_URI); - const std::string tunnelbrokerId = + const std::string tunnelbrokerID = config::ConfigManager::getInstance().getParameter( config::ConfigManager::OPTION_TUNNELBROKER_ID); const std::string fanoutExchangeName = @@ -40,20 +40,20 @@ arguments["x-message-ttl"] = AMQP_MESSAGE_TTL; arguments["x-expires"] = AMQP_QUEUE_TTL; amqpChannel->declareExchange(fanoutExchangeName, AMQP::fanout); - amqpChannel->declareQueue(tunnelbrokerId, AMQP::durable, arguments) - .onSuccess([tunnelbrokerId, fanoutExchangeName]( + amqpChannel->declareQueue(tunnelbrokerID, AMQP::durable, arguments) + .onSuccess([tunnelbrokerID, fanoutExchangeName]( const std::string &name, uint32_t messagecount, uint32_t consumercount) { std::cout << "AMQP: Queue " << name << " created" << std::endl; - amqpChannel->bindQueue(fanoutExchangeName, tunnelbrokerId, "") - .onError([tunnelbrokerId, fanoutExchangeName](const char *message) { - std::cout << "AMQP: Failed to bind queue: " << tunnelbrokerId + amqpChannel->bindQueue(fanoutExchangeName, tunnelbrokerID, "") + .onError([tunnelbrokerID, fanoutExchangeName](const char *message) { + std::cout << "AMQP: Failed to bind queue: " << tunnelbrokerID << " to exchange: " << fanoutExchangeName << std::endl; amqpReady = false; }); amqpReady = true; - amqpChannel->consume(tunnelbrokerId) + amqpChannel->consume(tunnelbrokerID) .onReceived([&](const AMQP::Message &message, uint64_t deliveryTag, bool redelivered) { @@ -63,7 +63,7 @@ const std::string toDeviceID(headers[AMQP_HEADER_TO_DEVICEID]); const std::string fromDeviceID( headers[AMQP_HEADER_FROM_DEVICEID]); - std::cout << "AMQP: Message consumed for deviceId: " + std::cout << "AMQP: Message consumed for deviceID: " << toDeviceID << std::endl; DeliveryBroker::getInstance().push( deliveryTag, toDeviceID, fromDeviceID, payload); diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.h b/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.h --- a/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.h +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.h @@ -42,12 +42,12 @@ void putSessionSignItem(const SessionSignItem &item); std::shared_ptr - findSessionSignItem(const std::string &deviceId); - void removeSessionSignItem(const std::string &deviceId); + findSessionSignItem(const std::string &deviceID); + void removeSessionSignItem(const std::string &deviceID); void putPublicKeyItem(const PublicKeyItem &item); - std::shared_ptr findPublicKeyItem(const std::string &deviceId); - void removePublicKeyItem(const std::string &deviceId); + std::shared_ptr findPublicKeyItem(const std::string &deviceID); + void removePublicKeyItem(const std::string &deviceID); }; } // namespace database diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.cpp b/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.cpp --- a/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.cpp @@ -67,10 +67,10 @@ request.SetTableName(item.getTableName()); request.AddItem( DeviceSessionItem::FIELD_SESSION_ID, - Aws::DynamoDB::Model::AttributeValue(item.getSessionId())); + Aws::DynamoDB::Model::AttributeValue(item.getSessionID())); request.AddItem( DeviceSessionItem::FIELD_DEVICE_ID, - Aws::DynamoDB::Model::AttributeValue(item.getDeviceId())); + Aws::DynamoDB::Model::AttributeValue(item.getDeviceID())); request.AddItem( DeviceSessionItem::FIELD_PUBKEY, Aws::DynamoDB::Model::AttributeValue(item.getPubKey())); @@ -98,11 +98,11 @@ } std::shared_ptr -DatabaseManager::findSessionItem(const std::string &sessionId) { +DatabaseManager::findSessionItem(const std::string &sessionID) { Aws::DynamoDB::Model::GetItemRequest request; request.AddKey( DeviceSessionItem::FIELD_SESSION_ID, - Aws::DynamoDB::Model::AttributeValue(sessionId)); + Aws::DynamoDB::Model::AttributeValue(sessionID)); return std::move(this->innerFindItem(request)); } @@ -114,7 +114,7 @@ Aws::DynamoDB::Model::AttributeValue(item.getSign())); request.AddItem( SessionSignItem::FIELD_DEVICE_ID, - Aws::DynamoDB::Model::AttributeValue(item.getDeviceId())); + Aws::DynamoDB::Model::AttributeValue(item.getDeviceID())); request.AddItem( SessionSignItem::FIELD_EXPIRE, Aws::DynamoDB::Model::AttributeValue(std::to_string( @@ -123,16 +123,16 @@ } std::shared_ptr -DatabaseManager::findSessionSignItem(const std::string &deviceId) { +DatabaseManager::findSessionSignItem(const std::string &deviceID) { Aws::DynamoDB::Model::GetItemRequest request; request.AddKey( SessionSignItem::FIELD_DEVICE_ID, - Aws::DynamoDB::Model::AttributeValue(deviceId)); + Aws::DynamoDB::Model::AttributeValue(deviceID)); return std::move(this->innerFindItem(request)); } -void DatabaseManager::removeSessionSignItem(const std::string &deviceId) { - this->innerRemoveItem(*(createItemByType()), deviceId); +void DatabaseManager::removeSessionSignItem(const std::string &deviceID) { + this->innerRemoveItem(*(createItemByType()), deviceID); } void DatabaseManager::putPublicKeyItem(const PublicKeyItem &item) { @@ -140,7 +140,7 @@ request.SetTableName(item.getTableName()); request.AddItem( PublicKeyItem::FIELD_DEVICE_ID, - Aws::DynamoDB::Model::AttributeValue(item.getDeviceId())); + Aws::DynamoDB::Model::AttributeValue(item.getDeviceID())); request.AddItem( PublicKeyItem::FIELD_PUBLIC_KEY, Aws::DynamoDB::Model::AttributeValue(item.getPublicKey())); @@ -148,16 +148,16 @@ } std::shared_ptr -DatabaseManager::findPublicKeyItem(const std::string &deviceId) { +DatabaseManager::findPublicKeyItem(const std::string &deviceID) { Aws::DynamoDB::Model::GetItemRequest request; request.AddKey( PublicKeyItem::FIELD_DEVICE_ID, - Aws::DynamoDB::Model::AttributeValue(deviceId)); + Aws::DynamoDB::Model::AttributeValue(deviceID)); return std::move(this->innerFindItem(request)); } -void DatabaseManager::removePublicKeyItem(const std::string &deviceId) { - this->innerRemoveItem(*(createItemByType()), deviceId); +void DatabaseManager::removePublicKeyItem(const std::string &deviceID) { + this->innerRemoveItem(*(createItemByType()), deviceID); } } // namespace database diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.h b/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.h --- a/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.h +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.h @@ -9,8 +9,8 @@ namespace database { class DeviceSessionItem : public Item { - std::string sessionId; - std::string deviceId; + std::string sessionID; + std::string deviceID; std::string pubKey; std::string notifyToken; std::string deviceType; @@ -33,8 +33,8 @@ std::string getPrimaryKey() const override; std::string getTableName() const override; - std::string getSessionId() const; - std::string getDeviceId() const; + std::string getSessionID() const; + std::string getDeviceID() const; std::string getPubKey() const; std::string getNotifyToken() const; std::string getDeviceType() const; @@ -45,8 +45,8 @@ DeviceSessionItem() { } DeviceSessionItem( - const std::string sessionId, - const std::string deviceId, + const std::string sessionID, + const std::string deviceID, const std::string pubKey, const std::string notifyToken, const std::string deviceType, diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.cpp b/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.cpp --- a/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.cpp @@ -16,15 +16,15 @@ const std::string DeviceSessionItem::FIELD_EXPIRE = "Expire"; DeviceSessionItem::DeviceSessionItem( - const std::string sessionId, - const std::string deviceId, + const std::string sessionID, + const std::string deviceID, const std::string pubKey, const std::string notifyToken, const std::string deviceType, const std::string appVersion, const std::string deviceOs) - : sessionId(sessionId), - deviceId(deviceId), + : sessionID(sessionID), + deviceID(deviceID), pubKey(pubKey), notifyToken(notifyToken), deviceType(deviceType), @@ -38,16 +38,16 @@ } void DeviceSessionItem::validate() const { - if (!this->sessionId.size()) { - throw std::runtime_error("Error: SessionId is empty."); + if (!this->sessionID.size()) { + throw std::runtime_error("Error: SessionID is empty."); } } void DeviceSessionItem::assignItemFromDatabase( const AttributeValues &itemFromDB) { try { - this->sessionId = itemFromDB.at(DeviceSessionItem::FIELD_SESSION_ID).GetS(); - this->deviceId = itemFromDB.at(DeviceSessionItem::FIELD_DEVICE_ID).GetS(); + this->sessionID = itemFromDB.at(DeviceSessionItem::FIELD_SESSION_ID).GetS(); + this->deviceID = itemFromDB.at(DeviceSessionItem::FIELD_DEVICE_ID).GetS(); this->pubKey = itemFromDB.at(DeviceSessionItem::FIELD_PUBKEY).GetS(); this->notifyToken = itemFromDB.at(DeviceSessionItem::FIELD_NOTIFY_TOKEN).GetS(); @@ -76,12 +76,12 @@ return DeviceSessionItem::FIELD_SESSION_ID; } -std::string DeviceSessionItem::getSessionId() const { - return this->sessionId; +std::string DeviceSessionItem::getSessionID() const { + return this->sessionID; } -std::string DeviceSessionItem::getDeviceId() const { - return this->deviceId; +std::string DeviceSessionItem::getDeviceID() const { + return this->deviceID; } std::string DeviceSessionItem::getPubKey() const { diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.h b/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.h --- a/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.h +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.h @@ -9,7 +9,7 @@ namespace database { class PublicKeyItem : public Item { - std::string deviceId; + std::string deviceID; std::string publicKey; void validate() const override; @@ -20,12 +20,12 @@ std::string getPrimaryKey() const override; std::string getTableName() const override; - std::string getDeviceId() const; + std::string getDeviceID() const; std::string getPublicKey() const; PublicKeyItem() { } - PublicKeyItem(const std::string deviceId, const std::string publicKey); + PublicKeyItem(const std::string deviceID, const std::string publicKey); PublicKeyItem(const AttributeValues &itemFromDB); void assignItemFromDatabase(const AttributeValues &itemFromDB) override; }; diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.cpp b/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.cpp --- a/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.cpp @@ -9,9 +9,9 @@ const std::string PublicKeyItem::FIELD_PUBLIC_KEY = "PublicKey"; PublicKeyItem::PublicKeyItem( - const std::string deviceId, + const std::string deviceID, const std::string publicKey) - : deviceId(deviceId), publicKey(publicKey) { + : deviceID(deviceID), publicKey(publicKey) { this->validate(); } @@ -20,8 +20,8 @@ } void PublicKeyItem::validate() const { - if (!this->deviceId.size()) { - throw std::runtime_error("Error: DeviceId is empty"); + if (!this->deviceID.size()) { + throw std::runtime_error("Error: DeviceID is empty"); } if (!this->publicKey.size()) { throw std::runtime_error("Error: PublicKey is empty"); @@ -31,7 +31,7 @@ void PublicKeyItem::assignItemFromDatabase(const AttributeValues &itemFromDB) { try { this->publicKey = itemFromDB.at(PublicKeyItem::FIELD_PUBLIC_KEY).GetS(); - this->deviceId = itemFromDB.at(PublicKeyItem::FIELD_DEVICE_ID).GetS(); + this->deviceID = itemFromDB.at(PublicKeyItem::FIELD_DEVICE_ID).GetS(); } catch (const std::exception &e) { throw std::runtime_error( "Got an exception at PublicKeyItem: " + std::string(e.what())); @@ -48,8 +48,8 @@ return PublicKeyItem::FIELD_DEVICE_ID; } -std::string PublicKeyItem::getDeviceId() const { - return this->deviceId; +std::string PublicKeyItem::getDeviceID() const { + return this->deviceID; } std::string PublicKeyItem::getPublicKey() const { diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.h b/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.h --- a/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.h +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.h @@ -10,7 +10,7 @@ class SessionSignItem : public Item { std::string sign; - std::string deviceId; + std::string deviceID; void validate() const override; @@ -22,11 +22,11 @@ std::string getPrimaryKey() const override; std::string getTableName() const override; std::string getSign() const; - std::string getDeviceId() const; + std::string getDeviceID() const; SessionSignItem() { } - SessionSignItem(const std::string sign, const std::string deviceId); + SessionSignItem(const std::string sign, const std::string deviceID); SessionSignItem(const AttributeValues &itemFromDB); void assignItemFromDatabase(const AttributeValues &itemFromDB) override; }; diff --git a/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.cpp b/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.cpp --- a/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.cpp @@ -12,8 +12,8 @@ SessionSignItem::SessionSignItem( const std::string sign, - const std::string deviceId) - : sign(sign), deviceId(deviceId) { + const std::string deviceID) + : sign(sign), deviceID(deviceID) { this->validate(); } @@ -22,8 +22,8 @@ } void SessionSignItem::validate() const { - if (!this->deviceId.size()) { - throw std::runtime_error("Error: DeviceId is empty"); + if (!this->deviceID.size()) { + throw std::runtime_error("Error: DeviceID is empty"); } if (!this->sign.size()) { throw std::runtime_error("Error: Sign is empty"); @@ -35,7 +35,7 @@ try { this->sign = itemFromDB.at(SessionSignItem::FIELD_SESSION_VERIFICATION).GetS(); - this->deviceId = itemFromDB.at(SessionSignItem::FIELD_DEVICE_ID).GetS(); + this->deviceID = itemFromDB.at(SessionSignItem::FIELD_DEVICE_ID).GetS(); } catch (const std::exception &e) { throw std::runtime_error( "Got an exception at SessionSignItem: " + std::string(e.what())); @@ -56,8 +56,8 @@ return this->sign; } -std::string SessionSignItem::getDeviceId() const { - return this->deviceId; +std::string SessionSignItem::getDeviceID() const { + return this->deviceID; } } // namespace database diff --git a/services/tunnelbroker/docker-server/contents/server/src/Service/TunnelbrokerServiceImpl.cpp b/services/tunnelbroker/docker-server/contents/server/src/Service/TunnelbrokerServiceImpl.cpp --- a/services/tunnelbroker/docker-server/contents/server/src/Service/TunnelbrokerServiceImpl.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Service/TunnelbrokerServiceImpl.cpp @@ -43,17 +43,17 @@ grpc::ServerContext *context, const tunnelbroker::SessionSignatureRequest *request, tunnelbroker::SessionSignatureResponse *reply) { - const std::string deviceId = request->deviceid(); - if (!validateDeviceId(deviceId)) { + const std::string deviceID = request->deviceid(); + if (!validateDeviceID(deviceID)) { std::cout << "gRPC: " - << "Format validation failed for " << deviceId << std::endl; + << "Format validation failed for " << deviceID << std::endl; return grpc::Status( grpc::StatusCode::INVALID_ARGUMENT, "Format validation failed for deviceID"); } const std::string toSign = generateRandomString(SIGNATURE_REQUEST_LENGTH); std::shared_ptr SessionSignItem = - std::make_shared(toSign, deviceId); + std::make_shared(toSign, deviceID); database::DatabaseManager::getInstance().putSessionSignItem(*SessionSignItem); reply->set_tosign(toSign); return grpc::Status::OK; @@ -67,10 +67,10 @@ std::shared_ptr deviceSessionItem; std::shared_ptr sessionSignItem; std::shared_ptr publicKeyItem; - const std::string deviceId = request->deviceid(); - if (!validateDeviceId(deviceId)) { + const std::string deviceID = request->deviceid(); + if (!validateDeviceID(deviceID)) { std::cout << "gRPC: " - << "Format validation failed for " << deviceId << std::endl; + << "Format validation failed for " << deviceID << std::endl; return grpc::Status( grpc::StatusCode::INVALID_ARGUMENT, "Format validation failed for deviceID"); @@ -78,40 +78,40 @@ const std::string signature = request->signature(); const std::string publicKey = request->publickey(); const boost::uuids::uuid uuid = boost::uuids::random_generator()(); - const std::string newSessionId = boost::lexical_cast(uuid); + const std::string newSessionID = boost::lexical_cast(uuid); try { deviceSessionItem = - database::DatabaseManager::getInstance().findSessionItem(newSessionId); + database::DatabaseManager::getInstance().findSessionItem(newSessionID); if (deviceSessionItem != nullptr) { std::cout << "gRPC: " - << "Session unique ID " << newSessionId << " already used" + << "Session unique ID " << newSessionID << " already used" << std::endl; return grpc::Status( grpc::StatusCode::INTERNAL, "Session unique ID already used"); } sessionSignItem = - database::DatabaseManager::getInstance().findSessionSignItem(deviceId); + database::DatabaseManager::getInstance().findSessionSignItem(deviceID); if (sessionSignItem == nullptr) { std::cout << "gRPC: " - << "Session sign request not found for deviceId: " << deviceId + << "Session sign request not found for deviceID: " << deviceID << std::endl; return grpc::Status( grpc::StatusCode::NOT_FOUND, "Session sign request not found"); } publicKeyItem = - database::DatabaseManager::getInstance().findPublicKeyItem(deviceId); + database::DatabaseManager::getInstance().findPublicKeyItem(deviceID); if (publicKeyItem == nullptr) { std::shared_ptr newPublicKeyItem = - std::make_shared(deviceId, publicKey); + std::make_shared(deviceID, publicKey); database::DatabaseManager::getInstance().putPublicKeyItem( *newPublicKeyItem); } else if (publicKey != publicKeyItem->getPublicKey()) { std::cout << "gRPC: " - << "The public key doesn't match for deviceId" << std::endl; + << "The public key doesn't match for deviceID" << std::endl; return grpc::Status( grpc::StatusCode::PERMISSION_DENIED, - "The public key doesn't match for deviceId"); + "The public key doesn't match for deviceID"); } const std::string verificationMessage = sessionSignItem->getSign(); if (!comm::network::crypto::rsaVerifyString( @@ -123,11 +123,11 @@ grpc::StatusCode::PERMISSION_DENIED, "Signature for the verification message is not valid"); } - database::DatabaseManager::getInstance().removeSessionSignItem(deviceId); + database::DatabaseManager::getInstance().removeSessionSignItem(deviceID); deviceSessionItem = std::make_shared( - newSessionId, - deviceId, + newSessionID, + deviceID, request->publickey(), request->notifytoken(), tunnelbroker::NewSessionRequest_DeviceTypes_Name(request->devicetype()), @@ -140,7 +140,7 @@ << std::endl; return grpc::Status(grpc::StatusCode::INTERNAL, e.what()); } - reply->set_sessionid(newSessionId); + reply->set_sessionid(newSessionID); return grpc::Status::OK; }; @@ -149,20 +149,20 @@ const tunnelbroker::SendRequest *request, google::protobuf::Empty *reply) { try { - const std::string sessionId = request->sessionid(); + const std::string sessionID = request->sessionid(); std::shared_ptr sessionItem = - database::DatabaseManager::getInstance().findSessionItem(sessionId); + database::DatabaseManager::getInstance().findSessionItem(sessionID); if (sessionItem == nullptr) { std::cout << "gRPC: " - << "Session " << sessionId << " not found" << std::endl; + << "Session " << sessionID << " not found" << std::endl; return grpc::Status( grpc::StatusCode::PERMISSION_DENIED, - "No such session found. SessionId: " + sessionId); + "No such session found. SessionID: " + sessionID); } - const std::string clientDeviceId = sessionItem->getDeviceId(); + const std::string clientDeviceID = sessionItem->getDeviceID(); if (!AMQPSend( request->todeviceid(), - clientDeviceId, + clientDeviceID, std::string(request->payload()))) { std::cout << "gRPC: " << "Error while publish the message to AMQP" << std::endl; @@ -184,20 +184,20 @@ const tunnelbroker::GetRequest *request, grpc::ServerWriter *writer) { try { - const std::string sessionId = request->sessionid(); + const std::string sessionID = request->sessionid(); std::shared_ptr sessionItem = - database::DatabaseManager::getInstance().findSessionItem(sessionId); + database::DatabaseManager::getInstance().findSessionItem(sessionID); if (sessionItem == nullptr) { std::cout << "gRPC: " - << "Session " << sessionId << " not found" << std::endl; + << "Session " << sessionID << " not found" << std::endl; return grpc::Status( grpc::StatusCode::PERMISSION_DENIED, - "No such session found. SessionId: " + sessionId); + "No such session found. SessionID: " + sessionID); } - const std::string clientDeviceId = sessionItem->getDeviceId(); + const std::string clientDeviceID = sessionItem->getDeviceID(); std::vector messagesToDeliver; while (1) { - messagesToDeliver = DeliveryBroker::getInstance().get(clientDeviceId); + messagesToDeliver = DeliveryBroker::getInstance().get(clientDeviceID); for (auto const &message : messagesToDeliver) { tunnelbroker::GetResponse response; response.set_fromdeviceid(message.fromDeviceID); @@ -208,10 +208,10 @@ } AMQPAck(message.deliveryTag); } - if (!DeliveryBroker::getInstance().isEmpty(clientDeviceId)) { - DeliveryBroker::getInstance().remove(clientDeviceId); + if (!DeliveryBroker::getInstance().isEmpty(clientDeviceID)) { + DeliveryBroker::getInstance().remove(clientDeviceID); } - DeliveryBroker::getInstance().wait(clientDeviceId); + DeliveryBroker::getInstance().wait(clientDeviceID); } } catch (std::runtime_error &e) { std::cout << "gRPC: " diff --git a/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.h b/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.h --- a/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.h +++ b/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.h @@ -8,7 +8,7 @@ std::string generateRandomString(std::size_t length); long long getCurrentTimestamp(); -bool validateDeviceId(std::string deviceId); +bool validateDeviceID(std::string deviceID); } // namespace network } // namespace comm diff --git a/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.cpp b/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.cpp --- a/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.cpp +++ b/services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.cpp @@ -28,19 +28,19 @@ .count(); } -bool validateDeviceId(std::string deviceId) { +bool validateDeviceID(std::string deviceID) { try { - static const std::regex deviceIdKeyserverRegexp("^ks:.*"); - if (std::regex_match(deviceId, deviceIdKeyserverRegexp)) { + static const std::regex deviceIDKeyserverRegexp("^ks:.*"); + if (std::regex_match(deviceID, deviceIDKeyserverRegexp)) { return ( - deviceId == + deviceID == config::ConfigManager::getInstance().getParameter( config::ConfigManager::OPTION_DEFAULT_KEYSERVER_ID)); } - return std::regex_match(deviceId, DEVICEID_FORMAT_REGEX); + return std::regex_match(deviceID, DEVICEID_FORMAT_REGEX); } catch (const std::exception &e) { std::cout << "Tools: " - << "Got an exception at `validateDeviceId`: " << e.what() + << "Got an exception at `validateDeviceID`: " << e.what() << std::endl; return false; }