From ba1dbb3040cf678f9aee612fbfc23a336d5dbe6e Mon Sep 17 00:00:00 2001
From: Simon <simon@bitcartel.com>
Date: Thu, 16 Nov 2017 22:29:37 -0800
Subject: [PATCH] RPC dumpwallet and z_exportwallet updated to no longer allow
 overwriting an existing file.

---
 qa/rpc-tests/walletbackup.py | 9 +++++++++
 src/wallet/rpcdump.cpp       | 8 ++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py
index 37c1db9a5..78128ad49 100755
--- a/qa/rpc-tests/walletbackup.py
+++ b/qa/rpc-tests/walletbackup.py
@@ -34,6 +34,7 @@ and confirm again balances are correct.
 """
 
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.authproxy import JSONRPCException
 from test_framework.util import assert_equal, initialize_chain_clean, \
     start_nodes, start_node, connect_nodes, stop_node, \
     sync_blocks, sync_mempools
@@ -141,6 +142,14 @@ class WalletBackupTest(BitcoinTestFramework):
         self.nodes[2].backupwallet("walletbak")
         self.nodes[2].dumpwallet("walletdump")
 
+        # Verify dumpwallet cannot overwrite an existing file
+        try:
+            self.nodes[2].dumpwallet("walletdump")
+            assert(False)
+        except JSONRPCException as e:
+            errorString = e.error['message']
+            assert("Cannot overwrite existing file" in errorString)
+
         logging.info("More transactions")
         for i in range(5):
             self.do_one_round()
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index fe5b83e8d..a02dfcb31 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -428,7 +428,7 @@ UniValue z_exportwallet(const UniValue& params, bool fHelp)
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "z_exportwallet \"filename\"\n"
-            "\nExports all wallet keys, for taddr and zaddr, in a human-readable format.\n"
+            "\nExports all wallet keys, for taddr and zaddr, in a human-readable format.  Overwriting an existing file is not permitted.\n"
             "\nArguments:\n"
             "1. \"filename\"    (string, required) The filename, saved in folder set by zcashd -exportdir option\n"
             "\nResult:\n"
@@ -449,7 +449,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "dumpwallet \"filename\"\n"
-            "\nDumps taddr wallet keys in a human-readable format.\n"
+            "\nDumps taddr wallet keys in a human-readable format.  Overwriting an existing file is not permitted.\n"
             "\nArguments:\n"
             "1. \"filename\"    (string, required) The filename, saved in folder set by zcashd -exportdir option\n"
             "\nResult:\n"
@@ -484,6 +484,10 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys)
     }
     boost::filesystem::path exportfilepath = exportdir / clean;
 
+    if (boost::filesystem::exists(exportfilepath)) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot overwrite existing file " + exportfilepath.string());
+    }
+
     ofstream file;
     file.open(exportfilepath.string().c_str());
     if (!file.is_open())