Merge branch 'main' into feature/encryption-info-versioning

opentdf · Jul 17, 2024 · a9d658d · a9d658d
2 parents 3b3d766 + 4efa118
commit a9d658d
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 46 deletions.
diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/lib/src/errors.ts b/lib/src/errors.ts
@@ -29,12 +29,18 @@ export class TdfError extends Error {
 
 export class UnsafeUrlError extends Error {
   override name = 'UnsafeUrlError';
-  readonly url: string;
+  readonly url: string | string[];
 
-  constructor(message: string, url: string) {
+  constructor(message: string, ...urls: string[]) {
     super(message);
     Object.setPrototypeOf(this, new.target.prototype);
-    this.url = url;
+    if (urls && urls.length) {
+      if (urls.length > 1) {
+        this.url = urls;
+      } else {
+        this.url = urls[0];
+      }
+    }
   }
 }
 

diff --git a/lib/tdf3/src/tdf.ts b/lib/tdf3/src/tdf.ts
@@ -43,6 +43,7 @@ import {
   TdfDecryptError,
   TdfError,
   TdfPayloadExtractionError,
+  UnsafeUrlError,
 } from '../../src/errors.js';
 import { htmlWrapperTemplate } from './templates/index.js';
 
@@ -815,10 +816,11 @@ export function splitLookupTableFactory(
     const disallowedKases = new Set(
       keyAccess.filter(({ url }) => !allowedKases.includes(url)).map(({ url }) => url)
     );
-    throw new KasDecryptError(
-      `Unreconstructable key - disallowed KASes include: [${JSON.stringify(
+    throw new UnsafeUrlError(
+      `unreconstructable key - disallowed KASes include: ${JSON.stringify(
         disallowedKases
-      )}] from splitIds [${JSON.stringify(splitIds)}]`
+      )} from splitIds ${JSON.stringify(splitIds)}`,
+      ...disallowedKases
     );
   }
   const splitPotentials: Record<string, Record<string, KeyAccessObject>> = Object.fromEntries(

diff --git a/remote-store/package-lock.json b/remote-store/package-lock.json
diff --git a/web-app/package-lock.json b/web-app/package-lock.json