mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-13 14:44:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove TODO for tlsOptions in ldap config

Browse source 
Signed-off-by: Yannick Bungers <git@innay.de>
This commit is contained in:
Yannick Bungers 2023-10-07 13:34:23 +02:00 • committed by David Mehren
parent b145f652e3
commit 944c67e7f1
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/config/auth.config.ts
View file

@ -7,7 +7,7 @@ import { registerAs } from '@nestjs/config';
import * as fs from 'fs'; import * as fs from 'fs';
import * as Joi from 'joi'; import * as Joi from 'joi';
import { GitlabScope} from './gitlab.enum'; import { GitlabScope } from './gitlab.enum';
import { import {
buildErrorMessage, buildErrorMessage,
ensureNoDuplicatesExist, ensureNoDuplicatesExist,
@ -58,7 +58,6 @@ export interface AuthConfig {
clientSecret: string; clientSecret: string;
scope: GitlabScope; scope: GitlabScope;
}[]; }[];
// ToDo: tlsOptions exist in config.json.example. See https://nodejs.org/api/tls.html#tls_tls_connect_options_callback
ldap: LDAPConfig[]; ldap: LDAPConfig[];
saml: { saml: {
identifier: string; identifier: string;
@ -145,7 +144,6 @@ const authSchema = Joi.object({
}).optional(), }).optional(),
) )
.optional(), .optional(),
// ToDo: should searchfilter have a default?
ldap: Joi.array() ldap: Joi.array()
.items( .items(
Joi.object({ Joi.object({
@ -172,7 +170,6 @@ const authSchema = Joi.object({
idpSsoUrl: Joi.string(), idpSsoUrl: Joi.string(),
idpCert: Joi.string(), idpCert: Joi.string(),
clientCert: Joi.string().optional(), clientCert: Joi.string().optional(),
// ToDo: (default: config.serverURL) will be build on-the-fly in the config/index.js from domain, urlAddPort and urlPath.
issuer: Joi.string().optional(), issuer: Joi.string().optional(),
identifierFormat: Joi.string() identifierFormat: Joi.string()
.default('urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress') .default('urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')
@ -301,6 +298,7 @@ export default registerAs('authConfig', () => {
idpSsoUrl: process.env[`HD_AUTH_SAML_${samlName}_IDP_SSO_URL`], idpSsoUrl: process.env[`HD_AUTH_SAML_${samlName}_IDP_SSO_URL`],
idpCert: process.env[`HD_AUTH_SAML_${samlName}_IDP_CERT`], idpCert: process.env[`HD_AUTH_SAML_${samlName}_IDP_CERT`],
clientCert: process.env[`HD_AUTH_SAML_${samlName}_CLIENT_CERT`], clientCert: process.env[`HD_AUTH_SAML_${samlName}_CLIENT_CERT`],
// ToDo: (default: config.serverURL) will be build on-the-fly in the config/index.js from domain, urlAddPort and urlPath.
issuer: process.env[`HD_AUTH_SAML_${samlName}_ISSUER`], issuer: process.env[`HD_AUTH_SAML_${samlName}_ISSUER`],
identifierFormat: identifierFormat:
process.env[`HD_AUTH_SAML_${samlName}_IDENTIFIER_FORMAT`], process.env[`HD_AUTH_SAML_${samlName}_IDENTIFIER_FORMAT`],