Skip to content

Commit 675bfbe

Browse files
author
brizental
committed
Change alg and keys used
1 parent dac5aea commit 675bfbe

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

glean/src/plugins/encryption.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ class PingEncryptionPlugin extends Plugin<typeof CoreEvents["afterPingCollection
2020
}
2121

2222
async action(payload: PingPayload): Promise<JSONObject> {
23-
console.log(this.jwk);
2423
const key = await parseJwk(this.jwk);
2524
const encoder = new TextEncoder();
2625
const encodedPayload = await new CompactEncrypt(encoder.encode(JSON.stringify(payload)))
2726
.setProtectedHeader({
2827
kid: this.jwk.kid,
2928
alg: this.jwk.alg,
30-
enc: "A256GCM"
29+
enc: "A256GCM",
30+
typ: "JWE",
3131
})
3232
.encrypt(key);
3333
return { payload: encodedPayload };

glean/tests/plugins/encryption.spec.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ describe("PingEncryptionPlugin", function() {
2828
await Glean.testUninitialize();
2929

3030
const plugin = new PingEncryptionPlugin({
31-
e: "AQAB",
32-
n: "qpzYkTGRKSUcd12hZaJnYEKVLfdEsqu6HBAxZgRSvzLFj_zTSAEXjbf3fX47MPEHRw8NDcEXPjVOz84t4FTXYF2w2_LGWfp_myjV8pR6oUUncJjS7DhnUmTG5bpuK2HFXRMRJYz_iNR48xRJPMoY84jrnhdIFx8Tqv6w4ZHVyEvcvloPgwG3UjLidP6jmqbTiJtidVLnpQJRuFNFQJiluQXBZ1nOLC7raQshu7L9y0IatVU7vf0BPnmuSkcNNvmQkSta6ODQBPaL5-o5SW8H37vQjPDkrlJpreViNa3jqP5DB5HYUO-DMh4FegRv9gZWLDEvXpSd9A13YXCa9Q8K_w",
33-
kty: "RSA",
34-
alg: "RSA-OAEP-256"
31+
"kid": "test",
32+
"alg": "ECDH-ES",
33+
"crv": "P-256",
34+
"kty": "EC",
35+
"x": "Qqihp7EryDN2-qQ-zuDPDpy5mJD5soFBDZmzPWTmjwk",
36+
"y": "PiEQVUlywi2bEsA3_5D0VFrCHClCyUlLW52ajYs-5uc"
3537
});
3638
await Glean.testInitialize("something something", true, { plugins: [ plugin ]});
3739
const ping = new PingType({
@@ -42,6 +44,7 @@ describe("PingEncryptionPlugin", function() {
4244

4345
await PingMaker.collectAndStorePing("ident", ping);
4446
const recordedPing = (await Glean.pingsDatabase.getAllPings())["ident"];
47+
4548
assert.ok("payload" in recordedPing.payload);
4649
});
4750
});

0 commit comments

Comments
 (0)