From fb3b2299c7bd65c7bb6b9dc71cfb7ebde65fa5f1 Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 10 Mar 2020 15:51:58 +0100 Subject: [PATCH] #1251 Lowercase user logins --- thehive/app/org/thp/thehive/services/UserSrv.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thehive/app/org/thp/thehive/services/UserSrv.scala b/thehive/app/org/thp/thehive/services/UserSrv.scala index 68e61451f5..851ca91c58 100644 --- a/thehive/app/org/thp/thehive/services/UserSrv.scala +++ b/thehive/app/org/thp/thehive/services/UserSrv.scala @@ -48,8 +48,8 @@ class UserSrv @Inject() (configuration: Configuration, roleSrv: RoleSrv, auditSr def checkUser(user: User): Try[User] = { val login = - if (!user.login.contains('@') && defaultUserDomain.isDefined) s"${user.login}@${defaultUserDomain.get}" - else user.login + if (!user.login.contains('@') && defaultUserDomain.isDefined) s"${user.login}@${defaultUserDomain.get}".toLowerCase + else user.login.toLowerCase if (fullUserNameRegex.matcher(login).matches() && login != "system@thehive.local") Success(user.copy(login = login)) else Failure(BadRequestError(s"User login is invalid, it must be an email address (found: ${user.login})")) @@ -158,7 +158,7 @@ class UserSteps(raw: GremlinScala[Vertex])(implicit db: Database, graph: Graph) if (db.isValidId(idOrName)) this.getByIds(idOrName) else getByName(idOrName) - def getByName(login: String): UserSteps = new UserSteps(raw.has(Key("login") of login)) + def getByName(login: String): UserSteps = this.has("login", login.toLowerCase) def visible(implicit authContext: AuthContext): UserSteps = if (authContext.isPermitted(Permissions.manageOrganisation.permission)) this