From c898a3f5ea689469f4e1003b90162bd4233b6aeb Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 5 Sep 2023 14:01:13 -0400 Subject: [PATCH] Fixed Can't login via LDAP because of some Node.js issues. Thanks to Danny-Graf and xet7 ! Fixes #5113 --- packages/wekan-ldap/server/ldap.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/wekan-ldap/server/ldap.js b/packages/wekan-ldap/server/ldap.js index 7457c1033..4c0eccd4c 100644 --- a/packages/wekan-ldap/server/ldap.js +++ b/packages/wekan-ldap/server/ldap.js @@ -4,15 +4,19 @@ import { Log } from 'meteor/logging' // copied from https://github.com/ldapjs/node-ldapjs/blob/a113953e0d91211eb945d2a3952c84b7af6de41c/lib/filters/index.js#L167 function escapedToHex (str) { - return str.replace(/\\([0-9a-f][^0-9a-f]|[0-9a-f]$|[^0-9a-f]|$)/gi, function (match, p1) { - if (!p1) { - return '\\5c'; - } + if (str !== undefined) { + return str.replace(/\\([0-9a-f][^0-9a-f]|[0-9a-f]$|[^0-9a-f]|$)/gi, function (match, p1) { + if (!p1) { + return '\\5c'; + } - const hexCode = p1.charCodeAt(0).toString(16); - const rest = p1.substring(1); - return '\\' + hexCode + rest; - }); + const hexCode = p1.charCodeAt(0).toString(16); + const rest = p1.substring(1); + return '\\' + hexCode + rest; + }); + } else { + return undefined; + } } export default class LDAP {