mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup normalizeGroupCallTimestamp non-number handling

Browse source
This commit is contained in:
ayumi-signal 2024-07-23 08:43:44 -07:00 committed by GitHub
parent 168397d8ef
commit c70a8955f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
ts/test-node/util/ringrtc/normalizeGroupCallTimestamp_test.ts
View file

@ -6,53 +6,13 @@ import { assert } from 'chai';
import { normalizeGroupCallTimestamp } from '../../../util/ringrtc/normalizeGroupCallTimestamp';
describe('normalizeGroupCallTimestamp', () => {
it('returns undefined if passed NaN', () => {
assert.isUndefined(normalizeGroupCallTimestamp(NaN));
});
it('returns undefined if passed 0', () => {
assert.isUndefined(normalizeGroupCallTimestamp(0));
assert.isUndefined(normalizeGroupCallTimestamp(-0));
});
it('returns undefined if passed a negative number', () => {
assert.isUndefined(normalizeGroupCallTimestamp(-1));
assert.isUndefined(normalizeGroupCallTimestamp(-123));
});
it('returns undefined if passed a string that cannot be parsed as a number', () => {
assert.isUndefined(normalizeGroupCallTimestamp(''));
assert.isUndefined(normalizeGroupCallTimestamp('uhhh'));
});
it('returns undefined if passed a BigInt of 0', () => {
assert.isUndefined(normalizeGroupCallTimestamp(BigInt(0)));
});
it('returns undefined if passed a negative BigInt', () => {
assert.isUndefined(normalizeGroupCallTimestamp(BigInt(-1)));
assert.isUndefined(normalizeGroupCallTimestamp(BigInt(-123)));
});
it('returns undefined if passed a non-parseable type', () => {
[
undefined,
null,
{},
[],
[123],
Symbol('123'),
{ [Symbol.toPrimitive]: () => 123 },
// eslint-disable-next-line no-new-wrappers
new Number(123),
].forEach(value => {
assert.isUndefined(normalizeGroupCallTimestamp(value));
});
});
it('returns positive numbers passed in', () => {
assert.strictEqual(normalizeGroupCallTimestamp(1), 1);
assert.strictEqual(normalizeGroupCallTimestamp(123), 123);
it('returns undefined if passed 0', () => {
assert.isUndefined(normalizeGroupCallTimestamp('0'));
});
it('parses strings as numbers', () => {
@ -66,9 +26,4 @@ describe('normalizeGroupCallTimestamp', () => {
123456789012345
);
});
it('converts positive BigInts to numbers', () => {
assert.strictEqual(normalizeGroupCallTimestamp(BigInt(1)), 1);
assert.strictEqual(normalizeGroupCallTimestamp(BigInt(123)), 123);
});
});

25
ts/util/ringrtc/normalizeGroupCallTimestamp.ts
View file

@ -2,31 +2,12 @@
// SPDX-License-Identifier: AGPL-3.0-only
/**
* Normalizes group call timestamps (`addedTime` and `speakerTime`) into numbers. We
* expect RingRTC to send a string, but it sends a malformed number as of this writing,
* RingRTC 2.8.3.
*
* We could probably safely do `Number(fromRingRtc)` and be done, but this is extra-
* careful.
* Normalizes RingRTC group call timestamps (`addedTime` and `speakerTime`) into numbers.
*/
export function normalizeGroupCallTimestamp(
fromRingRtc: unknown
fromRingRtc: string
): undefined | number {
let asNumber: number;
switch (typeof fromRingRtc) {
case 'number':
asNumber = fromRingRtc;
break;
case 'string':
asNumber = parseInt(fromRingRtc.slice(0, 15), 10);
break;
case 'bigint':
asNumber = Number(fromRingRtc);
break;
default:
return undefined;
}
const asNumber = parseInt(fromRingRtc.slice(0, 15), 10);
if (Number.isNaN(asNumber) || asNumber <= 0) {
return undefined;