mirror of
https://github.com/logos-co/logos-plugin-qt.git
synced 2026-08-27 17:01:11 +00:00
feat(tokens): a LogosAPI can be built on its own token store
Origin was never consulted on the hot path — LogosAPIClient reads its store first and mints only on a miss — so a per-plugin `LogosAPI(origin=name)` was a no-op while this ctor hard-wired `&TokenManager::instance()`. What has to differ is the STORE. The existing ctors now resolve their store through `TokenManager::forIdentity(module_name)`, which returns instance() itself — pointer-identical — for every name nobody has isolated, so no existing caller changes by one byte. New: a ctor taking an explicit store, and `LogosAPI::forIdentity(name)`, which isolates first and then constructs (the required order: a client captures its store by raw pointer) and returns nullptr rather than a half-isolated identity.
This commit is contained in:
+34
-1
@@ -3,6 +3,7 @@
|
||||
#include "logos_api_provider.h"
|
||||
#include "logos_thread_marshal.h"
|
||||
#include "token_manager.h"
|
||||
#include <QDebug>
|
||||
#include <QVariant>
|
||||
#include <string>
|
||||
|
||||
@@ -14,16 +15,48 @@ LogosAPI::LogosAPI(const QString& module_name, QObject *parent)
|
||||
LogosAPI::LogosAPI(const QString& module_name,
|
||||
LogosTransportSet transports,
|
||||
QObject *parent)
|
||||
: LogosAPI(module_name, nullptr, std::move(transports), parent)
|
||||
{
|
||||
}
|
||||
|
||||
LogosAPI::LogosAPI(const QString& module_name,
|
||||
TokenManager* token_store,
|
||||
LogosTransportSet transports,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_module_name(module_name)
|
||||
, m_provider(nullptr)
|
||||
, m_token_manager(nullptr)
|
||||
{
|
||||
m_provider = new LogosAPIProvider(m_module_name, std::move(transports), this);
|
||||
m_token_manager = &TokenManager::instance();
|
||||
// An explicit store wins. NULL resolves to the store for the identity this
|
||||
// object says it is — which is TokenManager::instance() itself, the same
|
||||
// object this line used to name outright, for every identity nobody has
|
||||
// isolated. So this is not a behaviour change; it is the hook that lets one
|
||||
// BECOME a behaviour change, for one name, when a host asks for it.
|
||||
m_token_manager = token_store ? token_store
|
||||
: &TokenManager::forIdentity(m_module_name);
|
||||
qRegisterMetaType<LogosResult>("LogosResult");
|
||||
}
|
||||
|
||||
LogosAPI* LogosAPI::forIdentity(const QString& identity, QObject* parent)
|
||||
{
|
||||
if (identity.isEmpty()) {
|
||||
qWarning() << "LogosAPI::forIdentity: refusing to isolate the empty identity";
|
||||
return nullptr;
|
||||
}
|
||||
if (!TokenManager::isolateIdentity(identity)) {
|
||||
// Not advisory. A client for this name already captured the ambient
|
||||
// ring as a raw pointer, so isolating now would split the identity
|
||||
// across two stores.
|
||||
qWarning() << "LogosAPI::forIdentity: cannot isolate" << identity
|
||||
<< "- the shared token store was already handed out under"
|
||||
" that name; refusing to hand back a half-isolated identity";
|
||||
return nullptr;
|
||||
}
|
||||
return new LogosAPI(identity, &TokenManager::forIdentity(identity), parent);
|
||||
}
|
||||
|
||||
LogosAPI::LogosAPI(const std::string& module_name, QObject *parent)
|
||||
: LogosAPI(QString::fromStdString(module_name), parent)
|
||||
{
|
||||
|
||||
@@ -140,6 +140,68 @@ public:
|
||||
*/
|
||||
LogosAPI(const std::string& module_name, LogosTransportSet transports, QObject *parent = nullptr)
|
||||
: LogosAPI(QString::fromStdString(module_name), std::move(transports), parent) {}
|
||||
|
||||
/* ── per-plugin identity ────────────────────────────────────────────────
|
||||
*
|
||||
* The ctors above bind this LogosAPI to `TokenManager::forIdentity(name)`,
|
||||
* which is `TokenManager::instance()` — the image's ambient ring — unless
|
||||
* the name has been isolated. That default is byte-for-byte the old
|
||||
* behaviour, and deliberately so: nothing changes for any existing caller.
|
||||
*
|
||||
* The ctors below are how a HOST that loads several plugins into ONE
|
||||
* process gives each of them its own authority. Giving a plugin its own
|
||||
* origin STRING does nothing on its own — origin is never consulted on the
|
||||
* hot path, which reads the store first and only mints on a miss — so what
|
||||
* has to differ is the STORE the plugin presents tokens from.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @brief Construct bound to an EXPLICIT token store.
|
||||
*
|
||||
* `token_store` is normally `&TokenManager::forIdentity(module_name)` after
|
||||
* a successful `TokenManager::isolateIdentity(module_name)`; see
|
||||
* LogosAPI::forIdentity(), which packages exactly that.
|
||||
*
|
||||
* nullptr means "the store for the identity I said I am" —
|
||||
* `TokenManager::forIdentity(module_name)` — NOT the ambient singleton, so
|
||||
* an isolated identity is honoured even when the caller passes nothing.
|
||||
*
|
||||
* `parent` is deliberately NOT defaulted here: with a default it would make
|
||||
* the existing two-argument call `LogosAPI(name, nullptr)` (basecamp's
|
||||
* app/main.cpp does exactly that) ambiguous against
|
||||
* LogosAPI(const QString&, QObject*).
|
||||
*/
|
||||
LogosAPI(const QString& module_name,
|
||||
TokenManager* token_store,
|
||||
LogosTransportSet transports,
|
||||
QObject* parent);
|
||||
|
||||
/** @brief Explicit token store, default transport set. */
|
||||
LogosAPI(const QString& module_name, TokenManager* token_store, QObject* parent)
|
||||
: LogosAPI(module_name, token_store, LogosTransportSet{}, parent) {}
|
||||
|
||||
/**
|
||||
* @brief A LogosAPI that speaks AS `identity`, from an ISOLATED store.
|
||||
*
|
||||
* Isolates `identity` (idempotent) and binds the returned object to that
|
||||
* identity's private token store — seeded with the bootstrap keys and
|
||||
* nothing else, so its first call to any target must go through
|
||||
* `capability_module.requestModule` instead of finding the target's root
|
||||
* token lying in the host's ambient ring.
|
||||
*
|
||||
* Returns NULLPTR when the identity cannot be isolated, which happens only
|
||||
* if a client for that exact name was already handed the shared store. That
|
||||
* is fatal for the identity and must not be papered over by falling back to
|
||||
* the host's LogosAPI: one client on the ambient ring and one on the
|
||||
* private store is the "looks fixed, isn't" outcome this whole mechanism
|
||||
* exists to avoid. Fail the load instead.
|
||||
*
|
||||
* Isolating the store is only half of an identity. The host must also make
|
||||
* the name a KNOWN CALLER by registering an auth token for it with
|
||||
* capability_module (`informModuleToken`), or the very first
|
||||
* `requestModule` is refused by the known-caller gate.
|
||||
*/
|
||||
static LogosAPI* forIdentity(const QString& identity, QObject* parent = nullptr);
|
||||
|
||||
/**
|
||||
* @brief Destructor
|
||||
|
||||
Reference in New Issue
Block a user