mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-26 06:04:49 +00:00
a353ffddd0
Support having more than one auth token per namespace, so separate tokens can be handed out to clients that are still landing in the same namespace. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
93 lines
3.1 KiB
C
93 lines
3.1 KiB
C
#include <dix-config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <X11/Xmd.h>
|
|
|
|
#include "dix/dix_priv.h"
|
|
#include "dix/property_priv.h"
|
|
#include "dix/selection_priv.h"
|
|
#include "include/os.h"
|
|
#include "miext/extinit_priv.h"
|
|
#include "Xext/xacestr.h"
|
|
|
|
#include "namespace.h"
|
|
#include "hooks.h"
|
|
|
|
Bool noNamespaceExtension = TRUE;
|
|
|
|
DevPrivateKeyRec namespaceClientPrivKeyRec = { 0 };
|
|
|
|
void
|
|
NamespaceExtensionInit(void)
|
|
{
|
|
XNS_LOG("initializing namespace extension ...\n");
|
|
|
|
/* load configuration */
|
|
if (!XnsLoadConfig()) {
|
|
XNS_LOG("No config file. disabling Xns extension\n");
|
|
return;
|
|
}
|
|
|
|
if (!(dixRegisterPrivateKey(&namespaceClientPrivKeyRec, PRIVATE_CLIENT,
|
|
sizeof(struct XnamespaceClientPriv)) &&
|
|
AddCallback(&ClientStateCallback, hookClientState, NULL) &&
|
|
AddCallback(&PostInitRootWindowCallback, hookInitRootWindow, NULL) &&
|
|
AddCallback(&PropertyFilterCallback, hookWindowProperty, NULL) &&
|
|
AddCallback(&SelectionFilterCallback, hookSelectionFilter, NULL) &&
|
|
XaceRegisterCallback(XACE_CLIENT_ACCESS, hookClient, NULL) &&
|
|
XaceRegisterCallback(XACE_DEVICE_ACCESS, hookDevice, NULL) &&
|
|
XaceRegisterCallback(XACE_EXT_DISPATCH, hookExtDispatch, NULL) &&
|
|
XaceRegisterCallback(XACE_EXT_ACCESS, hookExtAccess, NULL) &&
|
|
XaceRegisterCallback(XACE_PROPERTY_ACCESS, hookPropertyAccess, NULL) &&
|
|
XaceRegisterCallback(XACE_RECEIVE_ACCESS, hookReceive, NULL) &&
|
|
XaceRegisterCallback(XACE_RESOURCE_ACCESS, hookResourceAccess, NULL) &&
|
|
XaceRegisterCallback(XACE_SEND_ACCESS, hookSend, NULL) &&
|
|
XaceRegisterCallback(XACE_SERVER_ACCESS, hookServerAccess, NULL)))
|
|
FatalError("NamespaceExtensionInit: allocation failure\n");
|
|
|
|
/* Do the serverClient */
|
|
struct XnamespaceClientPriv *srv = XnsClientPriv(serverClient);
|
|
*srv = (struct XnamespaceClientPriv) { .isServer = TRUE };
|
|
XnamespaceAssignClient(srv, &ns_root);
|
|
}
|
|
|
|
void XnamespaceAssignClient(struct XnamespaceClientPriv *priv, struct Xnamespace *newns)
|
|
{
|
|
if (priv->ns != NULL)
|
|
priv->ns->refcnt--;
|
|
|
|
priv->ns = newns;
|
|
|
|
if (newns != NULL)
|
|
newns->refcnt++;
|
|
}
|
|
|
|
void XnamespaceAssignClientByName(struct XnamespaceClientPriv *priv, const char *name)
|
|
{
|
|
struct Xnamespace *newns = XnsFindByName(name);
|
|
|
|
if (newns == NULL)
|
|
newns = &ns_anon;
|
|
|
|
XnamespaceAssignClient(priv, newns);
|
|
}
|
|
|
|
struct Xnamespace* XnsFindByAuth(size_t szAuthProto, const char* authProto, size_t szAuthToken, const char* authToken)
|
|
{
|
|
struct Xnamespace *walk;
|
|
xorg_list_for_each_entry(walk, &ns_list, entry) {
|
|
struct auth_token *at;
|
|
xorg_list_for_each_entry(at, &walk->auth_tokens, entry) {
|
|
int protoLen = at->authProto ? strlen(at->authProto) : 0;
|
|
if ((protoLen == szAuthProto) &&
|
|
(at->authTokenLen == szAuthToken) &&
|
|
(memcmp(at->authTokenData, authToken, szAuthToken)==0) &&
|
|
(memcmp(at->authProto, authProto, szAuthProto)==0))
|
|
return walk;
|
|
}
|
|
}
|
|
|
|
// default to anonymous if credentials aren't assigned to specific NS
|
|
return &ns_anon;
|
|
}
|