Binary should have method to b64

opentdf · Sep 6, 2023 · ffec1d9 · ffec1d9
1 parent c1936d2
commit ffec1d9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/lib/tdf3/src/binary.ts b/lib/tdf3/src/binary.ts
@@ -44,6 +44,8 @@ export abstract class Binary {
 
   abstract asArrayBuffer(): ArrayBuffer;
 
+  abstract asB64(): string;
+
   abstract asByteArray(): number[];
 
   abstract asString(): string;
@@ -95,6 +97,11 @@ class ArrayBufferBinary extends Binary {
     return new TextDecoder().decode(uint8Array);
   }
 
+  override asB64(): string {
+    const uint8Array = new Uint8Array(this.value);
+    return window.btoa([...uint8Array].map(byte => String.fromCharCode(byte)).join(''));
+  }
+
   override isArrayBuffer(): boolean {
     return true;
   }
@@ -131,6 +138,11 @@ class ByteArrayBinary extends Binary {
     return new TextDecoder().decode(uint8Array);
   }
 
+  override asB64(): string {
+    const uint8Array = new Uint8Array(this.value);
+    return window.btoa([...uint8Array].map(byte => String.fromCharCode(byte)).join(''));
+  }
+
   override isByteArray(): boolean {
     return true;
   }
@@ -175,6 +187,11 @@ class StringBinary extends Binary {
     return this.value;
   }
 
+  override asB64(): string {
+    const uint8Array: Uint8Array = new TextEncoder().encode(this.value);
+    return window.btoa([...uint8Array].map(byte => String.fromCharCode(byte)).join(''));
+  }
+
   override isString(): boolean {
     return true;
   }

diff --git a/lib/tdf3/src/models/encryption-information.ts b/lib/tdf3/src/models/encryption-information.ts
@@ -106,8 +106,8 @@ export class SplitKey {
       );
 
       const encryptedMetadataOb = {
-        ciphertext: base64.encode(encryptedMetadataResult.payload.asString()),
-        iv: base64.encode(keyInfo.unwrappedKeyIvBinary.asString()),
+        ciphertext: encryptedMetadataResult.payload.asB64(),
+        iv: keyInfo.unwrappedKeyIvBinary.asB64(),
       };
 
       const encryptedMetadataStr = JSON.stringify(encryptedMetadataOb);
@@ -143,7 +143,7 @@ export class SplitKey {
       method: {
         algorithm,
         isStreamable: false,
-        iv: base64.encode(keyInfo.unwrappedKeyIvBinary.asString()),
+        iv: keyInfo.unwrappedKeyIvBinary.asB64(),
       },
       integrityInformation: {
         rootSignature: {

diff --git a/lib/tdf3/src/models/key-access.ts b/lib/tdf3/src/models/key-access.ts
@@ -40,7 +40,7 @@ export class Wrapped {
       type: 'wrapped',
       url: this.url,
       protocol: 'kas',
-      wrappedKey: base64.encode(wrappedKeyBinary.asString()),
+      wrappedKey: wrappedKeyBinary.asB64(),
       encryptedMetadata: base64.encode(encryptedMetadataStr),
       policyBinding: base64.encode(policyBinding),
     };
@@ -77,8 +77,7 @@ export class Remote {
       this.publicKey
     );
 
-    // this.wrappedKey = wrappedKeyBinary.asBuffer().toString('hex');
-    this.wrappedKey = base64.encode(wrappedKeyBinary.asString());
+    this.wrappedKey = wrappedKeyBinary.asB64();
 
     this.keyAccessObject = {
       type: 'remote',

diff --git a/lib/tdf3/src/tdf.ts b/lib/tdf3/src/tdf.ts
@@ -781,7 +781,7 @@ export class TDF extends EventEmitter {
     if (upsertResponse) {
       plaintextStream.upsertResponse = upsertResponse;
       plaintextStream.tdfSize = totalByteCount;
-      plaintextStream.KEK = payloadKey ? null : btoa(kek.payload.asString());
+      plaintextStream.KEK = payloadKey ? null : kek.payload.asB64();
       plaintextStream.algorithm = manifest.encryptionInformation.method.algorithm;
     }
 

diff --git a/lib/tests/mocha/encrypt-decrypt.spec.ts b/lib/tests/mocha/encrypt-decrypt.spec.ts
@@ -49,7 +49,7 @@ describe('encrypt decrypt test', async function () {
 
       const encryptedStream = await client.encrypt({
         eo,
-        metadata: Mocks.getMetadataObject(),
+        metadata: {},
         offline: true,
         scope,
         source: new ReadableStream({