From 2aac53670e65dd95865c2e6511ed66833dd39915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bennet=20Ble=C3=9Fmann?= Date: Wed, 5 Aug 2020 00:07:15 +0200 Subject: [PATCH 1/3] add starttls field to ldap in Config interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bennet Bleßmann --- src/lib/config/interfaces.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/config/interfaces.ts b/src/lib/config/interfaces.ts index 8fa6023f9..c9593b329 100644 --- a/src/lib/config/interfaces.ts +++ b/src/lib/config/interfaces.ts @@ -127,6 +127,7 @@ export interface Config { usernameField: string; useridField: string; tlsca: string; + starttls?: boolean; tlsOptions: { ca: string[]; }; From e316f1dcd9cd3075e50bc82e4b1fdb9c4a807009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bennet=20Ble=C3=9Fmann?= Date: Wed, 5 Aug 2020 00:09:19 +0200 Subject: [PATCH 2/3] fix eslint warning and error, one each MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix warning line 38 Missing return type on function fix error line 47 Missing space before function parentheses Signed-off-by: Bennet Bleßmann --- src/lib/models/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/models/index.ts b/src/lib/models/index.ts index d5fa713a3..d96e570fe 100644 --- a/src/lib/models/index.ts +++ b/src/lib/models/index.ts @@ -35,7 +35,7 @@ const umzug = new Umzug({ }, // Required wrapper function required to prevent winstion issue // https://github.com/winstonjs/winston/issues/1577 - logging: message => { + logging: (message): void => { logger.info(message) }, storage: 'sequelize', @@ -44,7 +44,7 @@ const umzug = new Umzug({ } }) -export async function runMigrations(): Promise { +export async function runMigrations (): Promise { // checks migrations and run them if they are not already applied // exit in case of unsuccessful migrations await umzug.up().catch(error => { From 8811ba6dfee34a5f99aa7b84ab52ad1c78d40006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bennet=20Ble=C3=9Fmann?= Date: Wed, 5 Aug 2020 00:45:06 +0200 Subject: [PATCH 3/3] add ldap.starttls to config file docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bennet Bleßmann --- docs/configuration-config-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration-config-file.md b/docs/configuration-config-file.md index 17b608a3f..db00e3a82 100644 --- a/docs/configuration-config-file.md +++ b/docs/configuration-config-file.md @@ -140,7 +140,7 @@ these are rarely used for various reasons. | variables | example values | description | | --------- | ------ | ----------- | -| `ldap` | `{providerName: ..., url: ..., bindDn: ..., bindCredentials: ..., searchBase: ..., searchFilter: ..., searchAttributes: ..., usernameField: ..., useridField: ..., tlsca: ...}` | An object detailing the LDAP connection. Refer to the [LDAP-AD guide](guides/auth/ldap-AD.md) for more details! | +| `ldap` | `{providerName: ..., url: ..., bindDn: ..., bindCredentials: ..., searchBase: ..., searchFilter: ..., searchAttributes: ..., usernameField: ..., useridField: ..., starttls: ..., tlsca: ...}` | An object detailing the LDAP connection. Refer to the [LDAP-AD guide](guides/auth/ldap-AD.md) for more details! | ### OAuth2 Login