From 3c2ca020a9488d8dd09d908d185c758554f9a738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20=C5=9Aleszy=C5=84ski?= Date: Mon, 28 Jun 2021 18:31:43 +0200 Subject: [PATCH] [CP-183] Do not log sensitive data in service-desktop Remove potential printing of user-sensitive data. --- module-services/service-desktop/ServiceDesktop.cpp | 1 - module-services/service-desktop/WorkerDesktop.cpp | 2 -- .../service-desktop/endpoints/backup/BackupEndpoint.cpp | 2 +- .../endpoints/calendarEvents/CalendarEventsHelper.cpp | 6 +++--- .../service-desktop/endpoints/messages/MessageHelper.cpp | 1 - .../service-desktop/endpoints/restore/RestoreEndpoint.cpp | 2 +- module-services/service-desktop/parser/MessageHandler.cpp | 6 ++---- module-services/service-desktop/parser/ParserFSM.cpp | 4 +--- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/module-services/service-desktop/ServiceDesktop.cpp b/module-services/service-desktop/ServiceDesktop.cpp index 165d8ecec9af0041587cb05723a566858965897a..368f5b7bd0b5331bbd9119c73fabc3bb2d5c8380 100644 --- a/module-services/service-desktop/ServiceDesktop.cpp +++ b/module-services/service-desktop/ServiceDesktop.cpp @@ -308,7 +308,6 @@ sys::MessagePointer ServiceDesktop::DataReceivedHandler(sys::DataMessage *msg, s if (auto queryResponse = dynamic_cast(resp)) { auto result = queryResponse->getResult(); if (result != nullptr) { - LOG_DEBUG("Result: %s", result->debugInfo().c_str()); if (result->hasListener()) { LOG_DEBUG("Handling result..."); result->handle(); diff --git a/module-services/service-desktop/WorkerDesktop.cpp b/module-services/service-desktop/WorkerDesktop.cpp index 2db904a2f6d51e33e03a0f05aa33458972dce06e..a3afbbab6f597065b3a89b84d68429e90f8fa24f 100644 --- a/module-services/service-desktop/WorkerDesktop.cpp +++ b/module-services/service-desktop/WorkerDesktop.cpp @@ -80,8 +80,6 @@ bool WorkerDesktop::handleMessage(uint32_t queueID) auto &queue = queues[queueID]; const auto &qname = queue->GetQueueName(); - LOG_INFO("handleMessage received data from queue: %s", qname.c_str()); - if (qname == sdesktop::RECEIVE_QUEUE_BUFFER_NAME) { std::string *receivedMsg = nullptr; if (!queue->Dequeue(&receivedMsg, 0)) { diff --git a/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp b/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp index 6f495672ba1eecd655d1a02b0db91aba70dd4693..2c04cc634b09701fbf8888b49d68b7cb9a2adaeb 100644 --- a/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp +++ b/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp @@ -70,7 +70,7 @@ auto BackupEndpoint::request(Context &context) -> sys::ReturnCodes context.setResponseStatus(parserFSM::http::Code::BadRequest); } - LOG_DEBUG("responding: %s", context.createSimpleResponse().c_str()); + LOG_DEBUG("responding"); MessageHandler::putToSendQueue(context.createSimpleResponse()); return sys::ReturnCodes::Success; diff --git a/module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp b/module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp index a3e412afe2ef055abd921298482e24fa184c60f3..f97e207150480a8d63951eabc72f9e1ee350849e 100644 --- a/module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp +++ b/module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp @@ -200,7 +200,7 @@ auto CalendarEventsHelper::eventJsonObjectFrom(const EventsRecord &record) const { auto icalEvent = icalEventFrom(record); if (!isICalEventValid(icalEvent)) { - LOG_ERROR("Bad event record formatting (Event UID: %s)", icalEvent.event.getUID().c_str()); + LOG_ERROR("Bad event record formatting"); } auto rruleObj = json11::Json::object{ @@ -375,7 +375,7 @@ auto CalendarEventsHelper::createDBEntry(Context &context) -> sys::ReturnCodes context.setResponseBody(jsonObj); } else { - LOG_ERROR("UID should not be recieved in put event endpoint. Recieved UID: %s", record.UID.c_str()); + LOG_ERROR("UID should not be recieved in put event endpoint."); context.setResponseStatus(http::Code::BadRequest); MessageHandler::putToSendQueue(context.createSimpleResponse()); return sys::ReturnCodes::Failure; @@ -457,7 +457,7 @@ auto CalendarEventsHelper::deleteDBEntry(Context &context) -> sys::ReturnCodes auto checkUID = Event(); checkUID.setUID(UID); if (!checkUID.isValid) { - LOG_ERROR("Wrong UID format. Provided UID: %s", UID.c_str()); + LOG_ERROR("Wrong UID format."); context.setResponseStatus(http::Code::BadRequest); MessageHandler::putToSendQueue(context.createSimpleResponse()); return sys::ReturnCodes::Failure; diff --git a/module-services/service-desktop/endpoints/messages/MessageHelper.cpp b/module-services/service-desktop/endpoints/messages/MessageHelper.cpp index 9571067455d0e087ce14d0c503532d9bdb8af1fe..c8409c648b0b98e6b34e98598bbc2f5a77146f67 100644 --- a/module-services/service-desktop/endpoints/messages/MessageHelper.cpp +++ b/module-services/service-desktop/endpoints/messages/MessageHelper.cpp @@ -552,7 +552,6 @@ namespace parserFSM smsArray.reserve(results.size()); for (const auto &record : results) { smsArray.emplace_back(MessageHelper::toJson(record)); - LOG_DEBUG("Record found!: %" PRIu32 "\n", record.ID); } context.setResponseBody(std::move(smsArray)); diff --git a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp index b2c7aa45f8c292816190b86111da89b7627c942f..78f3935a79d1ea7969147027da708f70a87d5784 100644 --- a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp +++ b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp @@ -87,7 +87,7 @@ auto RestoreEndpoint::request(Context &context) -> sys::ReturnCodes context.setResponseStatus(parserFSM::http::Code::BadRequest); } - LOG_DEBUG("responding: %s", context.createSimpleResponse().c_str()); + LOG_DEBUG("responding"); MessageHandler::putToSendQueue(context.createSimpleResponse()); return sys::ReturnCodes::Success; diff --git a/module-services/service-desktop/parser/MessageHandler.cpp b/module-services/service-desktop/parser/MessageHandler.cpp index 8d078d6bdfd192cd4e66dc01fdc9dfd57c69f0e7..fe8b5f2876fbae611b14b074fc49baab54ebcabb 100644 --- a/module-services/service-desktop/parser/MessageHandler.cpp +++ b/module-services/service-desktop/parser/MessageHandler.cpp @@ -39,11 +39,10 @@ void MessageHandler::processMessage() { auto context = ContextFactory::create(messageJson); - LOG_DEBUG("[MsgHandler]\nmethod: %d\nendpoint: %d\nuuid: %d\nbody: %s\n", + LOG_DEBUG("[MsgHandler]\nmethod: %d\nendpoint: %d\nuuid: %d\n", static_cast(context->getMethod()), static_cast(context->getEndpoint()), - context->getUuid(), - context->getBody().dump().c_str()); + context->getUuid()); auto handler = endpointFactory->create(*context, OwnerServicePtr); @@ -59,7 +58,6 @@ void MessageHandler::putToSendQueue(const std::string &msg) { if (uxQueueSpacesAvailable(sendQueue) != 0) { auto responseString = new std::string(msg); - LOG_DEBUG("%s", responseString->c_str()); xQueueSend(sendQueue, &responseString, portMAX_DELAY); } } diff --git a/module-services/service-desktop/parser/ParserFSM.cpp b/module-services/service-desktop/parser/ParserFSM.cpp index c3567ecc0d5e4adecb26358db2dfe69c080dcc17..1a79917d8c93c6f560b0ee83210f9b6e17c08003 100644 --- a/module-services/service-desktop/parser/ParserFSM.cpp +++ b/module-services/service-desktop/parser/ParserFSM.cpp @@ -30,7 +30,6 @@ StateMachine::StateMachine(sys::Service *OwnerService) : OwnerServicePtr(OwnerSe void StateMachine::processMessage(std::string &&msg) { receivedMsg = std::move(msg); - LOG_DEBUG("Msg: %s", receivedMsg.c_str()); switch (state) { case State::ReceivedPayload: @@ -151,7 +150,6 @@ void StateMachine::parsePartialMessage() void StateMachine::parsePayload() { - LOG_DEBUG("Payload: %s", payload.c_str()); if (payload.empty()) { LOG_ERROR("Empty payload!"); state = State::NoMsg; @@ -163,7 +161,7 @@ void StateMachine::parsePayload() messageHandler->parseMessage(payload); if (!messageHandler->isValid() || messageHandler->isJSONNull()) { - LOG_DEBUG("JsonErr: %s", messageHandler->getErrorString().c_str()); + LOG_DEBUG("Error parsing JSON"); state = State::NoMsg; return; }