Skip to content

feat: implement login attempt restriction and IP CIDR validation logic #40201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
namann5 wants to merge 6 commits into
base: develop
Choose a base branch
from
+25 −6
Open

feat: implement login attempt restriction and IP CIDR validation logic #40201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e33757
feat: implement login attempt restriction and IP CIDR validation logic
namann5 Apr 17, 2026
67d9dcc
Merge branch 'develop' into develop
namann5 Apr 17, 2026
165e75d
feat: implement login protection with IP/user-based rate limiting and…
namann5 Apr 17, 2026
774684f
Merge branch 'develop' of https://github.com/namann5/Rocket.Chat into…
namann5 Apr 17, 2026
8273341
Merge branch 'develop' into develop
namann5 Apr 17, 2026
f536cf9
Merge branch 'develop' into develop
namann5 Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions apps/meteor/app/authentication/server/lib/restrictLoginAttempts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { IServerEvent } from '@rocket.chat/core-typings';
import { ServerEventType } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Rooms, ServerEvents, Users } from '@rocket.chat/models';
import { isIpInCidrRange } from '@rocket.chat/server-fetch';

import { addMinutesToADate } from '../../../../lib/utils/addMinutesToADate';
import { getClientAddress } from '../../../../server/lib/getClientAddress';
Expand Down Expand Up @@ -52,7 +53,7 @@ export const isValidLoginAttemptByIp = async (ip: string): Promise<boolean> => {
if (
!settings.get('Block_Multiple_Failed_Logins_Enabled') ||
!settings.get('Block_Multiple_Failed_Logins_By_Ip') ||
whitelist.includes(ip)
whitelist.some((entry) => entry.trim() === ip || isIpInCidrRange(ip, entry.trim()))
Comment thread
namann5 marked this conversation as resolved.
Outdated
) {
return true;
}
Expand Down Expand Up @@ -100,7 +101,9 @@ export const isValidAttemptByUser = async (login: ILoginAttempt): Promise<boolea
return true;
}

const loginUsername = login.methodArguments[0].user?.username;
const { username, email } = (login.methodArguments[0].user || {}) as { username?: string; email?: string };
const loginUsername = username || email;
Comment thread
namann5 marked this conversation as resolved.
Outdated

if (!loginUsername) {
return true;
}
Expand Down Expand Up @@ -147,7 +150,7 @@ export const isValidAttemptByUser = async (login: ILoginAttempt): Promise<boolea
export const saveFailedLoginAttempts = async (login: ILoginAttempt): Promise<void> => {
const user: IServerEvent['u'] = {
_id: login.user?._id,
username: login.user?.username || login.methodArguments[0].user?.username,
username: login.user?.username || login.methodArguments[0].user?.username || login.methodArguments[0].user?.email,
};

await ServerEvents.insertOne({
Expand All @@ -161,7 +164,7 @@ export const saveFailedLoginAttempts = async (login: ILoginAttempt): Promise<voi
export const saveSuccessfulLogin = async (login: ILoginAttempt): Promise<void> => {
const user: IServerEvent['u'] = {
_id: login.user?._id,
username: login.user?.username || login.methodArguments[0].user?.username,
username: login.user?.username || login.methodArguments[0].user?.username || login.methodArguments[0].user?.email,
Comment thread
namann5 marked this conversation as resolved.
};

await ServerEvents.insertOne({
Expand Down
1 change: 1 addition & 0 deletions packages/server-fetch/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,5 +193,6 @@ export async function serverFetch(input: string, options?: ExtendedFetchOptions,
}

export { Response };
export { isIpInCidrRange } from './helpers';
export type { ExtendedFetchOptions };
export { parseSsrfAllowlist };