Fix bug

RetireJS · Aug 11, 2024 · ef5a814 · ef5a814
1 parent 58769a0
commit ef5a814
Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/node/lib/retire.js b/node/lib/retire.js
@@ -167,8 +167,11 @@ exports.scanUri = function (uri, repo) {
   return check(result, repo);
 };
 
-exports.scanFileName = function (fileName, repo) {
+exports.scanFileName = function (fileName, repo, includeUri = false) {
   var result = scan(fileName, 'filename', repo, splitAndMatchAll(/[\/\\]/));
+  if (includeUri) {
+    result = result.concat(scan(fileName.replace(/\\/g, '/'), 'uri', repo));
+  }
   return check(result, repo);
 };
 

diff --git a/node/spec/tests/filenamescan.spec.js b/node/spec/tests/filenamescan.spec.js
@@ -57,12 +57,12 @@ describe('filename scan', function () {
     done();
   });
   it('should_be_vulnerable_when_path_matches_uri_linux', function (done) {
-    var result = retire.scanFileName('/usr/file/1.8.1/jquery.js', repo);
+    var result = retire.scanFileName('/usr/file/1.8.1/jquery.js', repo, true);
     assert.isVulnerable(result);
     done();
   });
   it('should_be_vulnerable_when_path_matches_uri_win', function (done) {
-    var result = retire.scanFileName('\\usr\\file\\1.8.1\\jquery.js', repo);
+    var result = retire.scanFileName('\\usr\\file\\1.8.1\\jquery.js', repo, true);
     assert.isVulnerable(result);
     done();
   });

diff --git a/node/src/retire.d.ts b/node/src/retire.d.ts
@@ -8,7 +8,7 @@ export declare function isVulnerable(results: Component[]): boolean;
 
 export declare function scanUri(uri: string, repo: Repository): Component[];
 
-export declare function scanFileName(fileName: string, repo: Repository): Component[];
+export declare function scanFileName(fileName: string, repo: Repository, includeUri: boolean): Component[];
 
 export declare function scanFileContent(content: string, repo: Repository, hasher: Hasher): Component[];
 

diff --git a/node/src/scanner.ts b/node/src/scanner.ts
@@ -111,10 +111,7 @@ export function scanJsFile(file: string, repo: Repository, options: Options) {
   if (options.ignore && shouldIgnorePath([file], options.ignore)) {
     return;
   }
-  let results = retire.scanUri(file, repo);
-  if (!results || results.length === 0) {
-    results = retire.scanFileName(file, repo);
-  }
+  let results = retire.scanFileName(file, repo, true);
   if (!results || results.length === 0) {
     const content = fs.readFileSync(file, 'utf-8');
     results = retire.scanFileContent(content, repo, hash);