diff --git a/backend/__tests__/errorHandler.test.js b/backend/__tests__/errorHandler.test.js new file mode 100644 index 0000000..d8b0b28 --- /dev/null +++ b/backend/__tests__/errorHandler.test.js @@ -0,0 +1,53 @@ +const { test } = require('node:test'); +const assert = require('node:assert/strict'); +const express = require('express'); +const request = require('supertest'); +const errorHandler = require('../middleware/errorHandler'); + +function loadMinimalServer(t) { + const priorMinimal = process.env.MINIMAL_SERVER; + process.env.MINIMAL_SERVER = 'true'; + t.after(() => { + if (priorMinimal === undefined) delete process.env.MINIMAL_SERVER; else process.env.MINIMAL_SERVER = priorMinimal; + }); + return require('../server').app; +} + +test('a refused CORS origin gets a JSON 403, not an error page', async (t) => { + const app = loadMinimalServer(t); + const response = await request(app).get('/health').set('Origin', 'https://elsewhere.example'); + assert.equal(response.status, 403); + assert.match(response.headers['content-type'], /application\/json/); + assert.deepEqual(response.body, { error: 'CORS not allowed for this origin' }); +}); + +test('a malformed JSON body gets a JSON 400 without a stack trace', async (t) => { + const app = loadMinimalServer(t); + const response = await request(app).post('/health') + .set('Content-Type', 'application/json').send('{"broken":'); + assert.equal(response.status, 400); + assert.match(response.headers['content-type'], /application\/json/); + assert.deepEqual(Object.keys(response.body), ['error']); + assert.doesNotMatch(response.text, /\bat \S+ \(|node_modules|[\\/]backend[\\/]/); +}); + +test('an unexpected error gets a generic JSON 500', async (t) => { + const originalError = console.error; + console.error = () => {}; + t.after(() => { console.error = originalError; }); + const app = express(); + app.get('/boom', () => { throw new Error('secret detail at /srv/app/backend/x.js'); }); + app.use(errorHandler); + const response = await request(app).get('/boom'); + assert.equal(response.status, 500); + assert.deepEqual(response.body, { error: 'Internal Server Error' }); +}); + +test('a client error that is not marked safe to show keeps only its status text', async () => { + const app = express(); + app.get('/teapot', (_req, _res, next) => next(Object.assign(new Error('internal reason'), { status: 418 }))); + app.use(errorHandler); + const response = await request(app).get('/teapot'); + assert.equal(response.status, 418); + assert.deepEqual(response.body, { error: "I'm a Teapot" }); +}); diff --git a/backend/middleware/errorHandler.js b/backend/middleware/errorHandler.js new file mode 100644 index 0000000..f320bda --- /dev/null +++ b/backend/middleware/errorHandler.js @@ -0,0 +1,10 @@ +const { STATUS_CODES } = require('http'); + +// Last-resort error handler: always JSON, never a stack trace or file path, +// whatever NODE_ENV is. Register it after every route. +module.exports = (err, req, res, next) => { + if (res.headersSent) return next(err); + const status = Number.isInteger(err.status) && err.status >= 400 && err.status < 600 ? err.status : 500; + if (status >= 500) console.error(err); + res.status(status).json({ error: status < 500 && err.expose ? err.message : STATUS_CODES[status] }); +}; diff --git a/backend/server.js b/backend/server.js index 9c1aecc..d014b6e 100644 --- a/backend/server.js +++ b/backend/server.js @@ -6,11 +6,12 @@ let dotenv; try { dotenv = require('dotenv'); } catch { dotenv = { config: () => {} }; } dotenv.config(); const authMiddleware = require('./middleware/authMiddleware'); +const errorHandler = require('./middleware/errorHandler'); const { apiRateLimit, streamRateLimit, locationRateLimit } = require('./middleware/rateLimit'); const minimal = process.env.MINIMAL_SERVER === 'true'; const app = express(); const allowedOrigins = (process.env.CORS_ALLOWED_ORIGINS || 'https://www.ntari.org').split(',').map(origin => origin.trim()).filter(Boolean); -app.use(cors({ origin(origin, callback) { if (!origin || allowedOrigins.includes(origin)) return callback(null, true); return callback(new Error('CORS not allowed for this origin')); }, credentials: true, methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], allowedHeaders: ['Content-Type', 'Authorization', 'Idempotency-Key', 'X-API-Key', 'X-Federation-Node-Id', 'X-Federation-Timestamp', 'X-Federation-Signature'] })); +app.use(cors({ origin(origin, callback) { if (!origin || allowedOrigins.includes(origin)) return callback(null, true); const err = new Error('CORS not allowed for this origin'); err.status = 403; err.expose = true; return callback(err); }, credentials: true, methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], allowedHeaders: ['Content-Type', 'Authorization', 'Idempotency-Key', 'X-API-Key', 'X-Federation-Node-Id', 'X-Federation-Timestamp', 'X-Federation-Signature'] })); app.use(express.json({ verify(req, _res, buffer) { req.rawBody = Buffer.from(buffer); } })); const tryMount = (route, modPath) => { try { app.use(route, require(modPath)); } catch (err) { console.warn('Skipping ' + modPath + ': ' + err.message); } }; if (!minimal) tryMount('/deposit', './routes/depositRoutes'); @@ -39,6 +40,8 @@ if (!minimal) { [['/', './routes/api'], ['/api/keys', './routes/keyRoutes'], ['/api/contracts', './routes/contracts'], ['/api/admin', './routes/admin'], ['/api/marketplace', './marketplace/marketplace_routes'], ['/users', './routes/userRoutes'], ['/products', './routes/products'], ['/broadcast', './routes/broadcastRoutes'], ['/sms', './routes/smsRoutes'], ['/cart', './routes/cartRoutes'], ['/orders', './routes/orderRoutes'], ['/subscriptions', './routes/subscriptionRoutes'], ['/conversations', './routes/conversationRoutes'], ['/messages', './routes/communicationRoutes'], ['/inventory', './routes/inventoryRoutes'], ['/api/location', './routes/locationRoutes'], ['/trends', './trends/trendsRoutes']].forEach(([route, mod]) => tryMount(route, mod)); try { runFederationSync = require('./federation/federationSyncJob'); } catch (err) { console.warn('Federation sync disabled: ' + err.message); } } +// Last-resort JSON error handler, registered after every route. +app.use(errorHandler); const PORT = process.env.PORT || 5000; if (require.main === module) { server.listen(PORT, () => console.log('Server running on port ' + PORT)); if (runFederationSync) runFederationSync(); } module.exports = { app, server };