Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8052 from sethalves/fix-permissions-grid-1

Browse source 
fix some permissions-grid bugs
This commit is contained in:
Brad Hefta-Gaub 2016-06-12 17:20:50 -07:00 committed by GitHub
commit a9729830b0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,7 +128,7 @@ void DomainGatekeeper::updateNodePermissions() {
QList<SharedNodePointer> nodesToKill;
auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
limitedNodeList->eachNodeBreakable([this, limitedNodeList, &nodesToKill](const SharedNodePointer& node){
limitedNodeList->eachNode([this, limitedNodeList, &nodesToKill](const SharedNodePointer& node){
QString username = node->getPermissions().getUserName();
NodePermissions userPerms(username);
@ -167,8 +167,6 @@ void DomainGatekeeper::updateNodePermissions() {
// hang up on this node
nodesToKill << node;
}
return true;
});
foreach (auto node, nodesToKill) {
@ -264,7 +262,6 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
qDebug() << "user-permissions: no username, so:" << userPerms;
} else if (verifyUserSignature(username, usernameSignature, nodeConnection.senderSockAddr)) {
// they are sent us a username and the signature verifies it
userPerms.setUserName(username);
if (_server->_settingsManager.havePermissionsForName(username)) {
// we have specific permissions for this user.
userPerms = _server->_settingsManager.getPermissionsForName(username);
@ -274,6 +271,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameLoggedIn);
qDebug() << "user-permissions: user is logged in, so:" << userPerms;
}
userPerms.setUserName(username);
} else {
// they sent us a username, but it didn't check out
requestUserPublicKey(username);

4
libraries/networking/src/NodeList.cpp
View file

@ -543,7 +543,9 @@ void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message)
setSessionUUID(newUUID);
// pull the permissions/right/privileges for this node out of the stream
packetStream >> _permissions;
NodePermissions newPermissions;
packetStream >> newPermissions;
setPermissions(newPermissions);
// pull each node in the packet
while (packetStream.device()->pos() < message->getSize()) {