From c5d65273a95bde4d7f48ead210aaa1ed1b6a331b Mon Sep 17 00:00:00 2001 From: "Aaron K. Clark" Date: Tue, 19 May 2026 05:48:30 -0500 Subject: [PATCH] =?UTF-8?q?fix(productentry):=20return=20404=20(not=20403)?= =?UTF-8?q?=20on=20cross-tenant=20access=20=E2=80=94=20close=20tenant-enum?= =?UTF-8?q?eration=20leak?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same class as the eight prior secure-404 fixes (#174 / #188 / #192 / #196 / #200 / #204 / #210 / #214), applied to the job-cascade- scoped ProductEntry: pentJobId → Job.jobCustId → Customer.custCompId Collapse 403 "exists but not yours" into 404 "Not found." so scoped callers can't enumerate `pentId` populations across the whole tenant table by status code. Pinned in `tests/api/productentry.test.js` with three controller- level unit tests, spying on `auth.getCompanyIdByJobId` (which internally walks the job → customer → company chain). Co-Authored-By: Claude Opus 4.7 (1M context) --- app/controllers/productentrycontroller.js | 13 +++- tests/api/productentry.test.js | 90 +++++++++++++++++++++++ 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/app/controllers/productentrycontroller.js b/app/controllers/productentrycontroller.js index 8fd2ea8..21fbd70 100644 --- a/app/controllers/productentrycontroller.js +++ b/app/controllers/productentrycontroller.js @@ -74,8 +74,13 @@ exports.getById = async (req, res) => { if (!isMaster) { const authCompanyId = await GetCompanyId(authKey); const jobCompanyId = await GetCompanyIdByJobId(productEntry.pentJobId); + // Cross-tenant access is reported as 404, not 403 — otherwise + // a scoped caller can enumerate which ProductEntry ids are + // populated across the whole tenant table by status code. + // Same secure-404 pattern as the prior 8 entities (#174 / #188 + // / #192 / #196 / #200 / #204 / #210 / #214). if (authCompanyId === -1 || jobCompanyId === -1 || authCompanyId !== jobCompanyId) { - return res.status(403).json({ message: "Invalid Authorization Key." }); + return res.status(404).json({ message: "Not found." }); } } return res.status(200).json({ message: "Found.", productEntry }); @@ -149,8 +154,9 @@ exports.update = async (req, res) => { if (!isMaster) { const authCompanyId = await GetCompanyId(authKey); const jobCompanyId = await GetCompanyIdByJobId(productEntry.pentJobId); + // Secure-404 on PATCH for the same reason as GET. if (authCompanyId === -1 || jobCompanyId === -1 || authCompanyId !== jobCompanyId) { - return res.status(403).json({ message: "Invalid Authorization Key." }); + return res.status(404).json({ message: "Not found." }); } } @@ -193,8 +199,9 @@ exports.remove = async (req, res) => { if (!isMaster) { const authCompanyId = await GetCompanyId(authKey); const jobCompanyId = await GetCompanyIdByJobId(productEntry.pentJobId); + // Secure-404 on DELETE for the same reason as GET / PATCH. if (authCompanyId === -1 || jobCompanyId === -1 || authCompanyId !== jobCompanyId) { - return res.status(403).json({ message: "Invalid Authorization Key." }); + return res.status(404).json({ message: "Not found." }); } } diff --git a/tests/api/productentry.test.js b/tests/api/productentry.test.js index c0da4cb..0bbffa2 100644 --- a/tests/api/productentry.test.js +++ b/tests/api/productentry.test.js @@ -57,3 +57,93 @@ describe('ProductEntry body validation', () => { expect(res.status).toBe(400); }); }); + +describe('ProductEntry tenant-enumeration defense (secure 404)', () => { + // Job-cascade-scoped: pentJobId → job.jobCustId → customer.custCompId. + // Spy on getCompanyIdByJobId so the cascade resolves to a different + // company than the caller's (the helper itself walks job→customer). + test('controller getById: existing-but-not-yours returns 404 to non-master', async () => { + const auth = require('../../app/middleware/auth.js'); + const controller = require('../../app/controllers/productentrycontroller.js'); + const isMasterSpy = vi.spyOn(auth, 'isMaster').mockResolvedValue(false); + const getCompanyIdSpy = vi.spyOn(auth, 'getCompanyId').mockResolvedValue(7); + const getCompanyIdByJobIdSpy = vi.spyOn(auth, 'getCompanyIdByJobId').mockResolvedValue(99); + try { + const db = require('../../app/config/db.config.js'); + db.ProductEntry.findByPk = vi.fn().mockResolvedValue({ + pentId: 42, pentJobId: 13, penArch: false, + }); + const req = { get: (h) => (h === 'authKey' ? 'scoped-to-7' : undefined), params: { id: 42 } }; + let captured = null; + const res = { + status(code) { this._code = code; return this; }, + json(body) { captured = { code: this._code, body }; return this; }, + }; + await controller.getById(req, res); + expect(captured.code).toBe(404); + expect(captured.body.message).toMatch(/not found/i); + } finally { + isMasterSpy.mockRestore(); + getCompanyIdSpy.mockRestore(); + getCompanyIdByJobIdSpy.mockRestore(); + } + }); + + test('controller update: existing-but-not-yours returns 404 to non-master', async () => { + const auth = require('../../app/middleware/auth.js'); + const controller = require('../../app/controllers/productentrycontroller.js'); + const isMasterSpy = vi.spyOn(auth, 'isMaster').mockResolvedValue(false); + const getCompanyIdSpy = vi.spyOn(auth, 'getCompanyId').mockResolvedValue(7); + const getCompanyIdByJobIdSpy = vi.spyOn(auth, 'getCompanyIdByJobId').mockResolvedValue(99); + try { + const db = require('../../app/config/db.config.js'); + db.ProductEntry.findByPk = vi.fn().mockResolvedValue({ + pentId: 42, pentJobId: 13, penArch: false, update: vi.fn(), + }); + const req = { + get: (h) => (h === 'authKey' ? 'scoped-to-7' : undefined), + params: { id: 42 }, + body: { pentQty: 5 }, + }; + let captured = null; + const res = { + status(code) { this._code = code; return this; }, + json(body) { captured = { code: this._code, body }; return this; }, + }; + await controller.update(req, res); + expect(captured.code).toBe(404); + expect(captured.body.message).toMatch(/not found/i); + } finally { + isMasterSpy.mockRestore(); + getCompanyIdSpy.mockRestore(); + getCompanyIdByJobIdSpy.mockRestore(); + } + }); + + test('controller remove: existing-but-not-yours returns 404 to non-master', async () => { + const auth = require('../../app/middleware/auth.js'); + const controller = require('../../app/controllers/productentrycontroller.js'); + const isMasterSpy = vi.spyOn(auth, 'isMaster').mockResolvedValue(false); + const getCompanyIdSpy = vi.spyOn(auth, 'getCompanyId').mockResolvedValue(7); + const getCompanyIdByJobIdSpy = vi.spyOn(auth, 'getCompanyIdByJobId').mockResolvedValue(99); + try { + const db = require('../../app/config/db.config.js'); + db.ProductEntry.findByPk = vi.fn().mockResolvedValue({ + pentId: 42, pentJobId: 13, penArch: false, update: vi.fn(), + }); + const req = { get: (h) => (h === 'authKey' ? 'scoped-to-7' : undefined), params: { id: 42 } }; + let captured = null; + const res = { + status(code) { this._code = code; return this; }, + json(body) { captured = { code: this._code, body }; return this; }, + }; + await controller.remove(req, res); + expect(captured.code).toBe(404); + expect(captured.body.message).toMatch(/not found/i); + } finally { + isMasterSpy.mockRestore(); + getCompanyIdSpy.mockRestore(); + getCompanyIdByJobIdSpy.mockRestore(); + } + }); +});