From 06203af945dd2386f005d83d10acd6f372480f0b Mon Sep 17 00:00:00 2001 From: Jakub Pyszczak Date: Fri, 25 Jun 2021 12:39:47 +0200 Subject: [PATCH] [EGD-7000] Removed sensitive data Sensitive data removed from logs in module-utils and application settings new. --- .../models/QuotesModel.cpp | 16 +++------------- .../windows/QuotesAddWindow.cpp | 2 +- module-utils/utf8/utf8/UTF8.cpp | 3 +-- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/module-apps/application-settings-new/models/QuotesModel.cpp b/module-apps/application-settings-new/models/QuotesModel.cpp index 9739911f7c3618bfe7d44a0d45d4d1753b32db4b..37a36bdea96d3ae95458607a0ebbf5cc7352f91e 100644 --- a/module-apps/application-settings-new/models/QuotesModel.cpp +++ b/module-apps/application-settings-new/models/QuotesModel.cpp @@ -107,11 +107,7 @@ namespace Quotes void QuotesModel::add(const Quotes::QuoteRecord &record) { - LOG_DEBUG("Adding quote: lang_id = %u, author = %s, quote = %s", - static_cast(record.lang_id), - record.quote.c_str(), - record.author.c_str()); - + LOG_DEBUG("Adding quote: lang_id = %u", static_cast(record.lang_id)); auto query = std::make_unique(record.lang_id, record.quote, record.author, true); auto task = app::AsyncQuery::createFromQuery(std::move(query), db::Interface::Name::Quotes); task->execute(app, this); @@ -119,10 +115,7 @@ namespace Quotes void QuotesModel::edit(const Quotes::QuoteRecord &record) { - LOG_DEBUG("Saving quote: lang_id = %u, author = %s, quote = %s", - static_cast(record.lang_id), - record.quote.c_str(), - record.author.c_str()); + LOG_DEBUG("Saving quote: lang_id = %u", static_cast(record.lang_id)); auto query = std::make_unique( record.quote_id, record.lang_id, record.quote, record.author, record.enabled); @@ -132,10 +125,7 @@ namespace Quotes void QuotesModel::remove(const Quotes::QuoteRecord &record) { - LOG_DEBUG("Removing quote: lang_id = %u, author = %s, quote = %s", - static_cast(record.lang_id), - record.quote.c_str(), - record.author.c_str()); + LOG_DEBUG("Removing quote: lang_id = %u", static_cast(record.lang_id)); auto query = std::make_unique(record.quote_id); auto task = app::AsyncQuery::createFromQuery(std::move(query), db::Interface::Name::Quotes); diff --git a/module-apps/application-settings-new/windows/QuotesAddWindow.cpp b/module-apps/application-settings-new/windows/QuotesAddWindow.cpp index 7300fb5b91bbb70dea941e6485fed78ce1ea8145..d4d7832889f9df89631e09f41f33e79b8ea9a60e 100644 --- a/module-apps/application-settings-new/windows/QuotesAddWindow.cpp +++ b/module-apps/application-settings-new/windows/QuotesAddWindow.cpp @@ -150,7 +150,7 @@ namespace gui bool QuoteAddEditWindow::onInput(const gui::InputEvent &inputEvent) { if (inputEvent.isShortRelease(gui::KeyCode::KEY_ENTER)) { - LOG_DEBUG("Save Quote: %s", quoteText->getText().c_str()); + LOG_DEBUG("Save Quote requested"); quoteData.quote = quoteText->getText(); quoteData.author = authorText->getText(); diff --git a/module-utils/utf8/utf8/UTF8.cpp b/module-utils/utf8/utf8/UTF8.cpp index d76dd1a9bf76428be4397a9d510bc9b1b8468f2c..39859c2bdd9942cba4ccc05b73e27dc7ffaf0c6d 100644 --- a/module-utils/utf8/utf8/UTF8.cpp +++ b/module-utils/utf8/utf8/UTF8.cpp @@ -155,7 +155,6 @@ UTF8::UTF8(const UTF8 &utf) if (strLength != 0) { data = std::make_unique(sizeAllocated); if (data == nullptr) { - // LOG_FATAL("No memory for copy constructor."); sizeAllocated = 0; sizeUsed = 0; return; @@ -677,7 +676,7 @@ bool UTF8::insertCode(const uint32_t &charCode, const uint32_t &index) { auto u = U8char(charCode); if (u.size == 0) { - LOG_ERROR("Failed to encode value: %x", static_cast(charCode)); + LOG_ERROR("Failed to encode character code"); return false; } debug_utf("from 0x%x to size: %d -- 0x%x 0x%x\n", charCode, u.size, u.utf8[0], u.utf8[1]);