pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 11:06:37 +02:00
Code Activity

Use RPC error responses correctly.

Browse Source
This commit is contained in:
Sadie Powell
2025-02-14 20:33:13 +00:00
parent 84b0859e8d
commit 420f83bbbf
5 changed files with 96 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/rpc/rpc_main.cpp
+16 -14
View File
@@ -21,20 +21,26 @@ class RPCIdentifyRequest final
Reference<RPCServiceInterface> xinterface;
public:
RPCIdentifyRequest(Module *m, RPCRequest &req, HTTPClient *c, RPCServiceInterface *iface, const Anope::string &acc, const Anope::string &pass) : IdentifyRequest(m, acc, pass), request(req), repl(request.r), client(c), xinterface(iface) { }
RPCIdentifyRequest(Module *m, RPCRequest &req, HTTPClient *c, RPCServiceInterface *iface, const Anope::string &acc, const Anope::string &pass)
: IdentifyRequest(m, acc, pass)
, request(req)
, repl(request.reply)
, client(c)
, xinterface(iface)
{
}
void OnSuccess() override
{
if (!xinterface || !client)
return;
request.r = this->repl;
request.reply = this->repl;
request.Reply("result", "Success");
request.Reply("account", GetAccount());
xinterface->Reply(request);
client->SendReply(&request.r);
client->SendReply(&request.reply);
}
void OnFail() override
@@ -42,12 +48,12 @@ public:
if (!xinterface || !client)
return;
request.r = this->repl;
request.reply = this->repl;
request.Reply("error", "Invalid password");
request.Error(-32000, "Invalid password");
xinterface->Reply(request);
client->SendReply(&request.r);
client->SendReply(&request.reply);
}
};
@@ -83,16 +89,14 @@ private:
Anope::string command = request.data.size() > 2 ? request.data[2] : "";
if (service.empty() || user.empty() || command.empty())
request.Reply("error", "Invalid parameters");
request.Error(-32602, "Invalid parameters");
else
{
BotInfo *bi = BotInfo::Find(service, true);
if (!bi)
request.Reply("error", "Invalid service");
request.Error(-32000, "Invalid service");
else
{
request.Reply("result", "Success");
NickAlias *na = NickAlias::Find(user);
Anope::string out;
@@ -127,7 +131,7 @@ private:
Anope::string password = request.data.size() > 1 ? request.data[1] : "";
if (username.empty() || password.empty())
request.Reply("error", "Invalid parameters");
request.Error(-32602, "Invalid parameters");
else
{
auto *req = new RPCIdentifyRequest(me, request, client, iface, username, password);
@@ -273,8 +277,6 @@ private:
return;
u->SendMessage(bi, message);
request.Reply("result", "Success");
}
};