add unit test

aws · Jun 30, 2020 · 0936a8f · 0936a8f
1 parent aa0b201
commit 0936a8f
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 3 deletions.
diff --git a/packages/@jsii/kernel/lib/kernel.ts b/packages/@jsii/kernel/lib/kernel.ts
@@ -109,7 +109,7 @@ export class Kernel {
     fs.mkdirpSync(packageDir);
 
     // Force umask to have npm-install-like permissions
-    const umask = process.umask(0o022);
+    const originalUmask = process.umask(0o022);
     try {
       // untar the archive to its final location
       tar.extract({
@@ -122,7 +122,7 @@ export class Kernel {
       });
     } finally {
       // Reset umask to the initial value
-      process.umask(umask);
+      process.umask(originalUmask);
     }
 
     // read .jsii metadata from the root of the package

diff --git a/packages/@jsii/kernel/test/kernel.test.ts b/packages/@jsii/kernel/test/kernel.test.ts
@@ -75,6 +75,28 @@ defineTest.skip = function (
   return defineTest(name, method, test.skip);
 };
 
+test('load preserves file permissions', async () => {
+  // Changing the umask to 077 (which would neutralize group/other permissions)
+  const originalUmask = process.umask(0o077);
+
+  try {
+    const kernel = await createCalculatorSandbox(
+      'load_preserves_file_permissions',
+    );
+
+    const result = kernel.sinvoke({
+      fqn: 'jsii-calc.UmaskCheck',
+      method: 'mode',
+    });
+    expect(result.result).toBe(0o644);
+
+    return closeRecording(kernel);
+  } finally {
+    // Restore the original umask
+    process.umask(originalUmask);
+  }
+});
+
 defineTest('stats() return sandbox statistics', (sandbox) => {
   const stats = sandbox.stats({});
   expect(stats.objectCount).toBe(0);

diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
@@ -2502,3 +2502,20 @@ export abstract class Isomorphism {
         return this;
     }
 }
+
+/**
+ * Checks the current file permissions are cool (no funky UMASK down-scoping happened)
+ *
+ * @see https://github.com/aws/jsii/issues/1765
+ */
+export class UmaskCheck {
+    /**
+     * This should return 0o644 (-rw-r--r--)
+     */
+    public static mode(): number {
+        // The bit-masking is to remove the file type information from .mode
+        return fs.statSync(__filename).mode & 0o0777;
+    }
+
+    private constructor() {}
+}
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -11869,6 +11869,40 @@
         }
       ]
     },
+    "jsii-calc.UmaskCheck": {
+      "assembly": "jsii-calc",
+      "docs": {
+        "see": "https://github.com/aws/jsii/issues/1765",
+        "stability": "experimental",
+        "summary": "Checks the current file permissions are cool (no funky UMASK down-scoping happened)."
+      },
+      "fqn": "jsii-calc.UmaskCheck",
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/compliance.ts",
+        "line": 2511
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "experimental",
+            "summary": "This should return 0o644 (-rw-r--r--)."
+          },
+          "locationInModule": {
+            "filename": "lib/compliance.ts",
+            "line": 2515
+          },
+          "name": "mode",
+          "returns": {
+            "type": {
+              "primitive": "number"
+            }
+          },
+          "static": true
+        }
+      ],
+      "name": "UmaskCheck"
+    },
     "jsii-calc.UnaryOperation": {
       "abstract": true,
       "assembly": "jsii-calc",
@@ -13162,5 +13196,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "miVjqwWxNOLMY7fR23c/SVvfiGqkgqLgG+18qp4f8MM="
+  "fingerprint": "/0S7DMfFaE1kfja4CpY5k0Gl6j6opo50SUPCiBgy3Zg="
 }