@opentdf/sdk 0.5.0-beta.47 → 0.5.0-beta.49

package/src/nanotdf/Client.ts

@@ -1,4 +1,8 @@
-import * as base64 from '../encodings/base64.js';
+import { create, toJsonString } from '@bufbuild/protobuf';
+import {
+  UnsignedRewrapRequest_WithPolicyRequestSchema,
+  UnsignedRewrapRequestSchema,
+} from '../platform/kas/kas_pb.js';
 import { generateKeyPair, keyAgreement } from '../nanotdf-crypto/index.js';
 import getHkdfSalt from './helpers/getHkdfSalt.js';
 import DefaultParams from './models/DefaultParams.js';
@@ -8,13 +12,16 @@ import {
   KasPublicKeyInfo,
   OriginAllowList,
 } from '../access.js';
+import { handleRpcRewrapErrorString } from '../../src/access/access-rpc.js';
 import { AuthProvider, isAuthProvider, reqSignature } from '../auth/providers.js';
 import { ConfigurationError, DecryptError, TdfError, UnsafeUrlError } from '../errors.js';
 import {
   cryptoPublicToPem,
   getRequiredObligationFQNs,
   pemToCryptoPublicKey,
+  upgradeRewrapResponseV1,
   validateSecureUrl,
+  getPlatformUrlFromKasEndpoint,
 } from '../utils.js';
 
 export interface ClientConfig {
@@ -260,18 +267,35 @@ export default class Client {
       throw new ConfigurationError('Signer key has not been set or generated');
     }
 
-    const requestBodyStr = JSON.stringify({
-      algorithm: DefaultParams.defaultECAlgorithm,
-      // nano keyAccess minimum, header is used for nano
+    const unsignedRequest = create(UnsignedRewrapRequestSchema, {
+      clientPublicKey: await cryptoPublicToPem(ephemeralKeyPair.publicKey),
+      requests: [
+        create(UnsignedRewrapRequest_WithPolicyRequestSchema, {
+          keyAccessObjects: [
+            {
+              keyAccessObjectId: 'kao-0',
+              keyAccessObject: {
+                header: new Uint8Array(nanoTdfHeader),
+                kasUrl: '',
+                protocol: Client.KAS_PROTOCOL,
+                keyType: Client.KEY_ACCESS_REMOTE,
+              },
+            },
+          ],
+          algorithm: DefaultParams.defaultECAlgorithm,
+        }),
+      ],
       keyAccess: {
-        type: Client.KEY_ACCESS_REMOTE,
-        url: '',
+        header: new Uint8Array(nanoTdfHeader),
+        kasUrl: '',
         protocol: Client.KAS_PROTOCOL,
-        header: base64.encodeArrayBuffer(nanoTdfHeader),
+        keyType: Client.KEY_ACCESS_REMOTE,
       },
-      clientPublicKey: await cryptoPublicToPem(ephemeralKeyPair.publicKey),
+      algorithm: DefaultParams.defaultECAlgorithm,
     });
 
+    const requestBodyStr = toJsonString(UnsignedRewrapRequestSchema, unsignedRequest);
+
     const jwtPayload = { requestBody: requestBodyStr };
 
     const signedRequestToken = await reqSignature(jwtPayload, requestSignerKeyPair.privateKey, {
@@ -285,9 +309,28 @@ export default class Client {
       this.authProvider,
       this.fulfillableObligationFQNs
     );
+    upgradeRewrapResponseV1(rewrapResp);
+
+    // Assume only one response and one result for now (V1 style)
+    const result = rewrapResp.responses[0].results[0];
+    let entityWrappedKey: Uint8Array<ArrayBufferLike>;
+    switch (result.result.case) {
+      case 'kasWrappedKey': {
+        entityWrappedKey = result.result.value;
+        break;
+      }
+      case 'error': {
+        handleRpcRewrapErrorString(
+          result.result.value,
+          getPlatformUrlFromKasEndpoint(kasRewrapUrl)
+        );
+      }
+      default: {
+        throw new DecryptError('KAS rewrap response missing wrapped key');
+      }
+    }
 
     // Extract the iv and ciphertext
-    const entityWrappedKey = rewrapResp.entityWrappedKey;
     const ivLength =
       clientVersion == Client.SDK_INITIAL_RELEASE ? Client.INITIAL_RELEASE_IV_SIZE : Client.IV_SIZE;
     const iv = entityWrappedKey.subarray(0, ivLength);

package/src/utils.ts

@@ -3,7 +3,12 @@ import { exportSPKI, importX509 } from 'jose';
 import { base64 } from './encodings/index.js';
 import { pemCertToCrypto, pemPublicToCrypto } from './nanotdf-crypto/pemPublicToCrypto.js';
 import { ConfigurationError } from './errors.js';
-import { RewrapResponse } from './platform/kas/kas_pb.js';
+import {
+  RewrapResponse,
+  PolicyRewrapResultSchema,
+  KeyAccessRewrapResultSchema,
+} from './platform/kas/kas_pb.js';
+import { create } from '@bufbuild/protobuf';
 import { ConnectError } from '@connectrpc/connect';
 
 const REQUIRED_OBLIGATIONS_METADATA_KEY = 'X-Required-Obligations';
@@ -255,3 +260,31 @@ export function getRequiredObligationFQNs(response: RewrapResponse) {
 
   return [...requiredObligations.values()];
 }
+
+/**
+ * Upgrades a RewrapResponse from v1 format to v2.
+ */
+export function upgradeRewrapResponseV1(response: RewrapResponse) {
+  if (response.responses.length > 0) {
+    return;
+  }
+  if (response.entityWrappedKey.length === 0) {
+    return;
+  }
+
+  response.responses = [
+    create(PolicyRewrapResultSchema, {
+      policyId: 'policy',
+      results: [
+        create(KeyAccessRewrapResultSchema, {
+          keyAccessObjectId: 'kao-0',
+          status: 'permit',
+          result: {
+            case: 'kasWrappedKey',
+            value: response.entityWrappedKey,
+          },
+        }),
+      ],
+    }),
+  ];
+}

package/tdf3/src/tdf.ts

@@ -8,7 +8,16 @@ import {
   fetchWrappedKey,
   publicKeyAlgorithmToJwa,
 } from '../../src/access.js';
+import { create, toJsonString } from '@bufbuild/protobuf';
+import {
+  KeyAccessSchema,
+  UnsignedRewrapRequestSchema,
+  UnsignedRewrapRequest_WithPolicyRequestSchema,
+  UnsignedRewrapRequest_WithPolicySchema,
+  UnsignedRewrapRequest_WithKeyAccessObjectSchema,
+} from '../../src/platform/kas/kas_pb.js';
 import { type AuthProvider, reqSignature } from '../../src/auth/auth.js';
+import { handleRpcRewrapErrorString } from '../../src/access/access-rpc.js';
 import { allPool, anyPool } from '../../src/concurrency.js';
 import { base64, hex } from '../../src/encodings/index.js';
 import {
@@ -55,7 +64,11 @@ import { ZipReader, ZipWriter, keyMerge, concatUint8, buffToString } from './uti
 import { CentralDirectory } from './utils/zip-reader.js';
 import { ztdfSalt } from './crypto/salt.js';
 import { Payload } from './models/payload.js';
-import { getRequiredObligationFQNs } from '../../src/utils.js';
+import {
+  getRequiredObligationFQNs,
+  upgradeRewrapResponseV1,
+  getPlatformUrlFromKasEndpoint,
+} from '../../src/utils.js';
 
 // TODO: input validation on manifest JSON
 const DEFAULT_SEGMENT_SIZE = 1024 * 1024;
@@ -189,11 +202,6 @@ export type RewrapRequest = {
 
 export type KasPublicKeyFormat = 'pkcs8' | 'jwks';
 
-export type RewrapResponse = {
-  entityWrappedKey: string;
-  sessionPublicKey: string;
-};
-
 /**
  * If we have KAS url but not public key we can fetch it from KAS, fetching
  * the value from `${kas}/kas_public_key`.
@@ -783,13 +791,50 @@ async function unwrapKey({
 
     const clientPublicKey = ephemeralEncryptionKeys.publicKey;
 
-    const requestBodyStr = JSON.stringify({
+    // Convert keySplitInfo to protobuf KeyAccess
+    const keyAccessProto = create(KeyAccessSchema, {
+      ...(keySplitInfo.type && { keyType: keySplitInfo.type }),
+      ...(keySplitInfo.url && { kasUrl: keySplitInfo.url }),
+      ...(keySplitInfo.protocol && { protocol: keySplitInfo.protocol }),
+      ...(keySplitInfo.wrappedKey && {
+        wrappedKey: new Uint8Array(base64.decodeArrayBuffer(keySplitInfo.wrappedKey)),
+      }),
+      ...(keySplitInfo.policyBinding && { policyBinding: keySplitInfo.policyBinding }),
+      ...(keySplitInfo.kid && { kid: keySplitInfo.kid }),
+      ...(keySplitInfo.sid && { splitId: keySplitInfo.sid }),
+      ...(keySplitInfo.encryptedMetadata && { encryptedMetadata: keySplitInfo.encryptedMetadata }),
+      ...(keySplitInfo.ephemeralPublicKey && {
+        ephemeralPublicKey: keySplitInfo.ephemeralPublicKey,
+      }),
+    });
+
+    // Create the protobuf request
+    const unsignedRequest = create(UnsignedRewrapRequestSchema, {
+      clientPublicKey,
+      requests: [
+        create(UnsignedRewrapRequest_WithPolicyRequestSchema, {
+          keyAccessObjects: [
+            create(UnsignedRewrapRequest_WithKeyAccessObjectSchema, {
+              keyAccessObjectId: 'kao-0',
+              keyAccessObject: keyAccessProto,
+            }),
+          ],
+          ...(manifest.encryptionInformation.policy && {
+            policy: create(UnsignedRewrapRequest_WithPolicySchema, {
+              id: 'policy',
+              body: manifest.encryptionInformation.policy,
+            }),
+          }),
+        }),
+      ],
+      // include deprecated fields for backward compatibility
       algorithm: 'RS256',
-      keyAccess: keySplitInfo,
+      keyAccess: keyAccessProto,
       policy: manifest.encryptionInformation.policy,
-      clientPublicKey,
     });
 
+    const requestBodyStr = toJsonString(UnsignedRewrapRequestSchema, unsignedRequest);
+
     const jwtPayload = { requestBody: requestBodyStr };
     const signedRequestToken = await reqSignature(jwtPayload, dpopKeys.privateKey);
 
@@ -799,39 +844,57 @@ async function unwrapKey({
       authProvider,
       fulfillableObligations
     );
-    const { entityWrappedKey, metadata, sessionPublicKey } = rewrapResp;
+    upgradeRewrapResponseV1(rewrapResp);
+    const { sessionPublicKey } = rewrapResp;
     const requiredObligations = getRequiredObligationFQNs(rewrapResp);
+    // Assume only one response and one result for now (V1 style)
+    const result = rewrapResp.responses[0].results[0];
+    const metadata = result.metadata;
+    // Handle the different cases of result.result
+    switch (result.result.case) {
+      case 'kasWrappedKey': {
+        const entityWrappedKey = result.result.value;
+
+        if (wrappingKeyAlgorithm === 'ec:secp256r1') {
+          const serverEphemeralKey: CryptoKey = await pemPublicToCrypto(sessionPublicKey);
+          const ekr = ephemeralEncryptionKeysRaw as CryptoKeyPair;
+          const kek = await keyAgreement(ekr.privateKey, serverEphemeralKey, {
+            hkdfSalt: await ztdfSalt,
+            hkdfHash: 'SHA-256',
+          });
+          const wrappedKeyAndNonce = entityWrappedKey;
+          const iv = wrappedKeyAndNonce.slice(0, 12);
+          const wrappedKey = wrappedKeyAndNonce.slice(12);
 
-    if (wrappingKeyAlgorithm === 'ec:secp256r1') {
-      const serverEphemeralKey: CryptoKey = await pemPublicToCrypto(sessionPublicKey);
-      const ekr = ephemeralEncryptionKeysRaw as CryptoKeyPair;
-      const kek = await keyAgreement(ekr.privateKey, serverEphemeralKey, {
-        hkdfSalt: await ztdfSalt,
-        hkdfHash: 'SHA-256',
-      });
-      const wrappedKeyAndNonce = entityWrappedKey;
-      const iv = wrappedKeyAndNonce.slice(0, 12);
-      const wrappedKey = wrappedKeyAndNonce.slice(12);
-
-      const dek = await crypto.subtle.decrypt({ name: 'AES-GCM', iv }, kek, wrappedKey);
-
-      return {
-        key: new Uint8Array(dek),
-        metadata,
-        requiredObligations,
-      };
-    }
-    const key = Binary.fromArrayBuffer(entityWrappedKey);
-    const decryptedKeyBinary = await cryptoService.decryptWithPrivateKey(
-      key,
-      ephemeralEncryptionKeys.privateKey
-    );
+          const dek = await crypto.subtle.decrypt({ name: 'AES-GCM', iv }, kek, wrappedKey);
 
-    return {
-      key: new Uint8Array(decryptedKeyBinary.asByteArray()),
-      metadata,
-      requiredObligations,
-    };
+          return {
+            key: new Uint8Array(dek),
+            metadata,
+            requiredObligations,
+          };
+        }
+        const key = Binary.fromArrayBuffer(entityWrappedKey);
+        const decryptedKeyBinary = await cryptoService.decryptWithPrivateKey(
+          key,
+          ephemeralEncryptionKeys.privateKey
+        );
+
+        return {
+          key: new Uint8Array(decryptedKeyBinary.asByteArray()),
+          metadata,
+          requiredObligations,
+        };
+      }
+
+      case 'error': {
+        handleRpcRewrapErrorString(result.result.value, getPlatformUrlFromKasEndpoint(url));
+      }
+
+      default: {
+        throw new DecryptError('KAS rewrap response missing wrapped key');
+      }
+    }
   }
 
   let poolSize = 1;