Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
fix(backend:config): support single-quoted environment values
johaven715e76114b23
diff --git a/backend/src/configuration/config.loader.spec.ts b/backend/src/configuration/config.loader.spec.tsnew file mode 100644index 00000000..d0f4bcca--- /dev/null+++ b/backend/src/configuration/config.loader.spec.ts@@ -0,0 +1,108 @@+import fs from 'node:fs'+import os from 'node:os'+import path from 'node:path'+import process from 'node:process'+import { ENVIRONMENT_PREFIX } from './config.constants'+import { configLoader } from './config.loader'++describe(configLoader.name, () => {+ const initialEnv = Object.fromEntries(Object.entries(process.env).filter(([key]) => key.startsWith(ENVIRONMENT_PREFIX)))+ const temporaryPaths: string[] = []++ beforeEach(() => {+ clearSyncInEnv()+ })++ afterEach(() => {+ clearSyncInEnv()+ Object.assign(process.env, initialEnv)+ for (const temporaryPath of temporaryPaths.splice(0)) {+ fs.rmSync(temporaryPath, { force: true, recursive: true })+ }+ vi.restoreAllMocks()+ })++ it.each([+ ['false', false],+ ['"false"', false],+ ["'false'", false],+ [`"'false'"`, "'false'"]+ ])('should parse %s as %s', (rawValue, expectedValue) => {+ const envKey = `${ENVIRONMENT_PREFIX}LOGGER_COLORIZE`+ process.env[envKey] = rawValue++ expect(configLoader().logger.colorize).toBe(expectedValue)+ })++ it('should apply nested overrides while preserving camelCase keys', () => {+ process.env[`${ENVIRONMENT_PREFIX}APPLICATIONS_FILES_ONLYOFFICE_EXTERNALSERVER`] = 'https://onlyoffice.example.com'++ expect(configLoader().applications.files.onlyoffice.externalServer).toBe('https://onlyoffice.example.com')+ })++ it.each([`${ENVIRONMENT_PREFIX}UNKNOWN_PROPERTY`, `${ENVIRONMENT_PREFIX}LOGGER_UNKNOWN`])(+ 'should ignore the unknown environment variable %s',+ (envKey) => {+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined)+ process.env[`${ENVIRONMENT_PREFIX}LOGGER_LEVEL`] = 'info'+ process.env[envKey] = 'value'++ const config = configLoader()++ expect(config.logger.level).toBe('info')+ expect(warnSpy).toHaveBeenCalledWith(`Ignoring unknown environment variable: "${envKey}".`)+ }+ )++ it('should load and trim a secret from a file', () => {+ const secretPath = createTemporaryFile(' secret-from-file\n')+ process.env[`${ENVIRONMENT_PREFIX}AUTH_TOKEN_ACCESS_SECRET_FILE`] = secretPath++ expect(configLoader().auth.token.access.secret).toBe('secret-from-file')+ })++ it('should preserve the base configuration when its secret file cannot be read', () => {+ const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)+ const secretFileKey = `${ENVIRONMENT_PREFIX}AUTH_TOKEN_ACCESS_SECRET_FILE`+ const temporaryDirectory = createTemporaryDirectory()+ const missingSecretPath = path.join(temporaryDirectory, 'missing-secret')+ const baseSecret = configLoader().auth.token.access.secret+ process.env[secretFileKey] = missingSecretPath++ const config = configLoader()++ expect(config.auth.token.access.secret).toBe(baseSecret)+ expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining(`Unable to store secret from file ${missingSecretPath}`))+ })++ it('should merge an environment override without replacing sibling base configuration', () => {+ const baseSecret = configLoader().applications.files.onlyoffice.secret+ process.env[`${ENVIRONMENT_PREFIX}APPLICATIONS_FILES_ONLYOFFICE_ENABLED`] = 'true'++ const onlyoffice = configLoader().applications.files.onlyoffice++ expect(onlyoffice.enabled).toBe(true)+ expect(onlyoffice.secret).toBe(baseSecret)+ })++ function clearSyncInEnv() {+ for (const key of Object.keys(process.env)) {+ if (key.startsWith(ENVIRONMENT_PREFIX)) {+ delete process.env[key]+ }+ }+ }++ function createTemporaryFile(content: string): string {+ const temporaryDirectory = createTemporaryDirectory()+ const temporaryFile = path.join(temporaryDirectory, 'secret')+ fs.writeFileSync(temporaryFile, content)+ return temporaryFile+ }++ function createTemporaryDirectory(): string {+ const temporaryDirectory = fs.mkdtempSync(path.join(os.tmpdir(), 'sync-in-config-loader-'))+ temporaryPaths.push(temporaryDirectory)+ return temporaryDirectory+ }+})diff --git a/backend/src/configuration/config.loader.ts b/backend/src/configuration/config.loader.tsindex a8b8aad5..b657c1b5 100644--- a/backend/src/configuration/config.loader.ts+++ b/backend/src/configuration/config.loader.ts@@ -64,8 +64,8 @@ function hasEnvConfig(): boolean {* Parse a raw env-string into boolean, number or leave as string.*/function parseEnvValue(value: string): any {- // remove first and last quote if exists- value = value.replace(/^"(.*)"$/, '$1')+ // Remove a matching pair of surrounding single or double quotes.+ value = value.replace(/^(["'])(.*)\1$/s, '$2')if (value === 'true') return trueif (value === 'false') return falseif (!isNaN(Number(value))) return Number(value)