don't allow verified connection without username

This commit is contained in:
Stephen Birarda 2015-08-24 15:01:39 -07:00
parent c6f1567361
commit a9c04e5116

View file

@ -367,10 +367,6 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
bool DomainGatekeeper::isVerifiedAllowedUser(const QString& username, const QByteArray& usernameSignature,
const HifiSockAddr& senderSockAddr) {
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.";
@ -378,6 +374,11 @@ bool DomainGatekeeper::isVerifiedAllowedUser(const QString& username, const QByt
return false;
}
QStringList allowedUsers =
_server->_settingsManager.valueOrDefaultValueForKeyPath(ALLOWED_USERS_SETTINGS_KEYPATH).toStringList();
if (allowedUsers.contains(username, Qt::CaseInsensitive)) {
if (!verifyUserSignature(username, usernameSignature, senderSockAddr)) {
return false;
}