cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-31 10:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#34417: log: Print warning about privacy-sensitive log info unconditionally

Browse Source 
fa9c92d7b6394194696e014e48346a8b8562e16a log: Print warning about privacy-sensitive log info unconditionally (MarcoFalke)

Pull request description:

  There is a warning about logs containing privacy-sensitive information. However, it is only printed when at least one debug log category is enabled.

  This is confusing, because:

  * Setting (let's say) `-debug=reindex` enables this warning, but it is hard to see what sensitive logs could be contained in reindex debug logs.
  * Dropping `-debug=reindex` again disabled this warning, but the wallet continues to log txids (and other sensitive stuff) at info level.

  So instead of implying the wrong thing, it would be better to remove this log line (because it should be common sense), or log it unconditionally.

ACKs for top commit:
  l0rinc:
    ACK fa9c92d7b6394194696e014e48346a8b8562e16a
  sedited:
    ACK fa9c92d7b6394194696e014e48346a8b8562e16a

Tree-SHA512: 42f71b030e7722203f225f04e979143e829dae3556f64e322a791361a3b9c16150d53bb7bb9a99839c975d9052115770b9473138acc58baeee457253526fd892
This commit is contained in:
merge-script 2026-01-28 18:50:16 +01:00
commit d3e8c459e7
No known key found for this signature in database
GPG Key ID: 9B79B45691DB4173
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/init/common.cpp
View File

@ -78,19 +78,19 @@ util::Result<void> SetLoggingLevel(const ArgsManager& args)
util::Result<void> SetLoggingCategories(const ArgsManager& args)
{
const std::vector<std::string> categories = args.GetArgs("-debug");
const std::vector<std::string> categories = args.GetArgs("-debug");
// Special-case: Disregard any debugging categories appearing before -debug=0/none
const auto last_negated = std::find_if(categories.rbegin(), categories.rend(),
[](const std::string& cat) { return cat == "0" || cat == "none"; });
// Special-case: Disregard any debugging categories appearing before -debug=0/none
const auto last_negated = std::find_if(categories.rbegin(), categories.rend(),
[](const std::string& cat) { return cat == "0" || cat == "none"; });
const auto categories_to_process = (last_negated == categories.rend()) ? categories : std::ranges::subrange(last_negated.base(), categories.end());
const auto categories_to_process = (last_negated == categories.rend()) ? categories : std::ranges::subrange(last_negated.base(), categories.end());
for (const auto& cat : categories_to_process) {
if (!LogInstance().EnableCategory(cat)) {
return util::Error{strprintf(_("Unsupported logging category %s=%s."), "-debug", cat)};
}
for (const auto& cat : categories_to_process) {
if (!LogInstance().EnableCategory(cat)) {
return util::Error{strprintf(_("Unsupported logging category %s=%s."), "-debug", cat)};
}
}
// Now remove the logging categories which were explicitly excluded
for (const std::string& cat : args.GetArgs("-debugexclude")) {
@ -99,9 +99,7 @@ util::Result<void> SetLoggingCategories(const ArgsManager& args)
}
}
if (LogInstance().GetCategoryMask() != BCLog::NONE) {
LogInfo("Debug logging is enabled (-debug). Additional log output may contain privacy-sensitive information. Be cautious when sharing logs.");
}
LogInfo("Log output may contain privacy-sensitive information. Be cautious when sharing logs.");
return {};
}