self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Chore: Fix a flaky test case in crypto.test.ts (#11389)

Browse Source
This commit is contained in:
Self Not Found
2024-11-14 09:46:22 +00:00
committed by GitHub
parent 9a5842c621
commit fb0bfe6a2b
2 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
packages/lib/services/e2ee/crypto.test.ts
View File

@@ -18,7 +18,7 @@ describe('e2ee/crypto', () => {
await expectNotThrow(async () => runIntegrationTests(true));
}));
it('should not generate new nonce if counter does not overflow', (async () => {
it('should not generate new nonce if counter does not overflow (empty counter)', (async () => {
jest.useFakeTimers();
const nonce = await crypto.generateNonce(new Uint8Array(36));
@@ -38,42 +38,37 @@ describe('e2ee/crypto', () => {
expect(nonce.subarray(-8)).toEqual(new Uint8Array([0, 0, 0, 0, 0, 0, 0, 2]));
// Non-counter part should stay the same
expect(nonce.subarray(0, 28)).toEqual(nonCounterPart);
}));
it.each([
[[248, 249, 250, 251, 255, 0, 255, 126], [248, 249, 250, 251, 255, 0, 255, 127]],
[[248, 249, 250, 251, 0, 255, 0, 126], [248, 249, 250, 251, 0, 255, 0, 127]],
[[248, 249, 250, 251, 252, 253, 254, 126], [248, 249, 250, 251, 252, 253, 254, 127]],
[[248, 249, 250, 251, 252, 253, 254, 254], [248, 249, 250, 251, 252, 253, 254, 255]],
[[248, 249, 250, 251, 252, 253, 254, 255], [248, 249, 250, 251, 252, 253, 255, 0]],
[[248, 249, 250, 251, 252, 253, 255, 0], [248, 249, 250, 251, 252, 253, 255, 1]],
[[249, 250, 251, 252, 253, 254, 255, 255], [249, 250, 251, 252, 253, 255, 0, 0]],
[[253, 254, 255, 255, 255, 255, 255, 255], [253, 255, 0, 0, 0, 0, 0, 0]],
[[254, 255, 255, 255, 255, 255, 255, 255], [255, 0, 0, 0, 0, 0, 0, 0]],
])('should not generate new nonce if counter does not overflow', (async (counterBeforeIncrease, counterAfterIncrease) => {
jest.useFakeTimers();
const nonce = await crypto.generateNonce(new Uint8Array(36));
expect(nonce.subarray(-8)).toEqual(new Uint8Array(8));
const nonCounterPart = nonce.slice(0, 28);
jest.advanceTimersByTime(1);
nonce.set(new Uint8Array([248, 249, 250, 251, 252, 253, 254, 255]), 28);
nonce.set(new Uint8Array(counterBeforeIncrease), 28);
await crypto.increaseNonce(nonce);
// Counter should have expected value
expect(nonce.subarray(-8)).toEqual(new Uint8Array([248, 249, 250, 251, 252, 253, 255, 0]));
// Non-counter part should stay the same
expect(nonce.subarray(0, 28)).toEqual(nonCounterPart);
jest.advanceTimersByTime(1);
nonce.set(new Uint8Array([249, 250, 251, 252, 253, 254, 255, 255]), 28);
await crypto.increaseNonce(nonce);
// Counter should have expected value
expect(nonce.subarray(-8)).toEqual(new Uint8Array([249, 250, 251, 252, 253, 255, 0, 0]));
// Non-counter part should stay the same
expect(nonce.subarray(0, 28)).toEqual(nonCounterPart);
jest.advanceTimersByTime(1);
nonce.set(new Uint8Array([253, 254, 255, 255, 255, 255, 255, 255]), 28);
await crypto.increaseNonce(nonce);
// Counter should have expected value
expect(nonce.subarray(-8)).toEqual(new Uint8Array([253, 255, 0, 0, 0, 0, 0, 0]));
// Non-counter part should stay the same
expect(nonce.subarray(0, 28)).toEqual(nonCounterPart);
jest.advanceTimersByTime(1);
nonce.set(new Uint8Array([254, 255, 255, 255, 255, 255, 255, 255]), 28);
await crypto.increaseNonce(nonce);
// Counter should have expected value
expect(nonce.subarray(-8)).toEqual(new Uint8Array([255, 0, 0, 0, 0, 0, 0, 0]));
expect(nonce.subarray(-8)).toEqual(new Uint8Array(counterAfterIncrease));
// Non-counter part should stay the same
expect(nonce.subarray(0, 28)).toEqual(nonCounterPart);
}));
it('should generate new nonce if counter overflow', (async () => {
jest.useFakeTimers();
it.each([0, 1, 0xFE, 0xFF, 0x100, 0xFFFE, 0xFFFF, 0x10000, Date.now()],
)('should generate new nonce if counter overflow', (async (mockedTimestamp) => {
jest.useFakeTimers({ now: mockedTimestamp });
const nonce = await crypto.generateNonce(new Uint8Array(36));
expect(nonce.subarray(-8)).toEqual(new Uint8Array(8));
@@ -96,8 +91,16 @@ describe('e2ee/crypto', () => {
// Random part should be changed
expect(nonce.subarray(0, 21)).not.toEqual(randomPart);
// Timestamp part should have expected value
expect(nonce[21]).toBe(timestampPart[0] + 2);
expect(nonce.subarray(22, 28)).toEqual(timestampPart.subarray(1));
let carry = 2;
for (let i = 0; i < timestampPart.length; i++) {
const sum = timestampPart[i] + carry;
timestampPart[i] = sum % 256;
carry = Math.floor(sum / 256);
if (carry === 0) {
break;
}
}
expect(nonce.subarray(21, 28)).toEqual(timestampPart);
}));
});

5
packages/lib/services/e2ee/cryptoShared.ts
View File

@@ -36,12 +36,11 @@ export const generateNonce = async (nonce: Uint8Array) => {
};
export const increaseNonce = async (nonce: Uint8Array) => {
const carry = 1;
const end = nonce.length - nonceCounterLength;
let i = nonce.length;
while (i-- > end) {
nonce[i] += carry;
if (nonce[i] !== 0 || carry !== 1) {
nonce[i] += 1;
if (nonce[i] !== 0) {
break;
}
}