Skip to content
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.

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

fix: LDAP: avoid reading empty tls cert file #2980

Merged
merged 1 commit into from
Jan 31, 2021

Conversation

kevynb
Copy link
Contributor

@kevynb kevynb commented Jan 28, 2021

Fixes #2624

We avoid reading the tlsCertPath property if it is not needed.

tlsEnabled: true, verifyTLSCertificate: true => read tlsCertPath
tlsEnabled: true, verifyTLSCertificate: true, tlsCertPath: '' => do not fs.readFileSync(conf.tlsCertPath)
tlsEnabled: true, verifyTLSCertificate: false => do not fs.readFileSync(conf.tlsCertPath)
tlsEnabled: false verifyTLSCertificate: false => do not fs.readFileSync(conf.tlsCertPath)

@NGPixel
Copy link
Member

NGPixel commented Jan 29, 2021

Please remove the package-json.lock from this PR to avoid conflicts with yarn.

@kevynb
Copy link
Contributor Author

kevynb commented Jan 30, 2021

Ah my bad! I did not intend to commit it. I removed it.

@NGPixel NGPixel merged commit b106018 into requarks:dev Jan 31, 2021
@kevynb kevynb deleted the fix/tls-options branch January 31, 2021 17:18
jionggyu pushed a commit to jionggyu/wiki-2.5.302-patch that referenced this pull request Jul 9, 2024
Co-authored-by: Kevyn Bruyere <kevyn@inovasi.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Active Directory Authentication does not work
3 participants