diff --git a/backend/routes/__tests__/userRoutes.test.js b/backend/routes/__tests__/userRoutes.test.js index 8e0886fc..56188aac 100644 --- a/backend/routes/__tests__/userRoutes.test.js +++ b/backend/routes/__tests__/userRoutes.test.js @@ -1,6 +1,12 @@ const request = require('supertest'); const express = require('express'); const bcrypt = require('bcryptjs'); +const { randomUUID } = require('crypto'); + +jest.mock('crypto', () => ({ + ...jest.requireActual('crypto'), + randomUUID: jest.fn(() => jest.requireActual('crypto').randomUUID()) +})); jest.mock('../../lib/dynamodbClient', () => ({ scan: jest.fn(), @@ -69,7 +75,6 @@ describe('userRoutes', () => { expect(res.status).toBe(201); expect(res.body.user).toMatchObject({ - id: '1', username: 'alice', email: 'a@b.com', role: 'producer', @@ -78,6 +83,8 @@ describe('userRoutes', () => { reputationScore: 0 }); expect(res.body.user.password).toBeUndefined(); + expect(res.body.user.id).toMatch(/^[0-9a-f-]{36}$/); + expect(res.body.user.id).not.toBe('1'); const params = docClient.put.mock.calls[0][0]; const stored = params.Item; @@ -85,6 +92,51 @@ describe('userRoutes', () => { expect(stored.reputationScore).toBe(0); expect(await bcrypt.compare('secret', stored.password)).toBe(true); }); + + it('cannot replace an existing user through a caller-selected id', async () => { + const victim = { id: 'victim', username: 'victim', password: 'original hash' }; + const users = new Map([[victim.id, victim]]); + docClient.put.mockImplementation(({ Item, ConditionExpression }) => ({ + promise: async () => { + if (ConditionExpression === 'attribute_not_exists(id)' && users.has(Item.id)) { + throw Object.assign(new Error('User already exists'), { code: 'ConditionalCheckFailedException' }); + } + users.set(Item.id, Item); + return {}; + } + })); + + const res = await request(app).post('/users').send({ + id: 'victim', username: 'attacker', password: 'replacement' + }); + + expect(res.status).toBe(201); + expect(users.get('victim')).toEqual(victim); + expect(res.body.user.id).not.toBe('victim'); + expect(users.get(res.body.user.id).username).toBe('attacker'); + }); + + it('returns conflict without overwriting an existing generated id', async () => { + const victim = { id: 'collision', username: 'victim', password: 'original hash' }; + const users = new Map([[victim.id, victim]]); + randomUUID.mockReturnValueOnce('collision'); + docClient.put.mockImplementation(({ Item, ConditionExpression }) => ({ + promise: async () => { + if (ConditionExpression === 'attribute_not_exists(id)' && users.has(Item.id)) { + throw Object.assign(new Error('User already exists'), { code: 'ConditionalCheckFailedException' }); + } + users.set(Item.id, Item); + return {}; + } + })); + + const res = await request(app).post('/users').send({ + id: 'collision', username: 'attacker', password: 'replacement' + }); + + expect(res.status).toBe(409); + expect(users.get('collision')).toEqual(victim); + }); }); }); diff --git a/backend/routes/userRoutes.js b/backend/routes/userRoutes.js index 18e12fa7..8ff2628c 100644 --- a/backend/routes/userRoutes.js +++ b/backend/routes/userRoutes.js @@ -1,5 +1,6 @@ const express = require('express'); const bcrypt = require('../utils/bcrypt'); +const { randomUUID } = require('crypto'); const router = express.Router(); const docClient = require('../lib/dynamodbClient'); const { USER_TABLE_NAME, createUserItem } = require('../models/user'); @@ -41,14 +42,22 @@ router.post('/', async (req, res) => { const hashedPassword = await bcrypt.hash(password, 10); const item = createUserItem({ ...rest, + id: randomUUID(), password: hashedPassword, verified: false, reputationScore: 0 }); - await docClient.put({ TableName: USER_TABLE_NAME, Item: item }).promise(); + await docClient.put({ + TableName: USER_TABLE_NAME, + Item: item, + ConditionExpression: 'attribute_not_exists(id)' + }).promise(); const { password: _pwd, ...user } = item; res.status(201).json({ message: 'User created', user }); } catch (err) { + if (err.code === 'ConditionalCheckFailedException') { + return res.status(409).json({ error: 'User already exists' }); + } // Log the error for debugging console.error('Error creating user:', err); // Provide more specific error information if available