mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +01:00
rpc: Remove chain-specific RequireRPCPassword
I've never liked the chain-specific exception to having to set a password. It gives issues with #6388 which makes it valid to set no password in every case (as it enables random cookie authentication). This pull removes the flag, so that all chains are regarded the same. It also removes the username==password test, which doesn't provide any substantial extra security.
This commit is contained in:
parent
11576a57d2
commit
85ee55b5c3
@ -99,7 +99,6 @@ public:
|
|||||||
|
|
||||||
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
|
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
|
||||||
|
|
||||||
fRequireRPCPassword = true;
|
|
||||||
fMiningRequiresPeers = true;
|
fMiningRequiresPeers = true;
|
||||||
fDefaultConsistencyChecks = false;
|
fDefaultConsistencyChecks = false;
|
||||||
fRequireStandard = true;
|
fRequireStandard = true;
|
||||||
@ -171,7 +170,6 @@ public:
|
|||||||
|
|
||||||
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
|
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
|
||||||
|
|
||||||
fRequireRPCPassword = true;
|
|
||||||
fMiningRequiresPeers = true;
|
fMiningRequiresPeers = true;
|
||||||
fDefaultConsistencyChecks = false;
|
fDefaultConsistencyChecks = false;
|
||||||
fRequireStandard = false;
|
fRequireStandard = false;
|
||||||
@ -218,7 +216,6 @@ public:
|
|||||||
vFixedSeeds.clear(); //! Regtest mode doesn't have any fixed seeds.
|
vFixedSeeds.clear(); //! Regtest mode doesn't have any fixed seeds.
|
||||||
vSeeds.clear(); //! Regtest mode doesn't have any DNS seeds.
|
vSeeds.clear(); //! Regtest mode doesn't have any DNS seeds.
|
||||||
|
|
||||||
fRequireRPCPassword = false;
|
|
||||||
fMiningRequiresPeers = false;
|
fMiningRequiresPeers = false;
|
||||||
fDefaultConsistencyChecks = true;
|
fDefaultConsistencyChecks = true;
|
||||||
fRequireStandard = false;
|
fRequireStandard = false;
|
||||||
|
@ -53,7 +53,6 @@ public:
|
|||||||
/** Used if GenerateBitcoins is called with a negative number of threads */
|
/** Used if GenerateBitcoins is called with a negative number of threads */
|
||||||
int DefaultMinerThreads() const { return nMinerThreads; }
|
int DefaultMinerThreads() const { return nMinerThreads; }
|
||||||
const CBlock& GenesisBlock() const { return genesis; }
|
const CBlock& GenesisBlock() const { return genesis; }
|
||||||
bool RequireRPCPassword() const { return fRequireRPCPassword; }
|
|
||||||
/** Make miner wait to have peers to avoid wasting work */
|
/** Make miner wait to have peers to avoid wasting work */
|
||||||
bool MiningRequiresPeers() const { return fMiningRequiresPeers; }
|
bool MiningRequiresPeers() const { return fMiningRequiresPeers; }
|
||||||
/** Default value for -checkmempool and -checkblockindex argument */
|
/** Default value for -checkmempool and -checkblockindex argument */
|
||||||
@ -86,7 +85,6 @@ protected:
|
|||||||
std::string strNetworkID;
|
std::string strNetworkID;
|
||||||
CBlock genesis;
|
CBlock genesis;
|
||||||
std::vector<SeedSpec6> vFixedSeeds;
|
std::vector<SeedSpec6> vFixedSeeds;
|
||||||
bool fRequireRPCPassword;
|
|
||||||
bool fMiningRequiresPeers;
|
bool fMiningRequiresPeers;
|
||||||
bool fDefaultConsistencyChecks;
|
bool fDefaultConsistencyChecks;
|
||||||
bool fRequireStandard;
|
bool fRequireStandard;
|
||||||
|
@ -598,8 +598,7 @@ void StartRPCThreads()
|
|||||||
LogPrint("rpc", "Allowing RPC connections from: %s\n", strAllowed);
|
LogPrint("rpc", "Allowing RPC connections from: %s\n", strAllowed);
|
||||||
|
|
||||||
strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
|
strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
|
||||||
if (((mapArgs["-rpcpassword"] == "") ||
|
if (mapArgs["-rpcpassword"] == "")
|
||||||
(mapArgs["-rpcuser"] == mapArgs["-rpcpassword"])) && Params().RequireRPCPassword())
|
|
||||||
{
|
{
|
||||||
unsigned char rand_pwd[32];
|
unsigned char rand_pwd[32];
|
||||||
GetRandBytes(rand_pwd, 32);
|
GetRandBytes(rand_pwd, 32);
|
||||||
|
Loading…
Reference in New Issue
Block a user