Regression: Match name or fname when fetching room to send notifi…

…cation for blocked log in attemps (#22067)
RocketChat · May 18, 2021 · 2dac1dd · 2dac1dd
1 parent 2afbca0
commit 2dac1dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/authentication/server/lib/restrictLoginAttempts.ts b/app/authentication/server/lib/restrictLoginAttempts.ts
@@ -21,7 +21,8 @@ export const notifyFailedLogin = async (ipOrUsername: string, blockedUntil: Date
 		return;
 	}
 	// verify channel exists
-	const room = await Rooms.findOneByName(channelToNotify);
+	// to avoid issues when "fname" is presented in the UI, check if the name matches it as well
+	const room = await Rooms.findOneByNameOrFname(channelToNotify);
 	if (!room) {
 		/* @ts-expect-error */
 		logger.error('Cannot notify failed logins: channel provided doesn\'t exists');

diff --git a/app/models/server/raw/Rooms.js b/app/models/server/raw/Rooms.js
@@ -365,4 +365,8 @@ export class RoomsRaw extends BaseRaw {
 
 		return this.update(query, update, { multi: true });
 	}
+
+	findOneByNameOrFname(name, options = {}) {
+		return this.col.findOne({ $or: [{ name }, { fname: name }] }, options);
+	}
 }