2021-03-04 20:01:34 +00:00
|
|
|
|
// Copyright 2021 Signal Messenger, LLC
|
|
|
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
|
|
|
|
|
|
|
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
|
|
|
|
|
|
|
|
import { assert } from 'chai';
|
|
|
|
|
|
2021-09-24 00:49:05 +00:00
|
|
|
|
import * as Bytes from '../../Bytes';
|
2021-10-26 19:15:33 +00:00
|
|
|
|
import type { LocalUserDataType } from '../../util/sessionTranslation';
|
|
|
|
|
import { sessionRecordToProtobuf } from '../../util/sessionTranslation';
|
2021-03-04 20:01:34 +00:00
|
|
|
|
|
|
|
|
|
const getRecordCopy = (record: any): any => JSON.parse(JSON.stringify(record));
|
|
|
|
|
|
|
|
|
|
describe('sessionTranslation', () => {
|
|
|
|
|
let ourData: LocalUserDataType;
|
|
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
|
ourData = {
|
2021-09-24 00:49:05 +00:00
|
|
|
|
identityKeyPublic: Bytes.fromBase64(
|
2021-03-04 20:01:34 +00:00
|
|
|
|
'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444'
|
|
|
|
|
),
|
|
|
|
|
registrationId: 3554,
|
|
|
|
|
};
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('Throws if given an empty object', () => {
|
|
|
|
|
const record: any = {};
|
|
|
|
|
assert.throws(
|
|
|
|
|
() => sessionRecordToProtobuf(record, ourData),
|
|
|
|
|
'toProtobuf: Record had no sessions!'
|
|
|
|
|
);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('Generates expected protobuf with minimal record', () => {
|
|
|
|
|
const record: any = {
|
|
|
|
|
sessions: {
|
|
|
|
|
'\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M': {
|
|
|
|
|
registrationId: 4243,
|
|
|
|
|
currentRatchet: {
|
|
|
|
|
rootKey:
|
|
|
|
|
'Ë\u00035/üÚg\u0003Xeûú\u0010\u0000ü\u0002¶»o5\u001c¥\u0004Ðÿ«',
|
|
|
|
|
lastRemoteEphemeralKey:
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs',
|
|
|
|
|
previousCounter: 2,
|
|
|
|
|
ephemeralKeyPair: {
|
|
|
|
|
privKey: 'äãÅ«ªàøí)á\u0005Á"sJM.¨¡\u0012r(N\f9Ô\b',
|
|
|
|
|
pubKey: '\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
indexInfo: {
|
|
|
|
|
remoteIdentityKey: '\u0005¨¨©üÏäúoá©êO¢çúxr»Æ¿r²GùiT@',
|
|
|
|
|
closed: -1,
|
|
|
|
|
baseKey: '\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M',
|
|
|
|
|
baseKeyType: 2,
|
|
|
|
|
},
|
|
|
|
|
oldRatchetList: [],
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': 'Îgó¯2àvñX_õ\u0014Ç\u0000öl\u001f4J>ÐÏ{`-Ü5¦',
|
|
|
|
|
'4': 'c¿<µâ¼Xµ!Ù¯µ®[n<ìîúcoå©n\u0013"l]Ð',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 5,
|
|
|
|
|
key: 'Z{òÙ8سAÝdSZk\nÃ\u001cô¡\u001b[YÒ¶\u0016a°\u0004<',
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: -1,
|
2021-11-11 22:43:05 +00:00
|
|
|
|
key: "èB?7\u000f¯\u001e\u0010¨\u0007}:?¹\u0010$\\ë~ª\u0000gM0Õ'£\u0005",
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
chainType: 1,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
version: 'v1',
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const expected = {
|
|
|
|
|
currentSession: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
sessionVersion: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
localIdentityPublic: 'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444',
|
|
|
|
|
remoteIdentityPublic: 'BaioqfzP5JD6b+GNqepPouf6eHK7xr9ynLJHnvlpgVRA',
|
|
|
|
|
rootKey: 'ywM1L/yc2ppnA1hl+/oQlwD8Ara7bzUcg5etpQTQ/6s=',
|
2021-04-16 23:13:13 +00:00
|
|
|
|
previousCounter: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
senderChain: {
|
|
|
|
|
senderRatchetKey: 'BSsTNJarMQATbCAq40vnbrrW87PtVFOfJox7+SDNgj4x',
|
|
|
|
|
senderRatchetKeyPrivate:
|
|
|
|
|
'5JfjxauqiuD47SmI4QXBIoxzSk0uqKEScp0oTgw51Ag=',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 0,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: '6EI/Nw+vHhCoB499OpM/kLkQJFzrfqoAZ00w1ZgnowU=',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
receiverChains: [
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BQo3HG1UhWIh6A7NBxZtNGezBZH8nElZjOqNCBHPzlBz',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: 'Wnvy2TjYs0HdZFNahmsKw5cc9KEbW1nSwraDFmGwBDw=',
|
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'xVreEbT7Vtrxs85JyGBj6Y+UWftQz4H72F5kWV4cxqM=',
|
|
|
|
|
iv: 'TcRanSxZVWbuIq0xDRGnEw==',
|
|
|
|
|
macKey: '5fW9aIKXhtwWp/5alNJUIXInZbztf2ywzQSpYrXoQ3A=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 5,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'A99HjM4pUugsQ5+2v48FGTGEhZPoW6wzW9MqSc11QQ4=',
|
|
|
|
|
iv: 'bE8Ei2Rkaoz4SKRwdG4+tQ==',
|
|
|
|
|
macKey: 'TOTdbAf0bCHOzcQ3lBaIm3yqmpEqvvldD0qTuDFmkAI=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
remoteRegistrationId: 4243,
|
|
|
|
|
localRegistrationId: 3554,
|
|
|
|
|
aliceBaseKey: 'BVeHv5MAbMgKeaoO/G1CMBdqhC7bo7Mtc4EWxI0oT19N',
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const recordCopy = getRecordCopy(record);
|
|
|
|
|
|
|
|
|
|
const actual = sessionRecordToProtobuf(record, ourData);
|
|
|
|
|
|
|
|
|
|
assert.deepEqual(expected, actual.toJSON());
|
|
|
|
|
|
|
|
|
|
// We want to ensure that conversion doesn't modify incoming data
|
|
|
|
|
assert.deepEqual(record, recordCopy);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('Generates expected protobuf with many old receiver chains', () => {
|
|
|
|
|
const record: any = {
|
|
|
|
|
sessions: {
|
|
|
|
|
'\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M': {
|
|
|
|
|
registrationId: 4243,
|
|
|
|
|
currentRatchet: {
|
|
|
|
|
rootKey:
|
|
|
|
|
'Ë\u00035/üÚg\u0003Xeûú\u0010\u0000ü\u0002¶»o5\u001c¥\u0004Ðÿ«',
|
|
|
|
|
lastRemoteEphemeralKey:
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs',
|
|
|
|
|
previousCounter: 2,
|
|
|
|
|
ephemeralKeyPair: {
|
|
|
|
|
privKey: 'äãÅ«ªàøí)á\u0005Á"sJM.¨¡\u0012r(N\f9Ô\b',
|
|
|
|
|
pubKey: '\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
indexInfo: {
|
|
|
|
|
remoteIdentityKey: '\u0005¨¨©üÏäúoá©êO¢çúxr»Æ¿r²GùiT@',
|
|
|
|
|
closed: -1,
|
|
|
|
|
baseKey: '\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M',
|
|
|
|
|
baseKeyType: 2,
|
|
|
|
|
},
|
|
|
|
|
oldRatchetList: [
|
|
|
|
|
{
|
|
|
|
|
added: 1605579954962,
|
|
|
|
|
ephemeralKey:
|
|
|
|
|
'\u00050»\n¨ÊAä\u0006¢Ç´d\u0002\u00129}%î}ΩTc}8¼\u0011n\\',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1605580408250,
|
|
|
|
|
ephemeralKey:
|
|
|
|
|
'\u0005^Ä\nòÀ¢\u0000\u000fA\\6+Ó\u001a÷&×$¸¬ÑÔ|<qSÖ\u001aÙh',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1605581155167,
|
|
|
|
|
ephemeralKey:
|
|
|
|
|
'\u0005<\u0017å)QàFîl29Ø\u001c Ý$·;udß\u0005I|f\u0006',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1605638524556,
|
|
|
|
|
ephemeralKey: '\u0005¯jõ±ã0wÛPÐÂSÏ´;·&\u0011Â%º¯°ÝÙþêù8F',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1606761719753,
|
|
|
|
|
ephemeralKey: '\u0005Î(ð>xÄÈ?þv~íkx â¬.ðoòDg\u001eß.\r',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1606766530935,
|
|
|
|
|
ephemeralKey:
|
|
|
|
|
'\u0005\u0014@½M,à\bóó
}¨`i¿\u0000©I\u0001ôG\u001f:Ù{ó\u0005 ',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1608326293655,
|
|
|
|
|
ephemeralKey: '\u0005µÒ\u0014?È¢+ÑR÷ç?3Dº\\@0\u0004®+-\br\t',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1609871105317,
|
|
|
|
|
ephemeralKey:
|
|
|
|
|
'\u0005±@íN"Í\u0019HS{$ï\u0017[Ñ\\\u001a*;>P\u0000\u001f\u000eHNaù)',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1611707063523,
|
|
|
|
|
ephemeralKey: '\u0005ÞgÅké\u0001\u0013¡ÿûNXÈ(9\u0006¤w®/عRiJI',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
added: 1612211156372,
|
|
|
|
|
ephemeralKey: '\u0005:[ÛOpd¯ ÂÙç\u0010OÞw{}ý\bw9Àß=\u0014Z',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
'\u00050»\n¨ÊAä\u0006¢Ç´d\u0002\u00129}%î}ΩTc}8¼\u0011n\\': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 0,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005^Ä\nòÀ¢\u0000\u000fA\\6+Ó\u001a÷&×$¸¬ÑÔ|<qSÖ\u001aÙh': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 2,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005<\u0017å)QàFîl29Ø\u001c Ý$·;udß\u0005I|f\u0006': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 1,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005¯jõ±ã0wÛPÐÂSÏ´;·&\u0011Â%º¯°ÝÙþêù8F': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': 'A/{´{×f(èaøy\\D¾\u0000ÃHÀÁâô$ã\u001d3Äö°Ù',
|
|
|
|
|
'1': "̶FT}dw8Æýª7»ÚÓ\u000f*'Ô»7£\u0018\u0012ñDá",
|
|
|
|
|
'2': 'Îï\u0013¨ÁÕÎk\u000eýèÈ÷,¼îû5%ÓU¤6_õ¢\u0019ä]',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 3,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005Î(ð>xÄÈ?þv~íkx â¬.ðoòDg\u001eß.\r': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'4': '©}j¿¼\u0014q\t¥Áñ\u0003: ÷ÞrñûÔµ%Æ\u001a',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 6,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005\u0014@½M,à\bóó
}¨`i¿\u0000©I\u0001ôG\u001f:Ù{ó\u0005 ': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 0,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005µÒ\u0014?È¢+ÑR÷ç?3Dº\\@0\u0004®+-\br\t': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 2,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
2021-11-11 22:43:05 +00:00
|
|
|
|
'\u0005±@íN"Í\u0019HS{$ï\u0017[Ñ\\\u001a*;>P\u0000\u001f\u000eHNaù)':
|
|
|
|
|
{
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': "1kÏ\u001cí+«<º\b'VÌ!×¼«PÃ[üáy;l'",
|
|
|
|
|
'2': 'ö\u00047%L-
Wm)\u001d£ääíNô.Ô8
ÃÉ4r´ó^2',
|
|
|
|
|
'3': '¨¿¦7T]\u001c\u001cà4:x\u0019¿\u0002YÉÀ\u001bâjr¸»¤¢0,*',
|
|
|
|
|
'5': '¥\u0006·qgó4þ\u0011®U4F\u001cl©\bäô
»ÊÇÆ[',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 5,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
'\u0005ÞgÅké\u0001\u0013¡ÿûNXÈ(9\u0006¤w®/عRiJI': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': "]'8WÄ\u0007
nºÖ{ÿ7]ôäÄ!é\u000btA@°b¢)\u001ar",
|
|
|
|
|
'2': 'ÄfGÇjÖxÅö:×RÔi)M\u0019©IE+¨`þKá;£Û½',
|
|
|
|
|
'3': '¦Õhýø`ÖPéPs;\u001e\u000bE}¨¿õ\u0003uªøå\u00062(×G',
|
|
|
|
|
'9': 'Ï^<ÕúÌ\u0001i´;ït¼\u001aÑ?ï\u0014lãàƸ\u001a8/m',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 11,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005:[ÛOpd¯ ÂÙç\u0010OÞw{}ý\bw9Àß=\u0014Z': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': '!\u00115\\W~|¯oa2\u001e\u0004V8Ï¡d}\u001b\u001a8^QÖfvÕ"',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 1,
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': 'Îgó¯2àvñX_õ\u0014Ç\u0000öl\u001f4J>ÐÏ{`-Ü5¦',
|
|
|
|
|
'4': 'c¿<µâ¼Xµ!Ù¯µ®[n<ìîúcoå©n\u0013"l]Ð',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 5,
|
|
|
|
|
key: 'Z{òÙ8سAÝdSZk\nÃ\u001cô¡\u001b[YÒ¶\u0016a°\u0004<',
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: -1,
|
2021-11-11 22:43:05 +00:00
|
|
|
|
key: "èB?7\u000f¯\u001e\u0010¨\u0007}:?¹\u0010$\\ë~ª\u0000gM0Õ'£\u0005",
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
chainType: 1,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
version: 'v1',
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const expected = {
|
|
|
|
|
currentSession: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
sessionVersion: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
localIdentityPublic: 'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444',
|
|
|
|
|
remoteIdentityPublic: 'BaioqfzP5JD6b+GNqepPouf6eHK7xr9ynLJHnvlpgVRA',
|
|
|
|
|
rootKey: 'ywM1L/yc2ppnA1hl+/oQlwD8Ara7bzUcg5etpQTQ/6s=',
|
2021-04-16 23:13:13 +00:00
|
|
|
|
previousCounter: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
senderChain: {
|
|
|
|
|
senderRatchetKey: 'BSsTNJarMQATbCAq40vnbrrW87PtVFOfJox7+SDNgj4x',
|
|
|
|
|
senderRatchetKeyPrivate:
|
|
|
|
|
'5JfjxauqiuD47SmI4QXBIoxzSk0uqKEScp0oTgw51Ag=',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 0,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: '6EI/Nw+vHhCoB499OpM/kLkQJFzrfqoAZ00w1ZgnowU=',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
receiverChains: [
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BQo3HG1UhWIh6A7NBxZtNGezBZH8nElZjOqNCBHPzlBz',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: 'Wnvy2TjYs0HdZFNahmsKw5cc9KEbW1nSwraDFmGwBDw=',
|
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'xVreEbT7Vtrxs85JyGBj6Y+UWftQz4H72F5kWV4cxqM=',
|
|
|
|
|
iv: 'TcRanSxZVWbuIq0xDRGnEw==',
|
|
|
|
|
macKey: '5fW9aIKXhtwWp/5alNJUIXInZbztf2ywzQSpYrXoQ3A=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 5,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'A99HjM4pUugsQ5+2v48FGTGEhZPoW6wzW9MqSc11QQ4=',
|
|
|
|
|
iv: 'bE8Ei2Rkaoz4SKRwdG4+tQ==',
|
|
|
|
|
macKey: 'TOTdbAf0bCHOzcQ3lBaIm3yqmpEqvvldD0qTuDFmkAI=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BTpb20+IlnBkryDC2ecQT96Hd3t9/Qh3ljnA3509kxRa',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 2,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'aAbSz5jOagUTgQKo3aqExcl8hyZANrY+HvrLc/OgoQI=',
|
|
|
|
|
iv: 'JcyLzw0fL67Kd4tfGJ2OUQ==',
|
|
|
|
|
macKey: 'dt+RXeaeIx+ASrKSk7D4guwTE1IUYl3LiLG9aI4sZm8=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'Bd5nlMVr6YMBE5eh//tOWMgoOQakkneYri/YuVJpi0pJ',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 12,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'pjcY/7MoRGtGHwNN/E8KqoKCx/5mdKp0VCmrmkBAj+M=',
|
|
|
|
|
iv: 'eBpAEoDj94NsI0vsf+4Hrw==',
|
|
|
|
|
macKey: 'P7Jz2KkOXC7B0mLkz7JaU/d0vdaYZjAfuKJ86xXB19U=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'EGDj0sc/1TMtSycYDCrpZdl6UCzCzDuMwlAvVVAs2OQ=',
|
|
|
|
|
iv: 'A+1OA9M2Z8gGlARtA231RA==',
|
|
|
|
|
macKey: 'oQ/PQxJDD52qrkShSy6hD3fASEfhWnlmY3qsSPuOY/o=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 4,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'WM3UUILGdECXjO8jZbBVYrPAnzRM8RdiU+PSAyHUT5U=',
|
|
|
|
|
iv: 'CWuQIuIyGqApA6MQgnDR5Q==',
|
|
|
|
|
macKey: 'hg+/xrOKFzn2eK1BnJ5C+ERsFgaWAOaBxQTc4q3b/g8=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 10,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'T0cBaGAseFz+s2njVr4sqbFf1pUH5PoPvdMBoizIT+Y=',
|
|
|
|
|
iv: 'hkT2kqgqhlORAjBI7ZDsig==',
|
|
|
|
|
macKey: 'uE/Dd4WSQWkYNRgolcQtOd+HpaHP5wGogMzErkZj+AQ=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BYSxQO1OIs0ZSFN7JI/vF5Rb0VwaKjs+UAAfDkhOYfkp',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'ni6XhRCoLFud2Zk1zoel4he8znDG/t+TWVBASO35GlQ=',
|
|
|
|
|
iv: 'rKy/sxLmQ4j2DSxbDZTO5A==',
|
|
|
|
|
macKey: 'MKxs29AmNOnp6zZOsIbrmSqcVXYJL01kuvIaqwjRNvQ=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'Pp7GOD72vfjvb3qx7qm1YVoZKPqnyXC2uqCt89ZA/yc=',
|
|
|
|
|
iv: 'NuDf5iM0lD/o0YzjHZo4mA==',
|
|
|
|
|
macKey: 'JkBZiaxmwFr1xh/zzTQE6mlUIVJmSIrqSIQVlaoTz7M=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 4,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'zORWRvJEUe2F4UnBwe2YRqPS4GzUFE1lWptcqMzWf2U=',
|
|
|
|
|
iv: 'Og7jF9JJhiLtPD8W2OgTnw==',
|
|
|
|
|
macKey: 'Lxbcl9fL9x5Javtdz7tOV7Bbr8ar3rWxSIsi1Focv9w=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'T/TZNw04+ZfB0s2ltOT9qbzRPnCFn7VvxqHHAvORFx0=',
|
|
|
|
|
iv: 'DpOAK77ErIr2QFTsRnfOew==',
|
|
|
|
|
macKey: 'k/fxafepBiA0dQOTpohL+EKm2+1jpFwRigVWt02U/Jg=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BbXSFD/IoivRUvfnPzOaRLqDXEAwi4YEristfwiOj3IJ',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BRRAnr1NhizgCPPzmYV9qGBpvwCpSQH0Rx+UOtl78wUg',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BZvOKPA+kXiCg8TIP/52fu1reCDirC7wb5nyRGce3y4N',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 7,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 5,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'PB44plPzHam/o2LZnyjo8HLRuAvp3uE6ixO5+GUCUsA=',
|
|
|
|
|
iv: 'JBbgRb10X/dDsn0GKg69dA==',
|
|
|
|
|
macKey: 'jKV1Rmlb0HATZHndLDIMONPgOXqT3kwE1QEstxXVe+o=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'Ba9q9bHjMHfbUNDCU8+0O7cmEcIluq+wk3/d2f7q+ThG',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 4,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: '4buOJSqRFIpWwo4pXYwQTCTxas4+amBLpZ/CuEWXbPg=',
|
|
|
|
|
iv: '9uD8ECO/fxtK28OvlCFXuQ==',
|
|
|
|
|
macKey: 'LI0ZSdX7k+cd5bTgs6XEYYIWY+2cxhWI97vAGFpoZIc=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 2,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'oNbFxcy2eebUQhoD+NLf12fgkXzhn4EU0Pgqn1bVKOs=',
|
|
|
|
|
iv: 'o1mm4rCN6Q0J1hA7I5jjgA==',
|
|
|
|
|
macKey: 'dfHB14sCIdun+RaKnAoyaQPC6qRDMewjqOIDZGmn3Es=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: '/aU3zX2IdA91GAcB+7H57yzRe+6CgZ61tlW4M/rkCJI=',
|
|
|
|
|
iv: 'v8VJF467QDD1ZCr1JD8pbQ==',
|
|
|
|
|
macKey: 'MjK5iYjhZtQTJ4Eu3+qGOdYxn0G23EGRtTcusbzy9OA=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BTwX5SmcUeBG7mwyOZ3YgxyXIN0ktzuEdWTfBUmPfGYG',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 2,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BV7ECvKbwKIAD61BXDYr0xr3JtckuKzR1Hw8cVPWGtlo',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BTC7rQqoykGR5Aaix7RkAhI5fSXufc6pVGN9OIC8EW5c',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
remoteRegistrationId: 4243,
|
|
|
|
|
localRegistrationId: 3554,
|
|
|
|
|
aliceBaseKey: 'BVeHv5MAbMgKeaoO/G1CMBdqhC7bo7Mtc4EWxI0oT19N',
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const recordCopy = getRecordCopy(record);
|
|
|
|
|
|
|
|
|
|
const actual = sessionRecordToProtobuf(record, ourData);
|
|
|
|
|
|
|
|
|
|
assert.deepEqual(expected, actual.toJSON());
|
|
|
|
|
|
|
|
|
|
// We want to ensure that conversion doesn't modify incoming data
|
|
|
|
|
assert.deepEqual(record, recordCopy);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('Generates expected protobuf with pending prekey', () => {
|
|
|
|
|
const record: any = {
|
|
|
|
|
sessions: {
|
|
|
|
|
'\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M': {
|
|
|
|
|
registrationId: 4243,
|
|
|
|
|
currentRatchet: {
|
|
|
|
|
rootKey:
|
|
|
|
|
'Ë\u00035/üÚg\u0003Xeûú\u0010\u0000ü\u0002¶»o5\u001c¥\u0004Ðÿ«',
|
|
|
|
|
lastRemoteEphemeralKey:
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs',
|
|
|
|
|
previousCounter: 2,
|
|
|
|
|
ephemeralKeyPair: {
|
|
|
|
|
privKey: 'äãÅ«ªàøí)á\u0005Á"sJM.¨¡\u0012r(N\f9Ô\b',
|
|
|
|
|
pubKey: '\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
indexInfo: {
|
|
|
|
|
remoteIdentityKey: '\u0005¨¨©üÏäúoá©êO¢çúxr»Æ¿r²GùiT@',
|
|
|
|
|
closed: -1,
|
|
|
|
|
baseKey: '\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M',
|
|
|
|
|
baseKeyType: 2,
|
|
|
|
|
},
|
|
|
|
|
pendingPreKey: {
|
|
|
|
|
baseKey: '\u0005ui©üÏäúoá©êO¢çúxr»Æ¿r²GùiT@',
|
|
|
|
|
signedKeyId: 38,
|
|
|
|
|
preKeyId: 2,
|
|
|
|
|
},
|
|
|
|
|
oldRatchetList: [],
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': 'Îgó¯2àvñX_õ\u0014Ç\u0000öl\u001f4J>ÐÏ{`-Ü5¦',
|
|
|
|
|
'4': 'c¿<µâ¼Xµ!Ù¯µ®[n<ìîúcoå©n\u0013"l]Ð',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 5,
|
|
|
|
|
key: 'Z{òÙ8سAÝdSZk\nÃ\u001cô¡\u001b[YÒ¶\u0016a°\u0004<',
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: -1,
|
2021-11-11 22:43:05 +00:00
|
|
|
|
key: "èB?7\u000f¯\u001e\u0010¨\u0007}:?¹\u0010$\\ë~ª\u0000gM0Õ'£\u0005",
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
chainType: 1,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
version: 'v1',
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const expected = {
|
|
|
|
|
currentSession: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
sessionVersion: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
localIdentityPublic: 'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444',
|
|
|
|
|
remoteIdentityPublic: 'BaioqfzP5JD6b+GNqepPouf6eHK7xr9ynLJHnvlpgVRA',
|
|
|
|
|
rootKey: 'ywM1L/yc2ppnA1hl+/oQlwD8Ara7bzUcg5etpQTQ/6s=',
|
2021-04-16 23:13:13 +00:00
|
|
|
|
previousCounter: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
senderChain: {
|
|
|
|
|
senderRatchetKey: 'BSsTNJarMQATbCAq40vnbrrW87PtVFOfJox7+SDNgj4x',
|
|
|
|
|
senderRatchetKeyPrivate:
|
|
|
|
|
'5JfjxauqiuD47SmI4QXBIoxzSk0uqKEScp0oTgw51Ag=',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 0,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: '6EI/Nw+vHhCoB499OpM/kLkQJFzrfqoAZ00w1ZgnowU=',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
receiverChains: [
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BQo3HG1UhWIh6A7NBxZtNGezBZH8nElZjOqNCBHPzlBz',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: 'Wnvy2TjYs0HdZFNahmsKw5cc9KEbW1nSwraDFmGwBDw=',
|
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'xVreEbT7Vtrxs85JyGBj6Y+UWftQz4H72F5kWV4cxqM=',
|
|
|
|
|
iv: 'TcRanSxZVWbuIq0xDRGnEw==',
|
|
|
|
|
macKey: '5fW9aIKXhtwWp/5alNJUIXInZbztf2ywzQSpYrXoQ3A=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 5,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'A99HjM4pUugsQ5+2v48FGTGEhZPoW6wzW9MqSc11QQ4=',
|
|
|
|
|
iv: 'bE8Ei2Rkaoz4SKRwdG4+tQ==',
|
|
|
|
|
macKey: 'TOTdbAf0bCHOzcQ3lBaIm3yqmpEqvvldD0qTuDFmkAI=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
pendingPreKey: {
|
|
|
|
|
preKeyId: 2,
|
|
|
|
|
baseKey: 'BXVpqfzP5JD6b+GNqepPouf6eHK7xr9ynLJHnvlpgVRA',
|
|
|
|
|
signedPreKeyId: 38,
|
|
|
|
|
},
|
|
|
|
|
remoteRegistrationId: 4243,
|
|
|
|
|
localRegistrationId: 3554,
|
|
|
|
|
aliceBaseKey: 'BVeHv5MAbMgKeaoO/G1CMBdqhC7bo7Mtc4EWxI0oT19N',
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const recordCopy = getRecordCopy(record);
|
|
|
|
|
|
|
|
|
|
const actual = sessionRecordToProtobuf(record, ourData);
|
|
|
|
|
|
|
|
|
|
assert.deepEqual(expected, actual.toJSON());
|
|
|
|
|
|
|
|
|
|
// We want to ensure that conversion doesn't modify incoming data
|
|
|
|
|
assert.deepEqual(record, recordCopy);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('Generates expected protobuf with multiple sessions', () => {
|
|
|
|
|
const record: any = {
|
|
|
|
|
sessions: {
|
|
|
|
|
'\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M': {
|
|
|
|
|
registrationId: 4243,
|
|
|
|
|
currentRatchet: {
|
|
|
|
|
rootKey:
|
|
|
|
|
'Ë\u00035/üÚg\u0003Xeûú\u0010\u0000ü\u0002¶»o5\u001c¥\u0004Ðÿ«',
|
|
|
|
|
lastRemoteEphemeralKey:
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs',
|
|
|
|
|
previousCounter: 2,
|
|
|
|
|
ephemeralKeyPair: {
|
|
|
|
|
privKey: 'äãÅ«ªàøí)á\u0005Á"sJM.¨¡\u0012r(N\f9Ô\b',
|
|
|
|
|
pubKey: '\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
indexInfo: {
|
|
|
|
|
remoteIdentityKey: '\u0005¨¨©üÏäúoá©êO¢çúxr»Æ¿r²GùiT@',
|
|
|
|
|
closed: -1,
|
|
|
|
|
baseKey: '\u0005W¿\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M',
|
|
|
|
|
baseKeyType: 2,
|
|
|
|
|
},
|
|
|
|
|
oldRatchetList: [],
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'0': 'Îgó¯2àvñX_õ\u0014Ç\u0000öl\u001f4J>ÐÏ{`-Ü5¦',
|
|
|
|
|
'4': 'c¿<µâ¼Xµ!Ù¯µ®[n<ìîúcoå©n\u0013"l]Ð',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 5,
|
|
|
|
|
key: 'Z{òÙ8سAÝdSZk\nÃ\u001cô¡\u001b[YÒ¶\u0016a°\u0004<',
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: -1,
|
2021-11-11 22:43:05 +00:00
|
|
|
|
key: "èB?7\u000f¯\u001e\u0010¨\u0007}:?¹\u0010$\\ë~ª\u0000gM0Õ'£\u0005",
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
chainType: 1,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
'\u0005BD¿Z\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M': {
|
|
|
|
|
registrationId: 3432,
|
|
|
|
|
currentRatchet: {
|
|
|
|
|
rootKey:
|
|
|
|
|
'Ë\u00035/üÚg\u0003Xeûú\u0010\u0000ü\u0002¶»o5\u001c¥\u0004Ðÿ«',
|
|
|
|
|
lastRemoteEphemeralKey:
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs',
|
|
|
|
|
previousCounter: 2,
|
|
|
|
|
ephemeralKeyPair: {
|
|
|
|
|
privKey: 'äãÅ«ªàøí)á\u0005Á"sJM.¨¡\u0012r(N\f9Ô\b',
|
|
|
|
|
pubKey: '\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
indexInfo: {
|
|
|
|
|
remoteIdentityKey: '\u0005¨¨©üÏäúoá©êO¢çúxr»Æ¿r²GùiT@',
|
|
|
|
|
closed: 1605579954962,
|
|
|
|
|
baseKey: '\u0005BD¿Z\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M',
|
|
|
|
|
baseKeyType: 2,
|
|
|
|
|
},
|
|
|
|
|
oldRatchetList: [],
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'2': 'Îgó¯2àvñX_õ\u0014Ç\u0000öl\u001f4J>ÐÏ{`-Ü5¦',
|
|
|
|
|
'3': 'c¿<µâ¼Xµ!Ù¯µ®[n<ìîúcoå©n\u0013"l]Ð',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 5,
|
|
|
|
|
key: 'Z{òÙ8سAÝdSZk\nÃ\u001cô¡\u001b[YÒ¶\u0016a°\u0004<',
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: -1,
|
2021-11-11 22:43:05 +00:00
|
|
|
|
key: "èB?7\u000f¯\u001e\u0010¨\u0007}:?¹\u0010$\\ë~ª\u0000gM0Õ'£\u0005",
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
chainType: 1,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
'\u0005AN¿C\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M': {
|
|
|
|
|
registrationId: 2312,
|
|
|
|
|
currentRatchet: {
|
|
|
|
|
rootKey:
|
|
|
|
|
'Ë\u00035/üÚg\u0003Xeûú\u0010\u0000ü\u0002¶»o5\u001c¥\u0004Ðÿ«',
|
|
|
|
|
lastRemoteEphemeralKey:
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs',
|
|
|
|
|
previousCounter: 2,
|
|
|
|
|
ephemeralKeyPair: {
|
|
|
|
|
privKey: 'äãÅ«ªàøí)á\u0005Á"sJM.¨¡\u0012r(N\f9Ô\b',
|
|
|
|
|
pubKey: '\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
indexInfo: {
|
|
|
|
|
remoteIdentityKey: '\u0005¨¨©üÏäúoá©êO¢çúxr»Æ¿r²GùiT@',
|
|
|
|
|
closed: 1605580407000,
|
|
|
|
|
baseKey: '\u0005AN¿C\u0000lÈ\nyª\u000eümB0\u0017j.Û£³-s\u0016Ä(O_M',
|
|
|
|
|
baseKeyType: 2,
|
|
|
|
|
},
|
|
|
|
|
oldRatchetList: [],
|
|
|
|
|
'\u0005\n7\u001cmT
b!è\u000eÍ\u0007\u0016m4g³\u0005üIYê\b\u0011ÏÎPs': {
|
|
|
|
|
messageKeys: {
|
|
|
|
|
'1': 'Îgó¯2àvñX_õ\u0014Ç\u0000öl\u001f4J>ÐÏ{`-Ü5¦',
|
|
|
|
|
'5': 'c¿<µâ¼Xµ!Ù¯µ®[n<ìîúcoå©n\u0013"l]Ð',
|
|
|
|
|
},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 5,
|
|
|
|
|
key: 'Z{òÙ8سAÝdSZk\nÃ\u001cô¡\u001b[YÒ¶\u0016a°\u0004<',
|
|
|
|
|
},
|
|
|
|
|
chainType: 2,
|
|
|
|
|
},
|
|
|
|
|
'\u0005+\u00134«1\u0000\u0013l *ãKçnºÖó³íTS&{ù Í>1': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: -1,
|
2021-11-11 22:43:05 +00:00
|
|
|
|
key: "èB?7\u000f¯\u001e\u0010¨\u0007}:?¹\u0010$\\ë~ª\u0000gM0Õ'£\u0005",
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
chainType: 1,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
version: 'v1',
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const expected = {
|
|
|
|
|
currentSession: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
sessionVersion: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
localIdentityPublic: 'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444',
|
|
|
|
|
remoteIdentityPublic: 'BaioqfzP5JD6b+GNqepPouf6eHK7xr9ynLJHnvlpgVRA',
|
|
|
|
|
rootKey: 'ywM1L/yc2ppnA1hl+/oQlwD8Ara7bzUcg5etpQTQ/6s=',
|
2021-04-16 23:13:13 +00:00
|
|
|
|
previousCounter: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
senderChain: {
|
|
|
|
|
senderRatchetKey: 'BSsTNJarMQATbCAq40vnbrrW87PtVFOfJox7+SDNgj4x',
|
|
|
|
|
senderRatchetKeyPrivate:
|
|
|
|
|
'5JfjxauqiuD47SmI4QXBIoxzSk0uqKEScp0oTgw51Ag=',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 0,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: '6EI/Nw+vHhCoB499OpM/kLkQJFzrfqoAZ00w1ZgnowU=',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
receiverChains: [
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BQo3HG1UhWIh6A7NBxZtNGezBZH8nElZjOqNCBHPzlBz',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: 'Wnvy2TjYs0HdZFNahmsKw5cc9KEbW1nSwraDFmGwBDw=',
|
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'xVreEbT7Vtrxs85JyGBj6Y+UWftQz4H72F5kWV4cxqM=',
|
|
|
|
|
iv: 'TcRanSxZVWbuIq0xDRGnEw==',
|
|
|
|
|
macKey: '5fW9aIKXhtwWp/5alNJUIXInZbztf2ywzQSpYrXoQ3A=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 5,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'A99HjM4pUugsQ5+2v48FGTGEhZPoW6wzW9MqSc11QQ4=',
|
|
|
|
|
iv: 'bE8Ei2Rkaoz4SKRwdG4+tQ==',
|
|
|
|
|
macKey: 'TOTdbAf0bCHOzcQ3lBaIm3yqmpEqvvldD0qTuDFmkAI=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
remoteRegistrationId: 4243,
|
|
|
|
|
localRegistrationId: 3554,
|
|
|
|
|
aliceBaseKey: 'BVeHv5MAbMgKeaoO/G1CMBdqhC7bo7Mtc4EWxI0oT19N',
|
|
|
|
|
},
|
|
|
|
|
previousSessions: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
sessionVersion: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
localIdentityPublic: 'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444',
|
|
|
|
|
remoteIdentityPublic: 'BaioqfzP5JD6b+GNqepPouf6eHK7xr9ynLJHnvlpgVRA',
|
|
|
|
|
rootKey: 'ywM1L/yc2ppnA1hl+/oQlwD8Ara7bzUcg5etpQTQ/6s=',
|
2021-04-16 23:13:13 +00:00
|
|
|
|
previousCounter: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
senderChain: {
|
|
|
|
|
senderRatchetKey: 'BSsTNJarMQATbCAq40vnbrrW87PtVFOfJox7+SDNgj4x',
|
|
|
|
|
senderRatchetKeyPrivate:
|
|
|
|
|
'5JfjxauqiuD47SmI4QXBIoxzSk0uqKEScp0oTgw51Ag=',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 0,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: '6EI/Nw+vHhCoB499OpM/kLkQJFzrfqoAZ00w1ZgnowU=',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
receiverChains: [
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BQo3HG1UhWIh6A7NBxZtNGezBZH8nElZjOqNCBHPzlBz',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: 'Wnvy2TjYs0HdZFNahmsKw5cc9KEbW1nSwraDFmGwBDw=',
|
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 2,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'xVreEbT7Vtrxs85JyGBj6Y+UWftQz4H72F5kWV4cxqM=',
|
|
|
|
|
iv: 'TcRanSxZVWbuIq0xDRGnEw==',
|
|
|
|
|
macKey: '5fW9aIKXhtwWp/5alNJUIXInZbztf2ywzQSpYrXoQ3A=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'A99HjM4pUugsQ5+2v48FGTGEhZPoW6wzW9MqSc11QQ4=',
|
|
|
|
|
iv: 'bE8Ei2Rkaoz4SKRwdG4+tQ==',
|
|
|
|
|
macKey: 'TOTdbAf0bCHOzcQ3lBaIm3yqmpEqvvldD0qTuDFmkAI=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
remoteRegistrationId: 2312,
|
|
|
|
|
localRegistrationId: 3554,
|
|
|
|
|
aliceBaseKey: 'BUFOv0MAbMgKeaoO/G1CMBdqhC7bo7Mtc4EWxI0oT19N',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
sessionVersion: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
localIdentityPublic: 'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444',
|
|
|
|
|
remoteIdentityPublic: 'BaioqfzP5JD6b+GNqepPouf6eHK7xr9ynLJHnvlpgVRA',
|
|
|
|
|
rootKey: 'ywM1L/yc2ppnA1hl+/oQlwD8Ara7bzUcg5etpQTQ/6s=',
|
2021-04-16 23:13:13 +00:00
|
|
|
|
previousCounter: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
senderChain: {
|
|
|
|
|
senderRatchetKey: 'BSsTNJarMQATbCAq40vnbrrW87PtVFOfJox7+SDNgj4x',
|
|
|
|
|
senderRatchetKeyPrivate:
|
|
|
|
|
'5JfjxauqiuD47SmI4QXBIoxzSk0uqKEScp0oTgw51Ag=',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 0,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: '6EI/Nw+vHhCoB499OpM/kLkQJFzrfqoAZ00w1ZgnowU=',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
receiverChains: [
|
|
|
|
|
{
|
|
|
|
|
senderRatchetKey: 'BQo3HG1UhWIh6A7NBxZtNGezBZH8nElZjOqNCBHPzlBz',
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 6,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: 'Wnvy2TjYs0HdZFNahmsKw5cc9KEbW1nSwraDFmGwBDw=',
|
|
|
|
|
},
|
|
|
|
|
messageKeys: [
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'xVreEbT7Vtrxs85JyGBj6Y+UWftQz4H72F5kWV4cxqM=',
|
|
|
|
|
iv: 'TcRanSxZVWbuIq0xDRGnEw==',
|
|
|
|
|
macKey: '5fW9aIKXhtwWp/5alNJUIXInZbztf2ywzQSpYrXoQ3A=',
|
|
|
|
|
},
|
|
|
|
|
{
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 4,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
cipherKey: 'A99HjM4pUugsQ5+2v48FGTGEhZPoW6wzW9MqSc11QQ4=',
|
|
|
|
|
iv: 'bE8Ei2Rkaoz4SKRwdG4+tQ==',
|
|
|
|
|
macKey: 'TOTdbAf0bCHOzcQ3lBaIm3yqmpEqvvldD0qTuDFmkAI=',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
remoteRegistrationId: 3432,
|
|
|
|
|
localRegistrationId: 3554,
|
|
|
|
|
aliceBaseKey: 'BUJEv1oAbMgKeaoO/G1CMBdqhC7bo7Mtc4EWxI0oT19N',
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const recordCopy = getRecordCopy(record);
|
|
|
|
|
|
|
|
|
|
const actual = sessionRecordToProtobuf(record, ourData);
|
|
|
|
|
|
|
|
|
|
assert.deepEqual(expected, actual.toJSON());
|
|
|
|
|
|
|
|
|
|
// We want to ensure that conversion doesn't modify incoming data
|
|
|
|
|
assert.deepEqual(record, recordCopy);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('Generates expected protobuf with just-initialized session', () => {
|
|
|
|
|
const record: any = {
|
|
|
|
|
sessions: {
|
|
|
|
|
'\u00055>=eV¹\u0019Ûn¾¯#߶_=\u0013.Nî\u001a¥%
-]ù_\n': {
|
|
|
|
|
registrationId: 3188,
|
|
|
|
|
currentRatchet: {
|
|
|
|
|
rootKey: '\u001b16Êæðʨ¾>}Ú©ÄH¸sNÓ:ÈF¹³QÖi',
|
|
|
|
|
lastRemoteEphemeralKey:
|
|
|
|
|
'\u0005KÆ\\û«\u0003Ñ\u0005ÚûU±iú\u0012iÃ\u0011]¼åUà\u001f¯òÉ~&\u0003',
|
|
|
|
|
previousCounter: 0,
|
|
|
|
|
ephemeralKeyPair: {
|
|
|
|
|
privKey:
|
|
|
|
|
" -&\t]$\u0015P\u001fù\u000e\u001c\u001e'y
\u001eïËîEÑ+éaª± :wM",
|
|
|
|
|
pubKey: '\u0005\u0014¦ç\u0002ò\u001aÆå\u001a{Ø1´ènnÇ(ÛK©8PË"h',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
indexInfo: {
|
|
|
|
|
remoteIdentityKey: '\u0005\u0019Úä§\u0006×dâ°u§õ`EËTe%H¢!&Ù8cz*',
|
|
|
|
|
closed: -1,
|
|
|
|
|
baseKey: '\u00055>=eV¹\u0019Ûn¾¯#߶_=\u0013.Nî\u001a¥%
-]ù_\n',
|
|
|
|
|
baseKeyType: 1,
|
|
|
|
|
},
|
|
|
|
|
oldRatchetList: [],
|
|
|
|
|
'\u0005\u0014¦ç\u0002ò\u001aÆå\u001a{Ø1´ènnÇ(ÛK©8PË"h': {
|
|
|
|
|
messageKeys: {},
|
|
|
|
|
chainKey: {
|
|
|
|
|
counter: 0,
|
|
|
|
|
key: '¶^Do/jî\u000fU諪\u0011xnõ\u0011Æò}Ðó*äÇÊÂ\u0000',
|
|
|
|
|
},
|
|
|
|
|
chainType: 1,
|
|
|
|
|
},
|
|
|
|
|
pendingPreKey: {
|
|
|
|
|
signedKeyId: 2995,
|
|
|
|
|
baseKey: '\u00055>=eV¹\u0019Ûn¾¯#߶_=\u0013.Nî\u001a¥%
-]ù_\n',
|
|
|
|
|
preKeyId: 386,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
version: 'v1',
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const expected = {
|
|
|
|
|
currentSession: {
|
|
|
|
|
aliceBaseKey: 'BTU+PWVWuRnbiW6+ja+XI9+2Xz0TLk7uGqUlhS1d+V8K',
|
|
|
|
|
localIdentityPublic: 'Baioqfzc/5JD6b+GNqapPouf6eHK7xr9ynLJHnvl+444',
|
|
|
|
|
localRegistrationId: 3554,
|
|
|
|
|
pendingPreKey: {
|
|
|
|
|
baseKey: 'BTU+PWVWuRnbiW6+ja+XI9+2Xz0TLk7uGqUlhS1d+V8K',
|
|
|
|
|
preKeyId: 386,
|
|
|
|
|
signedPreKeyId: 2995,
|
|
|
|
|
},
|
2021-04-16 23:13:13 +00:00
|
|
|
|
previousCounter: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
remoteIdentityPublic: 'BRmB2uSNpwbXZJjisIh1p/VgRctUZSVIoiEm2ThjiHoq',
|
|
|
|
|
remoteRegistrationId: 3188,
|
|
|
|
|
rootKey: 'GzGfNozK5vDKqL4+fdqpiMRIuHNOndM6iMhGubNR1mk=',
|
|
|
|
|
senderChain: {
|
|
|
|
|
chainKey: {
|
2021-04-16 23:13:13 +00:00
|
|
|
|
index: 1,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
key: 'tl5Eby9q7n8PVeiriKoRjHhu9Y0RxvJ90PMq5MfKwgA=',
|
|
|
|
|
},
|
|
|
|
|
senderRatchetKey: 'BRSm55wC8hrG5Rp7l9gxtOhugp5ulcco20upOFCPyyJo',
|
|
|
|
|
senderRatchetKeyPrivate:
|
|
|
|
|
'IC0mCV0kFVAf+Q4cHid5hR7vy+5F0SvpYYaqsSA6d00=',
|
|
|
|
|
},
|
2021-04-16 23:13:13 +00:00
|
|
|
|
sessionVersion: 3,
|
2021-03-04 20:01:34 +00:00
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const recordCopy = getRecordCopy(record);
|
|
|
|
|
|
|
|
|
|
const actual = sessionRecordToProtobuf(record, ourData);
|
|
|
|
|
|
|
|
|
|
assert.deepEqual(expected, actual.toJSON());
|
|
|
|
|
|
|
|
|
|
// We want to ensure that conversion doesn't modify incoming data
|
|
|
|
|
assert.deepEqual(record, recordCopy);
|
|
|
|
|
});
|
|
|
|
|
});
|