Skip to content

fix(settings): handle malformed disappearing messages JSON #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aiirvizionz wants to merge 1 commit into from
Closed

fix(settings): handle malformed disappearing messages JSON #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/app/api/settings/disappearing-messages/route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,14 @@ export async function PUT(request) {
return NextResponse.json({ error: 'Invalid token' }, { status: 401 });
}

const { default_message_retention_days } = await request.json();
let body;
try {
body = await request.json();
} catch {
return NextResponse.json({ error: 'Invalid JSON body' }, { status: 400 });
}

const { default_message_retention_days } = body;

// Validate input
if (typeof default_message_retention_days !== 'number' || default_message_retention_days < 0) {
Expand Down
13 changes: 13 additions & 0 deletions src/app/api/settings/disappearing-messages/route.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,17 @@ describe('settings disappearing messages authentication', () => {
expect(mocks.authGetUser).toHaveBeenCalledWith('valid-token');
expect(mocks.updateEq).toHaveBeenCalledWith('auth_user_id', 'auth-user-id');
});

it('returns 400 for malformed PUT JSON instead of a generic 500', async () => {
const { PUT } = await import('./route.js');
const response = await PUT({
headers: new Headers({ authorization: 'Bearer valid-token' }),
json: vi.fn().mockRejectedValue(new SyntaxError('Unexpected token'))
});
const body = await response.json();

expect(response.status).toBe(400);
expect(body.error).toBe('Invalid JSON body');
expect(mocks.from).not.toHaveBeenCalled();
});
});
Loading