Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions app/controllers/inventoryitemcontroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,13 @@ exports.getById = async (req, res) => {
const isMaster = await IsMaster(authKey);
if (!isMaster) {
const companyId = await GetCompanyId(authKey);
// Cross-tenant access is reported as 404, not 403 — otherwise
// a scoped caller can enumerate which InventoryItem ids are
// populated across the whole tenant table by status code.
// Same secure-404 pattern as #174 (company), #188 (billingtype),
// #192 (worker).
if (companyId === -1 || inventoryItem.invitCompId !== companyId) {
return res.status(403).json({ message: "Invalid Authorization Key." });
return res.status(404).json({ message: "Not found." });
}
}
return res.status(200).json({ message: "Found.", inventoryItem });
Expand Down Expand Up @@ -168,8 +173,9 @@ exports.update = async (req, res) => {
const isMaster = await IsMaster(authKey);
if (!isMaster) {
const companyId = await GetCompanyId(authKey);
// Secure-404 on PATCH for the same reason as GET.
if (companyId === -1 || inventoryItem.invitCompId !== companyId) {
return res.status(403).json({ message: "Invalid Authorization Key." });
return res.status(404).json({ message: "Not found." });
}
}

Expand Down Expand Up @@ -211,8 +217,9 @@ exports.remove = async (req, res) => {
const isMaster = await IsMaster(authKey);
if (!isMaster) {
const companyId = await GetCompanyId(authKey);
// Secure-404 on DELETE for the same reason as GET / PATCH.
if (companyId === -1 || inventoryItem.invitCompId !== companyId) {
return res.status(403).json({ message: "Invalid Authorization Key." });
return res.status(404).json({ message: "Not found." });
}
}

Expand Down
84 changes: 84 additions & 0 deletions tests/api/inventoryitem.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,87 @@ describe('InventoryItem body validation', () => {
expect(res.status).toBe(400);
});
});

describe('InventoryItem tenant-enumeration defense (secure 404)', () => {
// Same pattern as worker/billingtype/company secure-404 tests:
// drive the controller directly with stubbed Model + spied auth
// helpers so we don't have to wire every upstream middleware.
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/inventoryitemcontroller.js');
const isMasterSpy = vi.spyOn(auth, 'isMaster').mockResolvedValue(false);
const getCompanyIdSpy = vi.spyOn(auth, 'getCompanyId').mockResolvedValue(7);
try {
const db = require('../../app/config/db.config.js');
db.InventoryItem.findByPk = vi.fn().mockResolvedValue({
invitId: 99, invitCompId: 99, invitArch: false,
});
const req = { get: (h) => (h === 'authKey' ? 'scoped-to-7' : undefined), params: { id: 99 } };
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();
}
});

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/inventoryitemcontroller.js');
const isMasterSpy = vi.spyOn(auth, 'isMaster').mockResolvedValue(false);
const getCompanyIdSpy = vi.spyOn(auth, 'getCompanyId').mockResolvedValue(7);
try {
const db = require('../../app/config/db.config.js');
db.InventoryItem.findByPk = vi.fn().mockResolvedValue({
invitId: 99, invitCompId: 99, invitArch: false, update: vi.fn(),
});
const req = {
get: (h) => (h === 'authKey' ? 'scoped-to-7' : undefined),
params: { id: 99 },
body: { invitDescription: 'X' },
};
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();
}
});

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/inventoryitemcontroller.js');
const isMasterSpy = vi.spyOn(auth, 'isMaster').mockResolvedValue(false);
const getCompanyIdSpy = vi.spyOn(auth, 'getCompanyId').mockResolvedValue(7);
try {
const db = require('../../app/config/db.config.js');
db.InventoryItem.findByPk = vi.fn().mockResolvedValue({
invitId: 99, invitCompId: 99, invitArch: false, update: vi.fn(),
});
const req = { get: (h) => (h === 'authKey' ? 'scoped-to-7' : undefined), params: { id: 99 } };
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();
}
});
});