Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:23:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'ds-cleanup' into asset-upload

Browse source
This commit is contained in:
Stephen Birarda 2015-08-26 15:07:43 -07:00
commit 1a019187af
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
domain-server/src/DomainGatekeeper.cpp
View file

@ -230,17 +230,15 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
if (allowedEditors.contains(username)) {
// we have a non-empty allowed editors list - check if this user is verified to be in it
if (!verifiedUsername) {
if (!verifyUserSignature(username, usernameSignature, nodeConnection.senderSockAddr)) {
if (!verifyUserSignature(username, usernameSignature, HifiSockAddr())) {
// failed to verify a user that is in the allowed editors list
sendConnectionTokenPacket(username, nodeConnection.senderSockAddr);
qDebug() << "Could not verify user" << username << "as allowed editor. Forcing user to attempt reconnect.";
return SharedNodePointer();
} else {
// just verified this user and they are in the allowed editors list
canAdjustLocks = true;
// TODO: fix public key refresh in interface/metaverse and force this check
qDebug() << "Could not verify user" << username << "as allowed editor. In the interim this user"
<< "will be given edit rights to avoid a thrasing of public key requests and connect requests.";
}
canAdjustLocks = true;
} else {
// already verified this user and they are in the allowed editors list
canAdjustLocks = true;