#1251 Lowercase user logins

TheHive-Project · Mar 10, 2020 · fb3b229 · fb3b229
1 parent 1bba184
commit fb3b229
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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 != "[email protected]") 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