deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-04 23:02:18 +02:00
Code Issues Projects Releases Wiki Activity

ldap: type SearchOptions scope

Browse source
This commit is contained in:
Reto Brunner 2024-04-14 02:57:05 +02:00
parent 4614c35486
commit a4afa08add
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/config.ts
View file

@ -4,6 +4,7 @@ import fs, {Stats} from "fs";
import os from "os"; import os from "os";
import _ from "lodash"; import _ from "lodash";
import colors from "chalk"; import colors from "chalk";
import {SearchOptions} from "ldapjs";
import log from "./log"; import log from "./log";
import Helper from "./helper"; import Helper from "./helper";
@ -57,7 +58,7 @@ type SearchDN = {
rootPassword: string; rootPassword: string;
filter: string; filter: string;
base: string; base: string;
scope: string; scope: SearchOptions["scope"];
}; };
type Ldap = { type Ldap = {

8
server/plugins/auth/ldap.ts
View file

@ -67,11 +67,11 @@ function advancedLdapAuth(user: string, password: string, callback: (success: bo
}); });
const base = config.ldap.searchDN.base; const base = config.ldap.searchDN.base;
const searchOptions = { const searchOptions: SearchOptions = {
scope: config.ldap.searchDN.scope, scope: config.ldap.searchDN.scope,
filter: `(&(${config.ldap.primaryKey}=${userDN})${config.ldap.searchDN.filter})`, filter: `(&(${config.ldap.primaryKey}=${userDN})${config.ldap.searchDN.filter})`,
attributes: ["dn"], attributes: ["dn"],
} as SearchOptions; };
ldapclient.on("error", function (err: Error) { ldapclient.on("error", function (err: Error) {
log.error(`Unable to connect to LDAP server: ${err.toString()}`); log.error(`Unable to connect to LDAP server: ${err.toString()}`);
@ -178,12 +178,12 @@ function advancedLdapLoadUsers(users: string[], callbackLoadUser) {
const remainingUsers = new Set(users); const remainingUsers = new Set(users);
const searchOptions = { const searchOptions: SearchOptions = {
scope: config.ldap.searchDN.scope, scope: config.ldap.searchDN.scope,
filter: `${config.ldap.searchDN.filter}`, filter: `${config.ldap.searchDN.filter}`,
attributes: [config.ldap.primaryKey], attributes: [config.ldap.primaryKey],
paged: true, paged: true,
} as SearchOptions; };
ldapclient.search(base, searchOptions, function (err2, res) { ldapclient.search(base, searchOptions, function (err2, res) {
if (err2) { if (err2) {