Move receipt queues into conversation queue to handle 428s
This commit is contained in:
parent
3776a04c0b
commit
2bbcc4676e
20 changed files with 981 additions and 223 deletions
128
ts/test-mock/rate-limit/viewed_test.ts
Normal file
128
ts/test-mock/rate-limit/viewed_test.ts
Normal file
|
@ -0,0 +1,128 @@
|
|||
// Copyright 2023 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { assert } from 'chai';
|
||||
import type { PrimaryDevice } from '@signalapp/mock-server';
|
||||
import { StorageState, UUIDKind } from '@signalapp/mock-server';
|
||||
import createDebug from 'debug';
|
||||
import * as durations from '../../util/durations';
|
||||
import { Bootstrap } from '../bootstrap';
|
||||
import type { App } from '../bootstrap';
|
||||
import { ReceiptType } from '../../types/Receipt';
|
||||
|
||||
export const debug = createDebug('mock:test:challenge:receipts');
|
||||
|
||||
describe('challenge/receipts', function challengeReceiptsTest() {
|
||||
this.timeout(durations.MINUTE * 100);
|
||||
|
||||
let bootstrap: Bootstrap;
|
||||
let app: App;
|
||||
let contact: PrimaryDevice;
|
||||
|
||||
beforeEach(async () => {
|
||||
bootstrap = new Bootstrap({
|
||||
contactCount: 0,
|
||||
contactsWithoutProfileKey: 40,
|
||||
});
|
||||
await bootstrap.init();
|
||||
app = await bootstrap.link();
|
||||
|
||||
const { server, desktop, phone } = bootstrap;
|
||||
|
||||
contact = await server.createPrimaryDevice({
|
||||
profileName: 'Jamie',
|
||||
});
|
||||
|
||||
let state = StorageState.getEmpty();
|
||||
|
||||
state = state.updateAccount({
|
||||
profileKey: phone.profileKey.serialize(),
|
||||
e164: phone.device.number,
|
||||
givenName: phone.profileName,
|
||||
readReceipts: true,
|
||||
});
|
||||
|
||||
state = state.addContact(
|
||||
contact,
|
||||
{
|
||||
whitelisted: true,
|
||||
serviceE164: contact.device.number,
|
||||
identityKey: contact.getPublicKey(UUIDKind.PNI).serialize(),
|
||||
pni: contact.device.getUUIDByKind(UUIDKind.PNI),
|
||||
givenName: 'Jamie',
|
||||
},
|
||||
UUIDKind.PNI
|
||||
);
|
||||
|
||||
// Just to make PNI Contact visible in the left pane
|
||||
state = state.pin(contact, UUIDKind.PNI);
|
||||
|
||||
const ourKey = await desktop.popSingleUseKey();
|
||||
await contact.addSingleUseKey(desktop, ourKey);
|
||||
|
||||
await phone.setStorageState(state);
|
||||
});
|
||||
|
||||
afterEach(async function after() {
|
||||
if (this.currentTest?.state !== 'passed') {
|
||||
await bootstrap.saveLogs(app);
|
||||
}
|
||||
|
||||
await app.close();
|
||||
await bootstrap.teardown();
|
||||
});
|
||||
|
||||
it('should wait for the challenge to be handled', async () => {
|
||||
const { server, desktop } = bootstrap;
|
||||
|
||||
debug(
|
||||
`Rate limiting (desktop: ${desktop.uuid}) -> (contact: ${contact.device.uuid})`
|
||||
);
|
||||
server.rateLimit({ source: desktop.uuid, target: contact.device.uuid });
|
||||
|
||||
const timestamp = bootstrap.getTimestamp();
|
||||
|
||||
debug('Sending a message from contact');
|
||||
await contact.sendText(desktop, 'Hello there!', {
|
||||
timestamp,
|
||||
});
|
||||
|
||||
const window = await app.getWindow();
|
||||
const leftPane = window.locator('.left-pane-wrapper');
|
||||
const conversationStack = window.locator('.conversation-stack');
|
||||
|
||||
debug(`Opening conversation with contact (${contact.toContact().uuid})`);
|
||||
await leftPane
|
||||
.locator(`[data-testid="${contact.toContact().uuid}"]`)
|
||||
.click();
|
||||
|
||||
debug('Accept conversation from contact');
|
||||
await conversationStack
|
||||
.locator('.module-message-request-actions button >> "Accept"')
|
||||
.click();
|
||||
|
||||
debug('Waiting for challenge');
|
||||
const request = await app.waitForChallenge();
|
||||
|
||||
debug('Solving challenge');
|
||||
await app.solveChallenge({
|
||||
seq: request.seq,
|
||||
data: { captcha: 'anything' },
|
||||
});
|
||||
|
||||
const requests = server.stopRateLimiting({
|
||||
source: desktop.uuid,
|
||||
target: contact.device.uuid,
|
||||
});
|
||||
|
||||
debug(`rate limited requests: ${requests}`);
|
||||
assert.strictEqual(requests, 1);
|
||||
|
||||
debug('Waiting for receipts');
|
||||
const receipts = await app.waitForReceipts();
|
||||
|
||||
assert.strictEqual(receipts.type, ReceiptType.Read);
|
||||
assert.strictEqual(receipts.timestamps.length, 1);
|
||||
assert.strictEqual(receipts.timestamps[0], timestamp);
|
||||
});
|
||||
});
|
Loading…
Add table
Add a link
Reference in a new issue