ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require the master key when performing certain operations (RIPD-666):

Browse Source 
* When disabling the use of the master key; or
* When enabling 'no freeze'.
This commit is contained in:
Nik Bougalis
2014-11-01 23:39:25 -07:00
parent b203db27a4
commit d1193093ef
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ripple/app/transactors/SetAccount.cpp
View File

@@ -155,30 +155,42 @@ public:
if ((uSetFlag == asfDisableMaster) && !(uFlagsIn & lsfDisableMaster)) if ((uSetFlag == asfDisableMaster) && !(uFlagsIn & lsfDisableMaster))
{ {
if (!mSigMaster)
{
m_journal.trace << "Can't use regular key to disable master key.";
return tecNEED_MASTER_KEY;
}
if (!mTxnAccount->isFieldPresent (sfRegularKey)) if (!mTxnAccount->isFieldPresent (sfRegularKey))
return tecNO_REGULAR_KEY; return tecNO_REGULAR_KEY;
m_journal.trace << "Set lsfDisableMaster."; m_journal.trace << "Set lsfDisableMaster.";
uFlagsOut |= lsfDisableMaster; uFlagsOut |= lsfDisableMaster;
} }
if ((uClearFlag == asfDisableMaster) && (uFlagsIn & lsfDisableMaster)) if ((uClearFlag == asfDisableMaster) && (uFlagsIn & lsfDisableMaster))
{ {
m_journal.trace << "Clear lsfDisableMaster."; m_journal.trace << "Clear lsfDisableMaster.";
uFlagsOut &= ~lsfDisableMaster; uFlagsOut &= ~lsfDisableMaster;
} }
if (uSetFlag == asfNoFreeze) if (uSetFlag == asfNoFreeze)
{ {
if (!mSigMaster && !(uFlagsIn & lsfDisableMaster))
{
m_journal.trace << "Can't use regular key to set NoFreeze.";
return tecNEED_MASTER_KEY;
}
m_journal.trace << "Set NoFreeze flag"; m_journal.trace << "Set NoFreeze flag";
uFlagsOut |= lsfNoFreeze; uFlagsOut |= lsfNoFreeze;
} }
// Anyone may set global freeze // Anyone may set global freeze
if (uSetFlag == asfGlobalFreeze) if (uSetFlag == asfGlobalFreeze)
{ {
m_journal.trace << "Set GlobalFreeze flag"; m_journal.trace << "Set GlobalFreeze flag";
uFlagsOut |= lsfGlobalFreeze; uFlagsOut |= lsfGlobalFreeze;
} }
// If you have set NoFreeze, you may not clear GlobalFreeze // If you have set NoFreeze, you may not clear GlobalFreeze
@@ -188,7 +200,7 @@ public:
((uFlagsOut & lsfNoFreeze) == 0)) ((uFlagsOut & lsfNoFreeze) == 0))
{ {
m_journal.trace << "Clear GlobalFreeze flag"; m_journal.trace << "Clear GlobalFreeze flag";
uFlagsOut &= ~lsfGlobalFreeze; uFlagsOut &= ~lsfGlobalFreeze;
} }
// //

1
src/ripple/protocol/TER.h
View File

@@ -192,6 +192,7 @@ enum TER // aka TransactionEngineResult
tecNO_PERMISSION = 139, tecNO_PERMISSION = 139,
tecNO_ENTRY = 140, tecNO_ENTRY = 140,
tecINSUFFICIENT_RESERVE = 141, tecINSUFFICIENT_RESERVE = 141,
tecNEED_MASTER_KEY = 142,
}; };
inline bool isTelLocal(TER x) inline bool isTelLocal(TER x)

1
src/ripple/protocol/impl/TER.cpp
View File

@@ -65,6 +65,7 @@ bool transResultInfo (TER code, std::string& token, std::string& text)
{ tecNO_PERMISSION, "tecNO_PERMISSION", "No permission to perform requested operation." }, { tecNO_PERMISSION, "tecNO_PERMISSION", "No permission to perform requested operation." },
{ tecNO_ENTRY, "tecNO_ENTRY", "No matching entry found." }, { tecNO_ENTRY, "tecNO_ENTRY", "No matching entry found." },
{ tecINSUFFICIENT_RESERVE, "tecINSUFFICIENT_RESERVE", "Insufficient reserve to complete requested operation." }, { tecINSUFFICIENT_RESERVE, "tecINSUFFICIENT_RESERVE", "Insufficient reserve to complete requested operation." },
{ tecNEED_MASTER_KEY, "tecNEED_MASTER_KEY", "The operation requires the use of the Master Key." },
{ tefALREADY, "tefALREADY", "The exact transaction was already in this ledger." }, { tefALREADY, "tefALREADY", "The exact transaction was already in this ledger." },
{ tefBAD_ADD_AUTH, "tefBAD_ADD_AUTH", "Not authorized to add account." }, { tefBAD_ADD_AUTH, "tefBAD_ADD_AUTH", "Not authorized to add account." },