Merge branch 'main' into hmakholm/pr/fix-escaping

lib/fingerprints.js

@@ -197,6 +197,10 @@ function resolveUriToFile(location, artifacts, checkoutPath, logger) {
         logger.debug(`Unable to compute fingerprint for non-existent file: ${uri}`);
         return undefined;
     }
+    if (fs.statSync(uri).isDirectory()) {
+        logger.debug(`Unable to compute fingerprint for directory: ${uri}`);
+        return undefined;
+    }
     return uri;
 }
 exports.resolveUriToFile = resolveUriToFile;

lib/fingerprints.test.js

@@ -145,6 +145,10 @@ ava_1.default("resolveUriToFile", (t) => {
     // Invalid indexes are discarded
     t.is(testResolveUriToFile(undefined, 1, [filepath]), undefined);
     t.is(testResolveUriToFile(undefined, "0", [filepath]), undefined);
+    // Directories are discarded
+    const dirpath = __dirname;
+    t.is(testResolveUriToFile(dirpath, undefined, []), undefined);
+    t.is(testResolveUriToFile(`file://${dirpath}`, undefined, []), undefined);
 });
 ava_1.default("addFingerprints", (t) => {
     // Run an end-to-end test on a test file

src/fingerprints.test.ts

@@ -163,6 +163,11 @@ test("resolveUriToFile", (t) => {
   // Invalid indexes are discarded
   t.is(testResolveUriToFile(undefined, 1, [filepath]), undefined);
   t.is(testResolveUriToFile(undefined, "0", [filepath]), undefined);
+
+  // Directories are discarded
+  const dirpath = __dirname;
+  t.is(testResolveUriToFile(dirpath, undefined, []), undefined);
+  t.is(testResolveUriToFile(`file://${dirpath}`, undefined, []), undefined);
 });
 
 test("addFingerprints", (t) => {

src/fingerprints.ts

@@ -227,6 +227,11 @@ export function resolveUriToFile(
     return undefined;
   }
 
+  if (fs.statSync(uri).isDirectory()) {
+    logger.debug(`Unable to compute fingerprint for directory: ${uri}`);
+    return undefined;
+  }
+
   return uri;
 }