Server: allow self-signed certificate for ldap auth #11531
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅ |
|
I have read the CLA Document and I hereby sign the CLA |
|
recheck |
rcrisanti
force-pushed
the
feat/server-ldap-self-signed-cert
branch
from
d2ed06a to
17e92bb
Compare
rcrisanti
force-pushed
the
feat/server-ldap-self-signed-cert
branch
from
17e92bb to
8c43f80
Compare
laurent22
reviewed
Dec 18, 2024
packages/server/src/config.ts
Outdated
| @@ -125,6 +125,7 @@ function ldapConfigFromEnv(env: EnvVariables): LdapConfig[] { | |||
| baseDN: env.LDAP_1_BASE_DN, | |||
| bindDN: env.LDAP_1_BIND_DN, | |||
| bindPW: env.LDAP_1_BIND_PW, | |||
| sslCaFile: env.LDAP_1_SSL_CA_FILE, | |||
There was a problem hiding this comment.
Please use "tls" instead of "ssl" for all properties and env variables
| @@ -3,6 +3,7 @@ import { User } from '../services/database/types'; | |||
| import Logger from '@joplin/utils/Logger'; | |||
| import { LdapConfig } from './types'; | |||
| import { ErrorForbidden } from './errors'; | |||
| import { readFileSync } from 'node:fs'; | |||
There was a problem hiding this comment.
Please use readFile from fs/promises. We generally don't use sync function since they block the main thread
| let tlsOptions; | ||
| if (sslCaFile.length !== 0) { | ||
| tlsOptions = { | ||
| ca: [readFileSync(sslCaFile)], |
There was a problem hiding this comment.
Don't forget to use await readFile here
Comment on lines
36
to
38
| } else { | ||
| null; | ||
| } |
rcrisanti
force-pushed
the
feat/server-ldap-self-signed-cert
branch
from
9818770 to
caa8e92
Compare
|
That looks good now, thank you for implementing this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the ability to specify a local certificate file for using the LDAP authentication with a self-signed certificate. This was first proposed in the forum here. It adds new env variables (
LDAP_1_TLS_CA_FILE&LDAP_2_TLS_CA_FILE) that can point to the appropriate public key.I'm not sure if there is any way to include a test for this, but I tested it locally and it seems to be working well.