fix(backend): IDOR in POST /notifications/:id/read (Modul 26)
markRead() pruefte bisher nicht, ob die Benachrichtigung dem anfragenden Nutzer gehoert - jeder authentifizierte Nutzer konnte fremde Benachrichtigungen als gelesen markieren. Jetzt: 403 bei fremder Benachrichtigung, weiterhin erlaubt fuer eigene und Broadcast-Benachrichtigungen (userId = null). E2E-Regressionstest ergaenzt.
This commit is contained in:
1 parent
a57cde1f9a
commit
75f0d4fd51
4 files changed
+64
-11
No files matched your search
@@ -22,7 +22,7 @@ export class NotificationsController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Post(':id/read')
|
@Post(':id/read')
|
||||||
markRead(@Param('id') id: string) {
|
markRead(@Param('id') id: string, @CurrentUser() actor: AuthenticatedUser) {
|
||||||
return this.notificationsService.markRead(id);
|
return this.notificationsService.markRead(id, actor.id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { NotFoundException } from '@nestjs/common';
|
import { ForbiddenException, NotFoundException } from '@nestjs/common';
|
||||||
import { NotificationsService } from './notifications.service';
|
import { NotificationsService } from './notifications.service';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
|
||||||
@@ -55,19 +55,44 @@ describe('NotificationsService', () => {
|
|||||||
|
|
||||||
it('throws NotFoundException when marking an unknown notification as read', async () => {
|
it('throws NotFoundException when marking an unknown notification as read', async () => {
|
||||||
prisma.notification.findUnique.mockResolvedValueOnce(null);
|
prisma.notification.findUnique.mockResolvedValueOnce(null);
|
||||||
await expect(service.markRead('missing')).rejects.toBeInstanceOf(
|
await expect(service.markRead('missing', 'user-1')).rejects.toBeInstanceOf(
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('marks a notification as read', async () => {
|
it("throws ForbiddenException when marking another user's notification as read", async () => {
|
||||||
prisma.notification.findUnique.mockResolvedValueOnce({
|
prisma.notification.findUnique.mockResolvedValueOnce({
|
||||||
id: 'n1',
|
id: 'n1',
|
||||||
|
userId: 'owner',
|
||||||
|
read: false,
|
||||||
|
});
|
||||||
|
await expect(service.markRead('n1', 'someone-else')).rejects.toBeInstanceOf(
|
||||||
|
ForbiddenException,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('marks a broadcast notification (no owner) as read for any user', async () => {
|
||||||
|
prisma.notification.findUnique.mockResolvedValueOnce({
|
||||||
|
id: 'n1',
|
||||||
|
userId: null,
|
||||||
read: false,
|
read: false,
|
||||||
});
|
});
|
||||||
prisma.notification.update.mockResolvedValueOnce({ id: 'n1', read: true });
|
prisma.notification.update.mockResolvedValueOnce({ id: 'n1', read: true });
|
||||||
|
|
||||||
const result = await service.markRead('n1');
|
const result = await service.markRead('n1', 'any-user');
|
||||||
|
|
||||||
|
expect(result.read).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("marks the owner's own notification as read", async () => {
|
||||||
|
prisma.notification.findUnique.mockResolvedValueOnce({
|
||||||
|
id: 'n1',
|
||||||
|
userId: 'user-1',
|
||||||
|
read: false,
|
||||||
|
});
|
||||||
|
prisma.notification.update.mockResolvedValueOnce({ id: 'n1', read: true });
|
||||||
|
|
||||||
|
const result = await service.markRead('n1', 'user-1');
|
||||||
|
|
||||||
expect(result.read).toBe(true);
|
expect(result.read).toBe(true);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
import { Injectable, NotFoundException } from '@nestjs/common';
|
import {
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { Notification, NotificationPriority } from '../../generated/prisma';
|
import { Notification, NotificationPriority } from '../../generated/prisma';
|
||||||
|
|
||||||
@@ -36,13 +40,16 @@ export class NotificationsService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async markRead(id: string): Promise<Notification> {
|
async markRead(id: string, actingUserId: string): Promise<Notification> {
|
||||||
const notification = await this.prisma.notification.findUnique({
|
const notification = await this.prisma.notification.findUnique({
|
||||||
where: { id },
|
where: { id },
|
||||||
});
|
});
|
||||||
if (!notification) {
|
if (!notification) {
|
||||||
throw new NotFoundException('Notification not found');
|
throw new NotFoundException('Notification not found');
|
||||||
}
|
}
|
||||||
|
if (notification.userId !== null && notification.userId !== actingUserId) {
|
||||||
|
throw new ForbiddenException("Cannot modify another user's notification");
|
||||||
|
}
|
||||||
return this.prisma.notification.update({
|
return this.prisma.notification.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { read: true },
|
data: { read: true },
|
||||||
|
|||||||
@@ -17,8 +17,11 @@ describe('Notifications (e2e)', () => {
|
|||||||
let prisma: PrismaService;
|
let prisma: PrismaService;
|
||||||
const beekeeperEmail = `notifications-e2e-beekeeper-${Date.now()}@example.com`;
|
const beekeeperEmail = `notifications-e2e-beekeeper-${Date.now()}@example.com`;
|
||||||
const password = 'SuperSecret123!';
|
const password = 'SuperSecret123!';
|
||||||
|
const staffEmail = `notifications-e2e-staff-${Date.now()}@example.com`;
|
||||||
let beekeeperId: string;
|
let beekeeperId: string;
|
||||||
|
let staffId: string;
|
||||||
let beekeeperToken: string;
|
let beekeeperToken: string;
|
||||||
|
let staffToken: string;
|
||||||
let notificationId: string;
|
let notificationId: string;
|
||||||
|
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
@@ -35,7 +38,12 @@ describe('Notifications (e2e)', () => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
beekeeperId = beekeeper.id;
|
beekeeperId = beekeeper.id;
|
||||||
|
const staff = await prisma.user.create({
|
||||||
|
data: { email: staffEmail, passwordHash, name: 'Staff', role: 'STAFF' },
|
||||||
|
});
|
||||||
|
staffId = staff.id;
|
||||||
beekeeperToken = (await login(app, beekeeperEmail, password)).accessToken;
|
beekeeperToken = (await login(app, beekeeperEmail, password)).accessToken;
|
||||||
|
staffToken = (await login(app, staffEmail, password)).accessToken;
|
||||||
|
|
||||||
const notification = await prisma.notification.create({
|
const notification = await prisma.notification.create({
|
||||||
data: {
|
data: {
|
||||||
@@ -49,9 +57,15 @@ describe('Notifications (e2e)', () => {
|
|||||||
|
|
||||||
afterAll(async () => {
|
afterAll(async () => {
|
||||||
await prisma.notification.deleteMany({ where: { id: notificationId } });
|
await prisma.notification.deleteMany({ where: { id: notificationId } });
|
||||||
await prisma.refreshToken.deleteMany({ where: { userId: beekeeperId } });
|
await prisma.refreshToken.deleteMany({
|
||||||
await prisma.auditLog.deleteMany({ where: { userId: beekeeperId } });
|
where: { userId: { in: [beekeeperId, staffId] } },
|
||||||
await prisma.user.deleteMany({ where: { id: beekeeperId } });
|
});
|
||||||
|
await prisma.auditLog.deleteMany({
|
||||||
|
where: { userId: { in: [beekeeperId, staffId] } },
|
||||||
|
});
|
||||||
|
await prisma.user.deleteMany({
|
||||||
|
where: { id: { in: [beekeeperId, staffId] } },
|
||||||
|
});
|
||||||
await app.close();
|
await app.close();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -70,6 +84,13 @@ describe('Notifications (e2e)', () => {
|
|||||||
).toBe(true);
|
).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("rejects marking another user's notification as read", () => {
|
||||||
|
return request(app.getHttpServer())
|
||||||
|
.post(`/api/v1/notifications/${notificationId}/read`)
|
||||||
|
.set('Authorization', `Bearer ${staffToken}`)
|
||||||
|
.expect(403);
|
||||||
|
});
|
||||||
|
|
||||||
it('marks a notification as read', async () => {
|
it('marks a notification as read', async () => {
|
||||||
const response = await request(app.getHttpServer())
|
const response = await request(app.getHttpServer())
|
||||||
.post(`/api/v1/notifications/${notificationId}/read`)
|
.post(`/api/v1/notifications/${notificationId}/read`)
|
||||||
|
|||||||
Reference in new issue
Block a user