Merge branch 'develop' into refactor/move-broadcastMessageFromData-to…

…-notifyListener
RocketChat · Jul 26, 2024 · cc052b8 · cc052b8
2 parents df1f140 + 7442ffc
commit cc052b8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
@@ -99,6 +99,15 @@ jobs:
           job_summary: true
           comment_on_pr: false
 
+      - name: Setup kernel limits
+        run: |
+          sudo sysctl -w net.ipv4.ip_local_port_range="500   65535"
+          sudo sysctl -w net.ipv4.tcp_mem="383865   511820   2303190"
+
+          echo fs.file-max=20000500 | sudo tee -a /etc/sysctl.conf
+          echo fs.nr_open=20000500 | sudo tee -a /etc/sysctl.conf
+          sudo sysctl -p
+
       - name: Login to GitHub Container Registry
         if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
         uses: docker/login-action@v2

diff --git a/apps/meteor/app/livechat/server/startup.ts b/apps/meteor/app/livechat/server/startup.ts
@@ -87,7 +87,7 @@ Meteor.startup(async () => {
 	});
 
 	// Remove when accounts.onLogout is async
-	Accounts.onLogout(({ user }: { user: IUser }) => {
+	Accounts.onLogout(({ user }: { user?: IUser }) => {
 		if (!user?.roles?.includes('livechat-agent') || user?.roles?.includes('bot')) {
 			return;
 		}

diff --git a/apps/meteor/client/meteorOverrides/login/saml.ts b/apps/meteor/client/meteorOverrides/login/saml.ts
@@ -21,6 +21,12 @@ declare module 'meteor/accounts-base' {
 			credentialToken?: string;
 			credentialSecret?: string;
 		};
+
+		/**
+		 * There is one case where the onlogout event is triggered with no user:
+		 * during the deletion, the user is logged out, and the framework try to get the user from the database.
+		 */
+		function onLogout(func: (options: { user?: Meteor.User; connection: Meteor.Connection }) => void): void;
 	}
 }
 

diff --git a/apps/meteor/ee/server/startup/presence.ts b/apps/meteor/ee/server/startup/presence.ts
@@ -46,8 +46,8 @@ Meteor.startup(() => {
 		})();
 	});
 
-	Accounts.onLogout((login: any): void => {
-		void Presence.removeConnection(login.user._id, login.connection.id, nodeId);
+	Accounts.onLogout((login): void => {
+		void Presence.removeConnection(login.user?._id, login.connection.id, nodeId);
 
 		updateConns();
 	});

diff --git a/apps/meteor/server/hooks/sauMonitorHooks.ts b/apps/meteor/server/hooks/sauMonitorHooks.ts
@@ -33,9 +33,12 @@ Accounts.onLogin((info: ILoginAttempt) => {
 	deviceManagementEvents.emit('device-login', eventObject);
 });
 
-Accounts.onLogout((info: { user: Meteor.User; connection: Meteor.Connection }) => {
+Accounts.onLogout((info) => {
 	const { httpHeaders } = info.connection;
 
+	if (!info.user) {
+		return;
+	}
 	sauEvents.emit('accounts.logout', {
 		userId: info.user._id,
 		connection: { instanceId: InstanceStatus.id(), ...info.connection, httpHeaders: httpHeaders as IncomingHttpHeaders },