From a9c04e5116a7f8b58ceea2789b6041db314c7128 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 24 Aug 2015 15:01:39 -0700 Subject: [PATCH] don't allow verified connection without username --- domain-server/src/DomainGatekeeper.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index 1e040f62ed..a86ce068c3 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -367,17 +367,18 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username, bool DomainGatekeeper::isVerifiedAllowedUser(const QString& username, const QByteArray& usernameSignature, const HifiSockAddr& senderSockAddr) { + if (username.isEmpty()) { + qDebug() << "Connect request denied - no username provided."; + + sendConnectionDeniedPacket("No username provided", senderSockAddr); + + return false; + } + QStringList allowedUsers = _server->_settingsManager.valueOrDefaultValueForKeyPath(ALLOWED_USERS_SETTINGS_KEYPATH).toStringList(); if (allowedUsers.contains(username, Qt::CaseInsensitive)) { - if (username.isEmpty()) { - qDebug() << "Connect request denied - no username provided."; - - sendConnectionDeniedPacket("No username provided", senderSockAddr); - - return false; - } if (!verifyUserSignature(username, usernameSignature, senderSockAddr)) { return false; }