throw Missing protected data when getValue is invoked in a context without protected data

Author: PierreJeanjacquot

packages/dataprotector-deserializer/src/index.ts

@@ -40,23 +40,31 @@ type Mode = 'optimistic' | 'legacy' | 'borsh';
  * - `protectedDataPath`: overrides the dataset path, by default use the standard dataset path provided in the iExec worker runtime
  */
 class IExecDataProtectorDeserializer {
-  private protectedDataPath: string;
+  private protectedDataPath?: string;
 
   private mode: Mode;
 
-  private zipPromise: Promise<JSZip>;
+  private zipPromise?: Promise<JSZip>;
 
   constructor(options?: { mode?: Mode; protectedDataPath?: string }) {
     this.mode = options?.mode || 'optimistic';
-    this.protectedDataPath =
-      options?.protectedDataPath ||
-      join(process.env.IEXEC_IN, process.env.IEXEC_DATASET_FILENAME);
-    this.zipPromise = readFile(this.protectedDataPath).then((buffer) => {
-      return new JSZip().loadAsync(buffer);
-    });
-    this.zipPromise.catch(() => {
-      /* prevents unhandled promise rejection */
-    });
+    if (options?.protectedDataPath) {
+      this.protectedDataPath = options?.protectedDataPath;
+    } else if (process.env.IEXEC_DATASET_FILENAME && process.env.IEXEC_IN) {
+      this.protectedDataPath = join(
+        process.env.IEXEC_IN,
+        process.env.IEXEC_DATASET_FILENAME
+      );
+    }
+
+    if (this.protectedDataPath) {
+      this.zipPromise = readFile(this.protectedDataPath).then((buffer) => {
+        return new JSZip().loadAsync(buffer);
+      });
+      this.zipPromise.catch(() => {
+        /* prevents unhandled promise rejection */
+      });
+    }
   }
 
   /**
@@ -93,6 +101,9 @@ class IExecDataProtectorDeserializer {
     | StringSchemaFilter<T>
     | BinarySchemaFilter<T>
   > {
+    if (this.zipPromise === undefined) {
+      throw Error('Missing protected data');
+    }
     const zip = await this.zipPromise.catch(() => {
       throw Error('Failed to load protected data');
     });

packages/dataprotector-deserializer/tests/index.test.ts

@@ -2,15 +2,20 @@ import { writeFile } from 'fs/promises';
 import {
   createZipFromObject as legacyCreateZipFromObject,
   extractDataSchema as legacyExtractDataSchema,
-} from '@iexec/dataprotector/dist/utils/data.js'; // run `prepare-test-deps` script before running this test file
-import { describe, it, beforeAll, expect } from '@jest/globals';
+} from '@iexec/dataprotector/dist/utils/data.js'; // run `test:prepare` script before running this test file
+import { describe, it, beforeAll, expect, beforeEach } from '@jest/globals';
 import {
   createZipFromObject,
   extractDataSchema,
 } from '../../sdk/dist/src/utils/data.js';
 import { IExecDataProtectorDeserializer } from '../src/index.js';
 
 describe('IExecDataProtectorDeserializer', () => {
+  beforeEach(() => {
+    // reset env
+    delete process.env.IEXEC_IN;
+    delete process.env.IEXEC_DATASET_FILENAME;
+  });
   describe('constructor', () => {
     it('set default protectedDataPath with iexec envs', () => {
       process.env.IEXEC_IN = 'iexec_in';
@@ -27,6 +32,15 @@ describe('IExecDataProtectorDeserializer', () => {
       expect(protectedDataDeserializer['mode']).toBe('optimistic');
     });
   });
+  describe('when used without protected data', () => {
+    it('getValue() fails to load the data', async () => {
+      // process.env.IEXEC_IN = 'iexec_in';
+      const protectedDataDeserializer = new IExecDataProtectorDeserializer();
+      await expect(
+        protectedDataDeserializer.getValue('foo', 'string')
+      ).rejects.toThrow(Error('Missing protected data'));
+    });
+  });
   describe('with a file that is not a protected data', () => {
     it('getValue() fails to load the data', async () => {
       const protectedDataDeserializer = new IExecDataProtectorDeserializer({