Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLI wallet: avoid directly overwriting wallet file on exit #1109 #1195

Merged
merged 11 commits into from
Aug 17, 2018
Merged

CLI wallet: avoid directly overwriting wallet file on exit #1109 #1195

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
313cafc
CLI wallet: avoid directly overwriting wallet file on exit #1109
nanomobile Jul 27, 2018
7af0d31
save wallet filet - tmp instead of backup
cogutvalera Jul 28, 2018
f680216
check if temp wallet file was saved correctly before renaming it
cogutvalera Jul 28, 2018
31bcb57
add disable_umask_protection before throw
cogutvalera Jul 28, 2018
c9ca139
add FC_THROW with message instead of just throw
cogutvalera Jul 30, 2018
a3a4d19
improved with tmp_wallet_filename variable and fixed read_file_conten…
cogutvalera Jul 31, 2018
116fb09
improved log messages
cogutvalera Aug 1, 2018
521924e
fixed typo in log message
cogutvalera Aug 1, 2018
ffbcd92
add wallet JSON screen-scraping for emergency situation
cogutvalera Aug 2, 2018
948a0e7
check if wallet is nullptr to avoid memory access violation error
cogutvalera Aug 2, 2018
d0c7a94
undo check for nullptr that avoided travis-ci error about memory acce…
cogutvalera Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion libraries/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ class wallet_api_impl
wlog( "saving wallet to file ${fn}", ("fn", wallet_filename) );

string data = fc::json::to_pretty_string( _wallet );

try
{
enable_umask_protection();
Expand All @@ -808,14 +809,40 @@ class wallet_api_impl
//
// http://en.wikipedia.org/wiki/Most_vexing_parse
//
fc::ofstream outfile{ fc::path( wallet_filename ) };
std::string tmp_wallet_filename = wallet_filename + ".tmp";
fc::ofstream outfile{ fc::path( tmp_wallet_filename ) };
outfile.write( data.c_str(), data.length() );
outfile.flush();
outfile.close();

wlog( "saved successfully wallet to tmp file ${fn}", ("fn", tmp_wallet_filename) );

std::string wallet_file_content;
fc::read_file_contents(tmp_wallet_filename, wallet_file_content);

if (wallet_file_content == data) {
wlog( "validated successfully tmp wallet file ${fn}", ("fn", tmp_wallet_filename) );

fc::rename( tmp_wallet_filename, wallet_filename );

wlog( "renamed successfully tmp wallet file ${fn}", ("fn", tmp_wallet_filename) );
}
else
{
FC_THROW("tmp wallet file cannot be validated ${fn}", ("fn", tmp_wallet_filename) );
}

wlog( "successfully saved wallet to file ${fn}", ("fn", wallet_filename) );

disable_umask_protection();
}
catch(...)
{
string ws_password = _wallet.ws_password;
_wallet.ws_password = "";
wlog("wallet file content is next: ${data}", ("data", fc::json::to_pretty_string( _wallet ) ) );
_wallet.ws_password = ws_password;

disable_umask_protection();
throw;
}
Expand Down