From f326aa22a6ce7a08160d823cc2dea5bf04ae293c Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Wed, 15 Jun 2022 00:00:57 +0200 Subject: [PATCH] Whitespace --- domain-server/src/DomainGatekeeper.cpp | 28 ++++++++--------- domain-server/src/DomainServer.cpp | 6 ++-- domain-server/src/DomainServerNodeData.cpp | 2 +- .../src/DomainServerSettingsManager.cpp | 4 +-- ice-server/src/IceServer.cpp | 30 +++++++++---------- tools/oven/src/BakerCLI.cpp | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index d55a00dcf1..0664986e23 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -123,7 +123,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointersetPlaceName(nodeConnection.placeName); QMetaEnum metaEnum = QMetaEnum::fromType(); - qDebug() << "Allowed connection from node" << uuidStringWithoutCurlyBraces(node->getUUID()) - << "on" << message->getSenderSockAddr() - << "with MAC" << nodeConnection.hardwareAddress - << "and machine fingerprint" << nodeConnection.machineFingerprint - << "user" << username + qDebug() << "Allowed connection from node" << uuidStringWithoutCurlyBraces(node->getUUID()) + << "on" << message->getSenderSockAddr() + << "with MAC" << nodeConnection.hardwareAddress + << "and machine fingerprint" << nodeConnection.machineFingerprint + << "user" << username << "reason" << QString(metaEnum.valueToKey(nodeConnection.connectReason)) << "previous connection uptime" << nodeConnection.previousConnectionUpTime/USECS_PER_MSEC << "msec" << "sysinfo" << nodeConnection.SystemInfo; @@ -163,7 +163,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer_settingsManager.getDomainServerGroupNames() .filter(QRegularExpression("^(.*[\\s,])?" + QRegularExpression::escape(userGroup) + "([\\s,].*)?$", @@ -303,7 +303,7 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin auto userGroups = _domainGroupMemberships[verifiedDomainUserName]; foreach(QString userGroup, userGroups) { // A domain group is signified by a leading special character, "@". - // Multiple domain groups may be specified in one domain server setting as a comma- and/or space-separated lists of + // Multiple domain groups may be specified in one domain server setting as a comma- and/or space-separated lists of // domain group names. For example, "@silver @Gold, @platinum". auto domainGroups = _server->_settingsManager.getDomainServerBlacklistGroupNames() .filter(QRegularExpression("^(.*[\\s,])?" + QRegularExpression::escape(userGroup) + "([\\s,].*)?$", @@ -374,7 +374,7 @@ void DomainGatekeeper::updateNodePermissions() { sendingAddress == QHostAddress::LocalHost); } - userPerms = setPermissionsForUser(isLocalUser, verifiedUsername, verifiedDomainUserName, + userPerms = setPermissionsForUser(isLocalUser, verifiedUsername, verifiedDomainUserName, connectingAddr.getAddress(), hardwareAddress, machineFingerprint); } @@ -531,7 +531,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect qDebug() << "Stalling login because we haven't authenticated user yet:" << domainUsername; #endif - } else if (verifyDomainUserIdentity(domainUsername, domainAccessToken, domainRefreshToken, + } else if (verifyDomainUserIdentity(domainUsername, domainAccessToken, domainRefreshToken, nodeConnection.senderSockAddr)) { // User's domain identity is confirmed. verifiedDomainUsername = domainUsername; @@ -564,7 +564,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect } sendConnectionDeniedPacket("You lack the required domain permissions to connect to this domain.", - nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain, + nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain, domainAuthURL + "|" + domainAuthClientID); } else { sendConnectionDeniedPacket("You lack the required metaverse permissions to connect to this domain.", @@ -766,7 +766,7 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username, } -bool DomainGatekeeper::needToVerifyDomainUserIdentity(const QString& username, const QString& accessToken, +bool DomainGatekeeper::needToVerifyDomainUserIdentity(const QString& username, const QString& accessToken, const QString& refreshToken) { return !_verifiedDomainUserIdentities.contains(username) || _verifiedDomainUserIdentities.value(username) != QPair(accessToken, refreshToken); @@ -1298,7 +1298,7 @@ void DomainGatekeeper::requestDomainUserFinished() { } else { // Failure. - qDebug() << "Error in response for user details -" << httpStatus << requestReply->error() + qDebug() << "Error in response for user details -" << httpStatus << requestReply->error() << "-" << rootObject["error"].toString() << rootObject["error_description"].toString(); _inFlightDomainUserIdentityRequests.clear(); diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 1c6aa04dca..0c9750775a 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -910,7 +910,7 @@ void DomainServer::setUpWebRTCSignalingServer() { auto limitedNodeList = DependencyManager::get(); // Route inbound WebRTC signaling messages received from user clients. - connect(_webrtcSignalingServer.get(), &WebRTCSignalingServer::messageReceived, + connect(_webrtcSignalingServer.get(), &WebRTCSignalingServer::messageReceived, this, &DomainServer::routeWebRTCSignalingMessage); // Route domain server signaling messages. @@ -922,9 +922,9 @@ void DomainServer::setUpWebRTCSignalingServer() { // Forward signaling messages received from assignment clients to user client. PacketReceiver& packetReceiver = limitedNodeList->getPacketReceiver(); packetReceiver.registerListener(PacketType::WebRTCSignaling, - PacketReceiver::makeUnsourcedListenerReference(this, + PacketReceiver::makeUnsourcedListenerReference(this, &DomainServer::forwardAssignmentClientSignalingMessageToUserClient)); - connect(this, &DomainServer::webrtcSignalingMessageForUserClient, + connect(this, &DomainServer::webrtcSignalingMessageForUserClient, _webrtcSignalingServer.get(), &WebRTCSignalingServer::sendMessage); } diff --git a/domain-server/src/DomainServerNodeData.cpp b/domain-server/src/DomainServerNodeData.cpp index 486b51f9eb..d33b1d587e 100644 --- a/domain-server/src/DomainServerNodeData.cpp +++ b/domain-server/src/DomainServerNodeData.cpp @@ -36,7 +36,7 @@ QJsonObject DomainServerNodeData::overrideValuesIfNeeded(const QJsonObject& newS for (auto it = newStats.constBegin(); it != newStats.constEnd(); ++it) { const auto& key = it.key(); const auto& value = it.value(); - + auto overrideIt = value.isString() ? _overrideHash.find({key, value.toString()}) : _overrideHash.end(); if (overrideIt != _overrideHash.end()) { // We have a match, override the value diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 868098d042..c1bc48764b 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -486,7 +486,7 @@ void DomainServerSettingsManager::setupConfigMap(const QString& userConfigFilena QVariant* client_id = _configMap.valueForKeyPath(OAUTH_CLIENT_ID); if (client_id) { QVariant* oauthEnable = _configMap.valueForKeyPath(OAUTH_ENABLE, true); - + *oauthEnable = QVariant(true); } @@ -970,7 +970,7 @@ void DomainServerSettingsManager::processNodeKickRequestPacket(QSharedPointergetActiveSocket() ? matchingNode->getActiveSocket()->getAddress() diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 0e3997a0ea..dd2a96d6a9 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -44,7 +44,7 @@ IceServer::IceServer(int argc, char* argv[]) : // set processPacket as the verified packet callback for the udt::Socket _serverSocket.setPacketHandler([this](std::unique_ptr packet) { processPacket(std::move(packet)); }); - + // set packetVersionMatch as the verify packet operator for the udt::Socket using std::placeholders::_1; _serverSocket.setPacketFilterOperator(std::bind(&IceServer::packetVersionMatch, this, _1)); @@ -62,7 +62,7 @@ IceServer::IceServer(int argc, char* argv[]) : bool IceServer::packetVersionMatch(const udt::Packet& packet) { PacketType headerType = NLPacket::typeInHeader(packet); PacketVersion headerVersion = NLPacket::versionInHeader(packet); - + if (headerVersion == versionForPacketType(headerType)) { return true; } else { @@ -73,10 +73,10 @@ bool IceServer::packetVersionMatch(const udt::Packet& packet) { void IceServer::processPacket(std::unique_ptr packet) { auto nlPacket = NLPacket::fromBase(std::move(packet)); - + // make sure that this packet at least looks like something we can read if (nlPacket->getPayloadSize() >= NLPacket::localHeaderSize(PacketType::ICEServerHeartbeat)) { - + if (nlPacket->getType() == PacketType::ICEServerHeartbeat) { SharedNetworkPeer peer = addOrUpdateHeartbeatingPeer(*nlPacket); if (peer) { @@ -94,31 +94,31 @@ void IceServer::processPacket(std::unique_ptr packet) { } } else if (nlPacket->getType() == PacketType::ICEServerQuery) { QDataStream heartbeatStream(nlPacket.get()); - + // this is a node hoping to connect to a heartbeating peer - do we have the heartbeating peer? QUuid senderUUID; heartbeatStream >> senderUUID; - + // pull the public and private sock addrs for this peer SockAddr publicSocket, localSocket; heartbeatStream >> publicSocket >> localSocket; - + // check if this node also included a UUID that they would like to connect to QUuid connectRequestID; heartbeatStream >> connectRequestID; - + SharedNetworkPeer matchingPeer = _activePeers.value(connectRequestID); - + if (matchingPeer) { - + qDebug() << "Sending information for peer" << connectRequestID << "to peer" << senderUUID; - + // we have the peer they want to connect to - send them pack the information for that peer sendPeerInformationPacket(*matchingPeer, &nlPacket->getSenderSockAddr()); - + // we also need to send them to the active peer they are hoping to connect to // create a dummy peer object we can pass to sendPeerInformationPacket - + NetworkPeer dummyPeer(senderUUID, publicSocket, localSocket); sendPeerInformationPacket(dummyPeer, matchingPeer->getActiveSocket()); } else { @@ -160,7 +160,7 @@ SharedNetworkPeer IceServer::addOrUpdateHeartbeatingPeer(NLPacket& packet) { // update our last heard microstamp for this network peer to now matchingPeer->setLastHeardMicrostamp(usecTimestampNow()); - + return matchingPeer; } else { // not verified, return the empty peer object @@ -296,7 +296,7 @@ void IceServer::sendPeerInformationPacket(const NetworkPeer& peer, const SockAdd // get the byte array for this peer peerPacket->write(peer.toByteArray()); - + // write the current packet _serverSocket.writePacket(*peerPacket, *destinationSockAddr); } diff --git a/tools/oven/src/BakerCLI.cpp b/tools/oven/src/BakerCLI.cpp index 669b821456..807cc59cd2 100644 --- a/tools/oven/src/BakerCLI.cpp +++ b/tools/oven/src/BakerCLI.cpp @@ -26,7 +26,7 @@ #include "MaterialBaker.h" BakerCLI::BakerCLI(OvenCLIApplication* parent) : QObject(parent) { - + } void BakerCLI::bakeFile(QUrl inputUrl, const QString& outputPath, const QString& type) {