Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep Agents and EntityScriptServers from connecting if lacking permissions

Browse source
This commit is contained in:
Ryan Huffman 2017-01-19 14:35:27 -08:00
parent 3ac44e3a1c
commit b6893a0100
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
domain-server/src/DomainServer.cpp
View file

@ -953,21 +953,32 @@ void DomainServer::sendDomainListToNode(const SharedNodePointer& node, const Hif
// DTLSServerSession* dtlsSession = _isUsingDTLS ? _dtlsSessions[senderSockAddr] : NULL; // DTLSServerSession* dtlsSession = _isUsingDTLS ? _dtlsSessions[senderSockAddr] : NULL;
if (nodeData->isAuthenticated()) { if (nodeData->isAuthenticated()) {
// if this authenticated node has any interest types, send back those nodes as well // if this authenticated node has any interest types, send back those nodes as well
limitedNodeList->eachNode([&](const SharedNodePointer& otherNode){ limitedNodeList->eachNode([&](const SharedNodePointer& otherNode) {
if (otherNode->getUUID() != node->getUUID() if (otherNode->getUUID() != node->getUUID()
&& nodeInterestSet.contains(otherNode->getType())) { && nodeInterestSet.contains(otherNode->getType())) {
// since we're about to add a node to the packet we start a segment
domainListPackets->startSegment();
// don't send avatar nodes to other avatars, that will come from avatar mixer // (1/19/17) Agents only need to connect to Entity Script Servers to perform administrative tasks
domainListStream << *otherNode.data(); // related to entity server scripts. Only agents with rez permissions should be doing that, so
// if the agent does not have those permissions, we do not want them and the server to incur the
// overhead of connecting to one another.
bool shouldNotConnect = (node->getType() == NodeType::Agent && otherNode->getType() == NodeType::EntityScriptServer
&& !node->getCanRez() && !node->getCanRezTmp())
|| (node->getType() == NodeType::EntityScriptServer && otherNode->getType() == NodeType::Agent
&& !otherNode->getCanRez() && !otherNode->getCanRezTmp());
// pack the secret that these two nodes will use to communicate with each other if (!shouldNotConnect) {
domainListStream << connectionSecretForNodes(node, otherNode); // since we're about to add a node to the packet we start a segment
domainListPackets->startSegment();
// we've added the node we wanted so end the segment now // don't send avatar nodes to other avatars, that will come from avatar mixer
domainListPackets->endSegment(); domainListStream << *otherNode.data();
// pack the secret that these two nodes will use to communicate with each other
domainListStream << connectionSecretForNodes(node, otherNode);
// we've added the node we wanted so end the segment now
domainListPackets->endSegment();
}
} }
}); });
} }