pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-12 19:14:47 +02:00
Code Activity

Deduplicate RPC parameter count checks.

Browse Source
This commit is contained in:
Sadie Powell
2025-02-25 23:13:54 +00:00
parent bb3e124bdb
commit 752f5e269e
4 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/modules/rpc.h
+5 -1
View File
@@ -173,10 +173,12 @@ class RPC::Event
{
private:
Anope::string event;
size_t minparams;
protected:
Event(const Anope::string& e)
Event(const Anope::string& e, size_t mp = 0)
: event(e)
, minparams(mp)
{
}
@@ -185,6 +187,8 @@ public:
const auto &GetEvent() const { return event; }
const auto &GetMinParams() const { return minparams; }
virtual bool Run(ServiceInterface *iface, HTTPClient *client, Request &request) = 0;
};
modules/extra/xmlrpc.cpp
+11 -1
View File
@@ -145,7 +145,17 @@ public:
}
xmlrpc_DECREF(params);
if (!event->second->Run(this, client, request))
auto *eh = event->second;
if (request.data.size() < eh->GetMinParams())
{
auto error = Anope::printf("Not enough parameters (given %zu, expected %zu)",
request.data.size(), eh->GetMinParams());
xmlrpc_env_set_fault(&env, RPC::ERR_INVALID_PARAMS, error.c_str());
SendError(reply, env);
return true;
}
if (!eh->Run(this, client, request))
return false;
this->Reply(request);
modules/rpc/jsonrpc.cpp
+10 -1
View File
@@ -150,7 +150,16 @@ public:
return true;
}
if (!event->second->Run(this, client, request))
auto *eh = event->second;
if (request.data.size() < eh->GetMinParams())
{
auto error = Anope::printf("Not enough parameters (given %zu, expected %zu)",
request.data.size(), eh->GetMinParams());
SendError(reply, RPC::ERR_INVALID_PARAMS, error, id);
return true;
}
if (!eh->Run(this, client, request))
return false;
this->Reply(request);
modules/rpc/rpc_data.cpp
+3 -27
View File
@@ -38,18 +38,12 @@ class AnopeChannelRPCEvent final
{
public:
AnopeChannelRPCEvent()
: RPC::Event("anope.channel")
: RPC::Event("anope.channel", 1)
{
}
bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
if (request.data.empty())
{
request.Error(RPC::ERR_INVALID_PARAMS, "Not enough parameters");
return true;
}
auto *c = Channel::Find(request.data[0]);
if (!c)
{
@@ -137,18 +131,12 @@ class AnopeOperRPCEvent final
{
public:
AnopeOperRPCEvent()
: RPC::Event("anope.oper")
: RPC::Event("anope.oper", 1)
{
}
bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
if (request.data.empty())
{
request.Error(RPC::ERR_INVALID_PARAMS, "Not enough parameters");
return true;
}
auto *o = Oper::Find(request.data[0]);
if (!o)
{
@@ -230,12 +218,6 @@ public:
bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
if (request.data.empty())
{
request.Error(RPC::ERR_INVALID_PARAMS, "Not enough parameters");
return true;
}
auto *s = Server::Find(request.data[0]);
if (!s)
{
@@ -291,18 +273,12 @@ class AnopeUserRPCEvent final
{
public:
AnopeUserRPCEvent()
: RPC::Event("anope.user")
: RPC::Event("anope.user", 1)
{
}
bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
if (request.data.empty())
{
request.Error(RPC::ERR_INVALID_PARAMS, "Not enough parameters");
return true;
}
auto *u = User::Find(request.data[0]);
if (!u)
{