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

config: Fix inconsistent env vars

Browse source 
This should make the translation from env var name to config name and vice versa more consistent.

Fixes #751

Signed-off-by: Philip Molares <philip.molares@udo.edu>
This commit is contained in:
Philip Molares 2021-01-28 23:28:16 +01:00 • committed by David Mehren
parent 1883db4c93
commit 8d815cf2c5
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
4 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/config/auth.config.ts
View file

@ -276,21 +276,21 @@ export default registerAs('authConfig', async () => {
const samls = samlNames.map((samlName) => { const samls = samlNames.map((samlName) => {
return { return {
providerName: process.env[`HD_AUTH_SAML_${samlName}_PROVIDER_NAME`], providerName: process.env[`HD_AUTH_SAML_${samlName}_PROVIDER_NAME`],
idpSsoUrl: process.env[`HD_AUTH_SAML_${samlName}_IDPSSOURL`], idpSsoUrl: process.env[`HD_AUTH_SAML_${samlName}_IDP_SSO_URL`],
idpCert: process.env[`HD_AUTH_SAML_${samlName}_IDPCERT`], idpCert: process.env[`HD_AUTH_SAML_${samlName}_IDP_CERT`],
clientCert: process.env[`HD_AUTH_SAML_${samlName}_CLIENTCERT`], clientCert: process.env[`HD_AUTH_SAML_${samlName}_CLIENT_CERT`],
issuer: process.env[`HD_AUTH_SAML_${samlName}_ISSUER`], issuer: process.env[`HD_AUTH_SAML_${samlName}_ISSUER`],
identifierFormat: identifierFormat:
process.env[`HD_AUTH_SAML_${samlName}_IDENTIFIERFORMAT`], process.env[`HD_AUTH_SAML_${samlName}_IDENTIFIER_FORMAT`],
disableRequestedAuthnContext: disableRequestedAuthnContext:
process.env[`HD_AUTH_SAML_${samlName}_DISABLEREQUESTEDAUTHNCONTEXT`], process.env[`HD_AUTH_SAML_${samlName}_DISABLE_REQUESTED_AUTHN_CONTEXT`],
groupAttribute: process.env[`HD_AUTH_SAML_${samlName}_GROUPATTRIBUTE`], groupAttribute: process.env[`HD_AUTH_SAML_${samlName}_GROUP_ATTRIBUTE`],
requiredGroups: toArrayConfig( requiredGroups: toArrayConfig(
process.env[`HD_AUTH_SAML_${samlName}_REQUIREDGROUPS`], process.env[`HD_AUTH_SAML_${samlName}_REQUIRED_GROUPS`],
'|', '|',
), ),
externalGroups: toArrayConfig( externalGroups: toArrayConfig(
process.env[`HD_AUTH_SAML_${samlName}_EXTERNALGROUPS`], process.env[`HD_AUTH_SAML_${samlName}_EXTERNAL_GROUPS`],
'|', '|',
), ),
attribute: { attribute: {

4
src/config/csp.config.ts
View file

@ -15,14 +15,14 @@ export interface CspConfig {
const cspSchema = Joi.object({ const cspSchema = Joi.object({
enable: Joi.boolean().default(true).optional().label('HD_CSP_ENABLE'), enable: Joi.boolean().default(true).optional().label('HD_CSP_ENABLE'),
reportURI: Joi.string().optional().label('HD_CSP_REPORTURI'), reportURI: Joi.string().optional().label('HD_CSP_REPORT_URI'),
}); });
export default registerAs('cspConfig', async () => { export default registerAs('cspConfig', async () => {
const cspConfig = cspSchema.validate( const cspConfig = cspSchema.validate(
{ {
enable: process.env.HD_CSP_ENABLE || true, enable: process.env.HD_CSP_ENABLE || true,
reportURI: process.env.HD_CSP_REPORTURI, reportURI: process.env.HD_CSP_REPORT_URI,
}, },
{ {
abortEarly: false, abortEarly: false,

4
src/config/media.config.ts
View file

@ -68,7 +68,7 @@ const mediaSchema = Joi.object({
imgur: Joi.when('...use', { imgur: Joi.when('...use', {
is: Joi.valid(BackendType.IMGUR), is: Joi.valid(BackendType.IMGUR),
then: Joi.object({ then: Joi.object({
clientID: Joi.string().label('HD_MEDIA_BACKEND_IMGUR_CLIENTID'), clientID: Joi.string().label('HD_MEDIA_BACKEND_IMGUR_CLIENT_ID'),
}), }),
otherwise: Joi.optional(), otherwise: Joi.optional(),
}), }),
@ -96,7 +96,7 @@ export default registerAs('mediaConfig', async () => {
container: process.env.HD_MEDIA_BACKEND_AZURE_CONTAINER, container: process.env.HD_MEDIA_BACKEND_AZURE_CONTAINER,
}, },
imgur: { imgur: {
clientID: process.env.HD_MEDIA_BACKEND_IMGUR_CLIENTID, clientID: process.env.HD_MEDIA_BACKEND_IMGUR_CLIENT_ID,
}, },
}, },
}, },

16
src/config/utils.ts
View file

@ -54,18 +54,18 @@ export const replaceAuthErrorsWithEnvironmentVariables = (
message = message.replace('.usernameField', '_USERNAME_FIELD'); message = message.replace('.usernameField', '_USERNAME_FIELD');
message = message.replace('.useridField', '_USERID_FIELD'); message = message.replace('.useridField', '_USERID_FIELD');
message = message.replace('.tlsCa', '_TLS_CA'); message = message.replace('.tlsCa', '_TLS_CA');
message = message.replace('.idpSsoUrl', '_IDPSSOURL'); message = message.replace('.idpSsoUrl', '_IDP_SSO_URL');
message = message.replace('.idpCert', '_IDPCERT'); message = message.replace('.idpCert', '_IDP_CERT');
message = message.replace('.clientCert', '_CLIENTCERT'); message = message.replace('.clientCert', '_CLIENT_CERT');
message = message.replace('.issuer', '_ISSUER'); message = message.replace('.issuer', '_ISSUER');
message = message.replace('.identifierFormat', '_IDENTIFIERFORMAT'); message = message.replace('.identifierFormat', '_IDENTIFIER_FORMAT');
message = message.replace( message = message.replace(
'.disableRequestedAuthnContext', '.disableRequestedAuthnContext',
'_DISABLEREQUESTEDAUTHNCONTEXT', '_DISABLE_REQUESTED_AUTHN_CONTEXT',
); );
message = message.replace('.groupAttribute', '_GROUPATTRIBUTE'); message = message.replace('.groupAttribute', '_GROUP_ATTRIBUTE');
message = message.replace('.requiredGroups', '_REQUIREDGROUPS'); message = message.replace('.requiredGroups', '_REQUIRED_GROUPS');
message = message.replace('.externalGroups', '_EXTERNALGROUPS'); message = message.replace('.externalGroups', '_EXTERNAL_GROUPS');
message = message.replace('.attribute.id', '_ATTRIBUTE_ID'); message = message.replace('.attribute.id', '_ATTRIBUTE_ID');
message = message.replace('.attribute.username', '_ATTRIBUTE_USERNAME'); message = message.replace('.attribute.username', '_ATTRIBUTE_USERNAME');
message = message.replace('.attribute.email', '_ATTRIBUTE_USERNAME'); message = message.replace('.attribute.email', '_ATTRIBUTE_USERNAME');