Skip to content

backport: partial bitcoin#34156 restore cleanup ownership #7817

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

Open
PastaPastaPasta wants to merge 1 commit into
base: develop
Choose a base branch
from
+36 −1
Open

backport: partial bitcoin#34156 restore cleanup ownership #7817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ std::shared_ptr<CWallet> RestoreWallet(WalletContext& context, const fs::path& b
const fs::path wallet_path = fsbridge::AbsPathJoin(GetWalletDir(), fs::u8path(wallet_name));
auto wallet_file = wallet_path / "wallet.dat";
std::shared_ptr<CWallet> wallet;
bool created_parent_dir = false;

try {
if (!fs::exists(backup_file)) {
Expand All @@ -516,15 +517,17 @@ std::shared_ptr<CWallet> RestoreWallet(WalletContext& context, const fs::path& b
return nullptr;
}

created_parent_dir = true;
fs::copy_file(backup_file, wallet_file, fs::copy_options::none);

wallet = LoadWallet(context, wallet_name, load_on_start, options, status, error, warnings);
} catch (const std::exception& e) {
assert(!wallet);
if (!error.empty()) error += Untranslated("\n");
error += strprintf(Untranslated("Unexpected exception: %s"), e.what());
status = DatabaseStatus::FAILED_LOAD;
}
if (!wallet) {
if (!wallet && created_parent_dir) {
fs::remove_all(wallet_path);
}

Expand Down
32 changes: 32 additions & 0 deletions test/functional/wallet_backup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ def restore_invalid_wallet(self):
assert_raises_rpc_error(-18, error_message, node.restorewallet, wallet_name, invalid_wallet_file)
assert not os.path.exists(not_created_wallet_file)

def restore_corrupt_bdb_wallet(self):
if self.options.descriptors:
return
node = self.nodes[3]
backup_file = os.path.join(self.nodes[0].datadir, 'wallet.bak')
corrupt_file = backup_file + '.corrupt'
with open(backup_file, 'rb') as source, open(corrupt_file, 'wb') as dest:
dest.write(source.read(4096))
wallet_name = 'restore_corrupt_bdb'
assert_raises_rpc_error(-4, 'corrupt', node.restorewallet, wallet_name, corrupt_file)
assert not os.path.exists(os.path.join(node.datadir, self.chain, 'wallets', wallet_name))

def restore_nonexistent_wallet(self):
node = self.nodes[3]
nonexistent_wallet_file = os.path.join(self.nodes[0].datadir, 'nonexistent_wallet.bak')
Expand All @@ -127,6 +139,24 @@ def restore_nonexistent_wallet(self):
not_created_wallet_file = os.path.join(node.datadir, self.chain, 'wallets', wallet_name)
assert not os.path.exists(not_created_wallet_file)

def restore_preserves_existing_directory(self):
node = self.nodes[3]
wallet_dir = os.path.join(node.datadir, self.chain, 'wallets')
backup_file = os.path.join(self.nodes[0].datadir, 'wallet.bak')
invalid_path = os.path.join(node.datadir, 'x' * 256)
for wallet_name in ('restore_existing', os.path.join(node.datadir, 'restore_absolute')):
destination = os.path.join(wallet_dir, wallet_name)
sentinel = os.path.join(destination, 'nested', 'sentinel')
os.makedirs(os.path.dirname(sentinel))
with open(sentinel, 'w', encoding='utf8') as f:
f.write('preserve existing data')
assert_raises_rpc_error(-4, 'Unexpected exception:', node.restorewallet, wallet_name, invalid_path)
with open(sentinel, encoding='utf8') as f:
assert_equal(f.read(), 'preserve existing data')
assert_raises_rpc_error(-8, 'Backup file does not exist', node.restorewallet, wallet_name, backup_file + '.missing')
assert_raises_rpc_error(-36, 'Database already exists', node.restorewallet, wallet_name, backup_file)
assert os.path.isfile(sentinel)

def restore_wallet_existent_name(self):
node = self.nodes[3]
backup_file = os.path.join(self.nodes[0].datadir, 'wallet.bak')
Expand Down Expand Up @@ -188,6 +218,8 @@ def run_test(self):

self.restore_invalid_wallet()
self.restore_nonexistent_wallet()
self.restore_preserves_existing_directory()
self.restore_corrupt_bdb_wallet()

backup_file_0 = os.path.join(self.nodes[0].datadir, 'wallet.bak')
backup_file_1 = os.path.join(self.nodes[1].datadir, 'wallet.bak')
Expand Down
Loading