pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-10 09:23:14 +02:00
Code Activity

Also allow hashed RPC tokens in the config file.

Browse Source
This commit is contained in:
Sadie Powell
2025-05-04 14:39:20 +01:00
parent 4b854d3935
commit 72f5e3580f
4 changed files with 70 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/modules/rpc.h
+37 -12
View File
@@ -8,6 +8,7 @@
#pragma once
#include "encryption.h"
#include "httpd.h"
#include <variant>
@@ -19,6 +20,7 @@ namespace RPC
class Map;
class Request;
class ServiceInterface;
struct Token;
class Value;
/** Represents possible types of RPC value. */
@@ -189,11 +191,32 @@ public:
virtual bool Run(ServiceInterface *iface, HTTPClient *client, Request &request) = 0;
};
struct RPC::Token final
{
std::vector<Anope::string> methods;
Anope::string token;
Anope::string token_hash;
};
class RPC::ServiceInterface
: public Service
{
private:
bool CompareToken(const RPC::Token &token, const Anope::string &rawtoken) const
{
if (token.token_hash.empty())
return token.token.equals_cs(rawtoken); // Plaintext token.
auto *service = Service::FindService("Encryption::Provider", token.token_hash);
if (!service)
return false; // Malformed hash.
auto *hashprov = static_cast<Encryption::Provider *>(service);
return hashprov->Compare(token.token, rawtoken);
}
public:
Anope::map<std::vector<Anope::string>> tokens;
std::vector<Token> tokens;
ServiceInterface(Module *creator)
: Service(creator, "RPC::ServiceInterface", "rpc")
@@ -205,20 +228,22 @@ public:
if (header.compare(0, 7, "Bearer ", 7) != 0)
return false; // No token provided.
Anope::string token;
Anope::B64Decode(header.substr(7), token);
Anope::string rawtoken;
Anope::B64Decode(header.substr(7), rawtoken);
auto it = tokens.find(token);
if (it == tokens.end())
return false; // No valid token.
for (const auto &glob : it->second)
for (const auto &token : tokens)
{
if (glob[0] == '~' && Anope::Match(method, glob.substr(1)))
return false; // Negative match.
if (!CompareToken(token, rawtoken))
continue; // No valid token.
if (Anope::Match(method, glob))
return true; // Positive match.
for (const auto &glob : token.methods)
{
if (glob[0] == '~' && Anope::Match(method, glob.substr(1)))
return false; // Negative match.
if (Anope::Match(method, glob))
return true; // Positive match.
}
}
return false; // No match.
}