Skip to content

chore: Run ABAC LDAP sync on license/setting changes #37562

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

Merged
tassoevan merged 5 commits into from
Nov 20, 2025
Merged

chore: Run ABAC LDAP sync on license/setting changes #37562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68006b4
on setting change hook
KevLehman Nov 19, 2025
5ffe505
sync
KevLehman Nov 20, 2025
d3b63d4
another way
KevLehman Nov 20, 2025
616a6a5
oops
KevLehman Nov 20, 2025
aaebfd8
ooops2
KevLehman Nov 20, 2025
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
28 changes: 22 additions & 6 deletions apps/meteor/ee/server/configuration/abac.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
import { License } from '@rocket.chat/license';
import { Users } from '@rocket.chat/models';

import { settings } from '../../../app/settings/server';
import { LDAPEE } from '../sdk';

Meteor.startup(async () => {
await License.onLicense('abac', async () => {
const { addSettings } = await import('../settings/abac');
const { createPermissions } = await import('../lib/abac');
let stopWatcher: () => void;
License.onToggledFeature('abac', {
up: async () => {
const { addSettings } = await import('../settings/abac');
const { createPermissions } = await import('../lib/abac');

await addSettings();
await createPermissions();

await addSettings();
await createPermissions();
await import('../hooks/abac');

await import('../hooks/abac');
stopWatcher = settings.watch('ABAC_Enabled', async (value) => {
if (value) {
await LDAPEE.syncUsersAbacAttributes(Users.findLDAPUsers());
}
});
},
down: () => {
stopWatcher?.();
},
});
});
1 change: 1 addition & 0 deletions apps/meteor/ee/server/lib/ldap/Manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export class LDAPEEManager extends LDAPManager {
await ldap.connect();

try {
logger.debug({ msg: 'Starting ABAC attributes sync for LDAP users' });
for await (const user of users) {
await this.syncUserAbacAttribute(ldap, user);
}
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/ee/server/settings/abac.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { settingsRegistry } from '../../../app/settings/server';

export function addSettings(): void {
void settingsRegistry.addGroup('General', async function () {
export function addSettings(): Promise<void> {
return settingsRegistry.addGroup('General', async function () {
await this.with(
{
enterprise: true,
Expand Down
Loading