Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 09:49:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't allow in a user who should have edit but not verified

Browse source
This commit is contained in:
Stephen Birarda 2015-08-25 14:36:22 -07:00
parent 9940f375ea
commit c776f04ab2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -208,9 +208,6 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
}
}
// add the new node
SharedNodePointer newNode = addVerifiedNodeFromConnectRequest(nodeConnection);
// if this user is in the editors list (or if the editors list is empty) set the user's node's canAdjustLocks to true
const QVariant* allowedEditorsVariant =
valueForKeyPath(_server->_settingsManager.getSettingsMap(), ALLOWED_EDITORS_SETTINGS_KEYPATH);
@ -222,13 +219,13 @@ 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, HifiSockAddr())) {
if (!verifyUserSignature(username, usernameSignature, nodeConnection.senderSockAddr)) {
// 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. User will still be allowed to connect"
<< "but will not have edit privileges.";
qDebug() << "Could not verify user" << username << "as allowed editor. Forcing user to attempt reconnect.";
canAdjustLocks = false;
return SharedNodePointer();
} else {
// just verified this user and they are in the allowed editors list
canAdjustLocks = true;
@ -253,6 +250,9 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
canRez = canAdjustLocks;
}
// add the new node
SharedNodePointer newNode = addVerifiedNodeFromConnectRequest(nodeConnection);
// set the edit rights for this user
newNode->setCanAdjustLocks(canAdjustLocks);
newNode->setCanRez(canRez);