Merge 05ac40b into 7a4efaf

lib/bundle-manager.js

@@ -27,6 +27,11 @@ const watcher = chokidar.watch([
 	followSymlinks: true
 });
 
+const blacklistedBundleDirectories = [
+	'node_modules',
+	'bower_components'
+];
+
 const emitter = new EventEmitter();
 const bundles = [];
 let log;
@@ -70,6 +75,7 @@ module.exports = emitter;
  * @param Logger {Function} - A preconfigured @nodecg/logger constructor.
  * @return {Object} - A bundle-manager instance.
  */
+// eslint-disable-next-line max-params
 module.exports.init = function (bundlesPath, cfgPath, nodecgVersion, nodecgConfig, Logger) {
 	if (initialized) {
 		throw new Error('Cannot initialize when already initialized');
@@ -140,6 +146,11 @@ module.exports.init = function (bundlesPath, cfgPath, nodecgVersion, nodecgConfi
 			return;
 		}
 
+		// Prevent attempting to load unwanted directories. Those specified above and all dot-prefixed.
+		if (blacklistedBundleDirectories.indexOf(bundleFolderName) > -1 || /(?:^|[\\/])(\.(?!\.)[^\\/]+)$/.test(bundleFolderName)) {
+			return;
+		}
+
 		if (nodecgConfig && nodecgConfig.bundles && nodecgConfig.bundles.disabled &&
 			nodecgConfig.bundles.disabled.indexOf(bundleFolderName) > -1) {
 			log.debug('Not loading bundle ' + bundleFolderName + ' as it is disabled in config');
@@ -155,6 +166,7 @@ module.exports.init = function (bundlesPath, cfgPath, nodecgVersion, nodecgConfi
 		// Parse each bundle and push the result onto the bundles array
 		let bundle;
 		const bundleCfgPath = path.join(cfgPath, `${bundleFolderName}.json`);
+
 		if (fs.existsSync(bundleCfgPath)) {
 			bundle = parseBundle(bundlePath, bundleCfgPath);
 		} else {
@@ -170,14 +182,6 @@ module.exports.init = function (bundlesPath, cfgPath, nodecgVersion, nodecgConfi
 			return;
 		}
 
-		// This block can probably be removed in 0.8, but let's leave it for 0.7 just in case.
-		/* istanbul ignore next: Given how strict nodecg-bundle-parser is,
-		 it should not be possible for "bundle" to be undefined. */
-		if (typeof bundle === 'undefined') {
-			log.error('Could not load bundle in directory', bundleFolderName);
-			return;
-		}
-
 		bundles.push(bundle);
 	});
 

test/bundle-manager.js

@@ -72,6 +72,11 @@ test.serial('loader - should not load a bundle that has been disabled', t => {
 	t.is(bundle, undefined);
 });
 
+test.serial('loader - should not crash or load an invalid bundle', t => {
+	const bundle = bundleManager.find('node_modules');
+	t.is(bundle, undefined);
+});
+
 test.cb.serial('watcher - hould emit a change event when the manifest file changes', t => {
 	const manifest = JSON.parse(fs.readFileSync(`${tempFolder}/bundles/change-manifest/package.json`));
 	bundleManager.once('bundleChanged', bundle => {