fix: check for valid ammID field in amm_info RPC (XRPLF#5188)

yinyiqian1 · Nov 18, 2024 · 0ec17b6 · 0ec17b6
1 parent 838978b
commit 0ec17b6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/test/rpc/AMMInfo_test.cpp b/src/test/rpc/AMMInfo_test.cpp
@@ -316,13 +316,32 @@ class AMMInfo_test : public jtx::AMMTestBase
         });
     }
 
+    void
+    testInvalidAmmField()
+    {
+        using namespace jtx;
+        testcase("Invalid amm field");
+
+        testAMM([&](AMM& amm, Env&) {
+            auto const resp = amm.ammRpcInfo(
+                std::nullopt,
+                jss::validated.c_str(),
+                std::nullopt,
+                std::nullopt,
+                gw);
+            BEAST_EXPECT(
+                resp.isMember("error") && resp["error"] == "actNotFound");
+        });
+    }
+
     void
     run() override
     {
         testErrors();
         testSimpleRpc();
         testVoteAndBid();
         testFreeze();
+        testInvalidAmmField();
     }
 };
 

diff --git a/src/xrpld/rpc/handlers/AMMInfo.cpp b/src/xrpld/rpc/handlers/AMMInfo.cpp
@@ -132,6 +132,8 @@ doAMMInfo(RPC::JsonContext& context)
             if (!sle)
                 return Unexpected(rpcACT_MALFORMED);
             ammID = sle->getFieldH256(sfAMMID);
+            if (ammID->isZero())
+                return Unexpected(rpcACT_NOT_FOUND);
         }
 
         if (params.isMember(jss::account))