CHANGE(server): Always trim usernames

A username will now always be trimmed before it gets assigned to a user.
That means that names with leading and/or trailing whitespace are now no
longer possible.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
index 8e42e4042..cfde87e2a 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
@@ -180,7 +180,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
 	Channel *root = qhChannels.value(0);
 	Channel *c;
 
-	uSource->qsName = u8(msg.username());
+	uSource->qsName = u8(msg.username()).trimmed();
 
 	bool ok     = false;
 	bool nameok = validateUserName(uSource->qsName);
@@ -1939,7 +1939,7 @@ void Server::msgUserList(ServerUser *uSource, MumbleProto::UserList &msg) {
 				log(uSource, QString::fromLatin1("Unregistered user %1").arg(id));
 				unregisterUser(id);
 			} else {
-				const QString &name = u8(user.name());
+				const QString &name = u8(user.name()).trimmed();
 				if (validateUserName(name)) {
 					log(uSource, QString::fromLatin1("Renamed user %1 to '%2'").arg(QString::number(id), name));