improve requireAuth

gregtatcam · Oct 11, 2024 · 09dc565 · 09dc565
1 parent 9d51389
commit 09dc565
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/src/xrpld/ledger/detail/View.cpp b/src/xrpld/ledger/detail/View.cpp
@@ -1720,15 +1720,29 @@ requireAuth(
     AccountID const& account)
 {
     auto const mptID = keylet::mptIssuance(mptIssue.getMptID());
-    if (auto const sle = view.read(mptID);
-        sle && sle->getFieldU32(sfFlags) & lsfMPTRequireAuth)
-    {
-        auto const mptokenID = keylet::mptoken(mptID.key, account);
-        if (auto const tokSle = view.read(mptokenID); tokSle &&
-            //(sle->getFlags() & lsfMPTRequireAuth) &&
-            !(tokSle->getFlags() & lsfMPTAuthorized))
-            return TER{tecNO_AUTH};
-    }
+    auto const sleIssuance = view.read(mptID);
+
+    if (!sleIssuance)
+        return tecOBJECT_NOT_FOUND;
+
+    auto const mptIssuer = sleIssuance->getAccountID(sfIssuer);
+
+    // issuer is always "authorized"
+    if (mptIssuer == account)
+        return tesSUCCESS;
+
+    auto const mptokenID = keylet::mptoken(mptID.key, account);
+    auto const tokSle = view.read(mptokenID);
+
+    // if account has no MPToken, fail
+    if (!tokSle)
+        return tecNO_AUTH;
+
+    // mptoken must be authorized if issuance enabled requireAuth
+    if (sleIssuance->getFieldU32(sfFlags) & lsfMPTRequireAuth &&
+        !(tokSle->getFlags() & lsfMPTAuthorized))
+        return tecNO_AUTH;
+
     return tesSUCCESS;
 }