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

Get basics working

Browse source
This commit is contained in:
David Rowe 2020-07-25 16:22:52 +12:00
parent 9bb913983d
commit 82252cdc08
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -514,7 +514,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
nodeConnection.machineFingerprint); nodeConnection.machineFingerprint);
if (!userPerms.can(NodePermissions::Permission::canConnectToDomain)) { if (!userPerms.can(NodePermissions::Permission::canConnectToDomain)) {
if (domainHasLogin() && !domainUsername.isEmpty()) { if (domainHasLogin()) {
sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.", sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.",
nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain); nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain);
} else { } else {

2
libraries/networking/src/DomainHandler.cpp
View file

@ -221,6 +221,8 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) {
QString previousHost = _domainURL.host(); QString previousHost = _domainURL.host();
_domainURL = domainURL; _domainURL = domainURL;
_hasCheckedForDomainAccessToken = false;
if (previousHost != domainURL.host()) { if (previousHost != domainURL.host()) {
qCDebug(networking) << "Updated domain hostname to" << domainURL.host(); qCDebug(networking) << "Updated domain hostname to" << domainURL.host();

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

@ -486,10 +486,10 @@ void NodeList::sendDomainServerCheckIn() {
// ####### If get into difficulties, could perhaps send domain's username and signature instead of metaverse. // ####### If get into difficulties, could perhaps send domain's username and signature instead of metaverse.
bool domainLoginIsConnected = false; bool domainLoginIsConnected = false;
if (!domainLoginIsConnected) { if (!domainLoginIsConnected) {
if (true) { if (false) { // ####### For testing, false causes user to be considered "not logged in".
packetStream << QString("a@b.c"); packetStream << QString("a@b.c");
if (true) { if (true) { // ####### For testing, false is unhandled at this stage.
packetStream << QString("signature"); packetStream << QString("signature"); // #######: Consider "logged in" if this is sent during testing.
} }
} }
} }