Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 22:35:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9663 from davidkelly/dk/2789

Browse source 
Don't allow a ban of any node on same machine as domain-server
This commit is contained in:
Howard Stearns 2017-02-13 14:23:26 -08:00 committed by GitHub
commit 7853899f9f
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -667,7 +667,17 @@ void DomainServerSettingsManager::processNodeKickRequestPacket(QSharedPointer<Re
auto& kickAddress = matchingNode->getActiveSocket() auto& kickAddress = matchingNode->getActiveSocket()
? matchingNode->getActiveSocket()->getAddress() ? matchingNode->getActiveSocket()->getAddress()
: matchingNode->getPublicSocket().getAddress(); : matchingNode->getPublicSocket().getAddress();
// probably isLoopback covers it, as whenever I try to ban an agent on same machine as the domain-server
// it is always 127.0.0.1, but looking at the public and local addresses just to be sure
// TODO: soon we will have feedback (in the form of a message to the client) after we kick. When we
// do, we will have a success flag, and perhaps a reason for failure. For now, just don't do it.
if (kickAddress == limitedNodeList->getPublicSockAddr().getAddress() ||
kickAddress == limitedNodeList->getLocalSockAddr().getAddress() ||
kickAddress.isLoopback() ) {
qWarning() << "attempt to kick node running on same machine as domain server, ignoring KickRequest";
return;
}
NodePermissionsKey ipAddressKey(kickAddress.toString(), QUuid()); NodePermissionsKey ipAddressKey(kickAddress.toString(), QUuid());
// check if there were already permissions for the IP // check if there were already permissions for the IP