Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(common): cap a list offset at the largest safe integer

Yudhi Armyndharis8426cdadd422
diff --git a/src/common/utils/paginate.spec.ts b/src/common/utils/paginate.spec.ts
index fa2000978..38cac4777 100644
--- a/src/common/utils/paginate.spec.ts
+++ b/src/common/utils/paginate.spec.ts
@@ -43,6 +43,12 @@ describe('resolveListWindow', () => {
expect(resolveListWindow(50, 10)).toEqual({ limit: 50, offset: 10 });
});
+ it('caps an offset past the largest safe integer, which a driver would refuse as an OFFSET', () => {
+ expect(resolveListWindow(10, 2 ** 63)).toEqual({ limit: 10, offset: Number.MAX_SAFE_INTEGER });
+ expect(resolveListWindow(10, 1e21)).toEqual({ limit: 10, offset: Number.MAX_SAFE_INTEGER });
+ expect(resolveListWindow(10, Number.MAX_SAFE_INTEGER)).toEqual({ limit: 10, offset: Number.MAX_SAFE_INTEGER });
+ });
+
it('truncates fractional limit/offset toward zero', () => {
expect(resolveListWindow(10.9, 4.7)).toEqual({ limit: 10, offset: 4 });
});
diff --git a/src/common/utils/paginate.ts b/src/common/utils/paginate.ts
index f38b77f37..4f3de6c8e 100644
--- a/src/common/utils/paginate.ts
+++ b/src/common/utils/paginate.ts
@@ -9,7 +9,12 @@ export interface ListOptions {
/** Normalize a query/list window for both in-memory slicing and database skip/take. */
export function resolveListWindow(limit?: number, offset?: number): { limit: number; offset: number } {
- const normalizedOffset = typeof offset === 'number' && Number.isFinite(offset) ? Math.max(Math.trunc(offset), 0) : 0;
+ // Capped at the largest safe integer: a driver refuses an OFFSET of 2^63 or more, and any offset that
+ // large is past the last row anyway.
+ const normalizedOffset =
+ typeof offset === 'number' && Number.isFinite(offset)
+ ? Math.min(Math.max(Math.trunc(offset), 0), Number.MAX_SAFE_INTEGER)
+ : 0;
const normalizedLimit =
typeof limit === 'number' && Number.isFinite(limit)
? Math.min(Math.max(Math.trunc(limit), 1), DEFAULT_LIST_LIMIT)
diff --git a/src/modules/message/message.service.spec.ts b/src/modules/message/message.service.spec.ts
index b74923246..9b1f1139d 100644
--- a/src/modules/message/message.service.spec.ts
+++ b/src/modules/message/message.service.spec.ts
@@ -219,6 +219,13 @@ describe('MessageService', () => {
expect(qb.take).toHaveBeenCalledWith(100);
expect(qb.skip).toHaveBeenCalledWith(0);
});
+
+ it('caps an offset past the largest safe integer, which a driver would refuse as an OFFSET', async () => {
+ const qb = makeQb();
+ (repository.createQueryBuilder as jest.Mock).mockReturnValue(qb);
+ await service.getMessages('sess-1', { offset: 2 ** 63 });
+ expect(qb.skip).toHaveBeenCalledWith(Number.MAX_SAFE_INTEGER);
+ });
});
// ── getMessages keyset cursor ─────────────────────────────────────
diff --git a/src/modules/message/message.service.ts b/src/modules/message/message.service.ts
index 3762bb81c..1cc4f35f4 100644
--- a/src/modules/message/message.service.ts
+++ b/src/modules/message/message.service.ts
@@ -313,7 +313,12 @@ export class MessageService implements PluginMessagePort {
const rawOffset = options.offset;
const limit =
typeof rawLimit === 'number' && Number.isFinite(rawLimit) ? Math.min(Math.max(Math.trunc(rawLimit), 1), 100) : 50;
- const offset = typeof rawOffset === 'number' && Number.isFinite(rawOffset) ? Math.max(Math.trunc(rawOffset), 0) : 0;
+ // Capped at the largest safe integer: a driver refuses an OFFSET of 2^63 or more, and any offset that
+ // large is past the last row anyway.
+ const offset =
+ typeof rawOffset === 'number' && Number.isFinite(rawOffset)
+ ? Math.min(Math.max(Math.trunc(rawOffset), 0), Number.MAX_SAFE_INTEGER)
+ : 0;
const tiebreak = messageTimeOrder ? 'id' : this.orderTiebreak;
// Match across dialects: a stored chatId may be `@s.whatsapp.net` (e.g. an outbound send addressed