Merge pull request #1 from bekk/master

rebase from bekk/retire.js
AdamBarah · May 10, 2017 · c5136e8 · c5136e8
2 parents 8abb0f7 + 3c1c217
commit c5136e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/node/bin/retire b/node/bin/retire
@@ -66,7 +66,7 @@ if(config.ignorefile) {
     process.exit(1);
   }
   var lines = fs.readFileSync(config.ignorefile).toString().split(/\r\n|\n/g).filter(function(e) { return e !== ''; });
-  ignored = _.map(lines, function(e) { return path.resolve(e); });
+  ignored = _.map(lines, function(e) { return e[0] === '@' ? e.slice(1) : path.resolve(e); });
   config.ignore = config.ignore.concat(ignored);
 }
 

diff --git a/node/lib/scanner.js b/node/lib/scanner.js
@@ -49,7 +49,7 @@ function scanJsFile(file, repo, options) {
   var results = retire.scanFileName(file, repo);
   if (!retire.isVulnerable(results)) {
     results = retire.scanFileContent(fs.readFileSync(file), repo, hash);
-  }  
+  }
   printResults(file, results, options);
 }
 
@@ -60,6 +60,9 @@ function printParent(comp, options) {
 
 function scanDependencies(dependencies, nodeRepo, options) {
   for (var i in dependencies) {
+    if (options.ignore && shouldIgnore(dependencies[i].component, options.ignore)) {
+      return;
+    }
 		results = retire.scanNodeDependency(dependencies[i], nodeRepo);
 		if (retire.isVulnerable(results)) {
 			events.emit('vulnerable-dependency-found');