fix(configuration): Fix handling of config values that start with . or .. but are not actually relative paths; e.g. ".foo" or "..bar" (#2065)

koehlerb · Brian Koehler · daffl · commit d07bf5902e9c · 2020-10-08T22:47:23.000-07:00
Co-authored-by: Brian Koehler &lt;bkoehler@langara.ca&gt;
diff --git a/packages/configuration/src/index.ts b/packages/configuration/src/index.ts
@@ -25,7 +25,7 @@ export default function init () {
             if (process.env[value]) {
               value = process.env[value];
             }
-            if (value.indexOf('.') === 0 || value.indexOf('..') === 0) {
+            if (value.indexOf('./') === 0 || value.indexOf('../') === 0) {
               // Make relative paths absolute
               value = path.resolve(
                 path.join(config.util.getEnv('NODE_CONFIG_DIR')),
diff --git a/packages/configuration/test/config/default.json b/packages/configuration/test/config/default.json
@@ -2,6 +2,8 @@
   "port": 3030,
   "environment": "NODE_ENV",
   "path": "../something",
+  "notDotPath": ".dot",
+  "notDotDotPath": "..dotdot",
   "pathFromEnv": "PATH_ENV",
   "unescaped": "\\NODE_ENV",
   "from": "default",
diff --git a/packages/configuration/test/index.test.ts b/packages/configuration/test/index.test.ts
@@ -64,6 +64,14 @@ describe('@feathersjs/configuration', () => {
     assert.strictEqual(app.get('pathFromEnv'), join(__dirname, 'something'))
   );
 
+  it('does not normalize values that start with . but are not a relative path', () =>
+    assert.strictEqual(app.get('notDotPath'), '.dot')
+  );
+
+  it('does not normalize values that start with .. but are not a relative path', () =>
+    assert.strictEqual(app.get('notDotDotPath'), '..dotdot')
+  );
+
   it('converts environment variables recursively', () =>
     assert.strictEqual(app.get('deeply').nested.env, 'testing')
   );

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export default function init () {`
`25`	`25`	`if (process.env[value]) {`
`26`	`26`	`value = process.env[value];`
`27`	`27`	`}`
`28`		`- if (value.indexOf('.') === 0 \|\| value.indexOf('..') === 0) {`
	`28`	`+ if (value.indexOf('./') === 0 \|\| value.indexOf('../') === 0) {`
`29`	`29`	`// Make relative paths absolute`
`30`	`30`	`value = path.resolve(`
`31`	`31`	`path.join(config.util.getEnv('NODE_CONFIG_DIR')),`