Skip to content

Commit 474af49

Browse files
format
Signed-off-by: Elizabeth Healy <[email protected]>
1 parent f854ab2 commit 474af49

File tree

2 files changed

+34
-24
lines changed

2 files changed

+34
-24
lines changed

lib/tdf3/src/tdf.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,9 @@ async function unwrapKey({
798798
...(keySplitInfo.kid && { kid: keySplitInfo.kid }),
799799
...(keySplitInfo.sid && { splitId: keySplitInfo.sid }),
800800
...(keySplitInfo.encryptedMetadata && { encryptedMetadata: keySplitInfo.encryptedMetadata }),
801-
...(keySplitInfo.ephemeralPublicKey && { ephemeralPublicKey: keySplitInfo.ephemeralPublicKey }),
801+
...(keySplitInfo.ephemeralPublicKey && {
802+
ephemeralPublicKey: keySplitInfo.ephemeralPublicKey,
803+
}),
802804
});
803805

804806
// Create the protobuf request

lib/tests/server.ts

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import { AttributeAndValue } from '../src/policy/attributes.js';
1414
import { ztdfSalt } from '../tdf3/src/crypto/salt.js';
1515

1616
import { create, toJsonString, fromJson } from '@bufbuild/protobuf';
17-
import { ValueSchema } from "@bufbuild/protobuf/wkt";
17+
import { ValueSchema } from '@bufbuild/protobuf/wkt';
1818
import {
1919
PolicyRewrapResultSchema,
2020
KeyAccessRewrapResultSchema,
2121
RewrapResponseSchema,
22-
UnsignedRewrapRequestSchema
22+
UnsignedRewrapRequestSchema,
2323
} from '../src/platform/kas/kas_pb.js';
2424

2525
const Mocks = getMocks();
@@ -177,7 +177,8 @@ const kas: RequestListener = async (req, res) => {
177177
res.end('{"error": "Invalid wrapped key"}');
178178
return;
179179
}
180-
const isECWrapped = rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObject?.kid == 'e1';
180+
const isECWrapped =
181+
rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObject?.kid == 'e1';
181182
// Decrypt the wrapped key from TDF3
182183
let dek: Binary;
183184
if (isECWrapped) {
@@ -217,19 +218,22 @@ const kas: RequestListener = async (req, res) => {
217218
create(PolicyRewrapResultSchema, {
218219
results: [
219220
create(KeyAccessRewrapResultSchema, {
220-
metadata: {"hello": create(ValueSchema, {
221-
kind: { case: "stringValue", value: "world" }
222-
})},
221+
metadata: {
222+
hello: create(ValueSchema, {
223+
kind: { case: 'stringValue', value: 'world' },
224+
}),
225+
},
223226
result: {
224-
case: "kasWrappedKey",
227+
case: 'kasWrappedKey',
225228
value: new Uint8Array(cek.asArrayBuffer()),
226229
},
227-
keyAccessObjectId: rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObjectId || '',
230+
keyAccessObjectId:
231+
rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObjectId || '',
228232
}),
229233
],
230234
}),
231235
],
232-
})
236+
});
233237
res.statusCode = 200;
234238
res.setHeader('Content-Type', 'application/json');
235239
res.end(toJsonString(RewrapResponseSchema, reply));
@@ -257,19 +261,22 @@ const kas: RequestListener = async (req, res) => {
257261
create(PolicyRewrapResultSchema, {
258262
results: [
259263
create(KeyAccessRewrapResultSchema, {
260-
metadata: {"hello": create(ValueSchema, {
261-
kind: { case: "stringValue", value: "world" }
262-
})},
264+
metadata: {
265+
hello: create(ValueSchema, {
266+
kind: { case: 'stringValue', value: 'world' },
267+
}),
268+
},
263269
result: {
264-
case: "kasWrappedKey",
270+
case: 'kasWrappedKey',
265271
value: entityWrappedKey,
266272
},
267-
keyAccessObjectId: rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObjectId || '',
273+
keyAccessObjectId:
274+
rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObjectId || '',
268275
}),
269276
],
270277
}),
271278
],
272-
})
279+
});
273280

274281
res.statusCode = 200;
275282
res.setHeader('Content-Type', 'application/json');
@@ -278,9 +285,7 @@ const kas: RequestListener = async (req, res) => {
278285
}
279286
// nanotdf
280287
console.log('[INFO] nano rewrap request body: ', rewrap);
281-
const { header } = Header.parse(
282-
kaoheader || new Uint8Array(base64.decodeArrayBuffer('')),
283-
);
288+
const { header } = Header.parse(kaoheader || new Uint8Array(base64.decodeArrayBuffer('')));
284289
// TODO convert header.ephemeralCurveName to namedCurve
285290
const nanoPublicKey = await crypto.subtle.importKey(
286291
'raw',
@@ -341,14 +346,17 @@ const kas: RequestListener = async (req, res) => {
341346
create(PolicyRewrapResultSchema, {
342347
results: [
343348
create(KeyAccessRewrapResultSchema, {
344-
metadata: {"hello": create(ValueSchema, {
345-
kind: { case: "stringValue", value: "people of earth" }
346-
})},
349+
metadata: {
350+
hello: create(ValueSchema, {
351+
kind: { case: 'stringValue', value: 'people of earth' },
352+
}),
353+
},
347354
result: {
348-
case: "kasWrappedKey",
355+
case: 'kasWrappedKey',
349356
value: entityWrappedKey,
350357
},
351-
keyAccessObjectId: rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObjectId || '',
358+
keyAccessObjectId:
359+
rewrap.requests?.[0]?.keyAccessObjects?.[0]?.keyAccessObjectId || '',
352360
}),
353361
],
354362
}),

0 commit comments

Comments
 (0)