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
11 changes: 10 additions & 1 deletion packages/backend/src/routes/levels.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import type { Express, Response } from 'express'
import { requireAuth, type AuthenticatedRequest } from '../middleware/auth'
import { validateBody, validateParams } from '../middleware/validate'
import {
validateBody,
validateParams,
validateQuery,
} from '../middleware/validate'
import { writeLimiter } from '../middleware/rateLimit'
import { asyncHandler } from '../middleware/asyncHandler'
import { AppError } from '../errors/AppError'
Expand All @@ -15,6 +19,10 @@ function p(val: string | string[]): string {
return typeof val === 'string' ? val : val[0]
}

const leaderboardQuery = z.object({
limit: z.coerce.number().int().min(1).max(50).optional(),
})

const rankParams = guildIdParam.merge(commonUserIdParam)
const levelParam = guildIdParam.extend({
level: z.coerce.number().int().min(1),
Expand Down Expand Up @@ -62,6 +70,7 @@ export function setupLevelsRoutes(app: Express): void {
'/api/guilds/:guildId/levels/leaderboard',
requireAuth,
validateParams(guildIdParam),
validateQuery(leaderboardQuery),
asyncHandler(async (req: AuthenticatedRequest, res: Response) => {
const guildId = p(req.params.guildId)
const limit = Number(req.query.limit) || 10
Expand Down
11 changes: 10 additions & 1 deletion packages/backend/src/routes/starboard.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import type { Express, Response } from 'express'
import { requireAuth, type AuthenticatedRequest } from '../middleware/auth'
import { validateBody, validateParams } from '../middleware/validate'
import {
validateBody,
validateParams,
validateQuery,
} from '../middleware/validate'
import { writeLimiter } from '../middleware/rateLimit'
import { asyncHandler } from '../middleware/asyncHandler'
import { AppError } from '../errors/AppError'
Expand All @@ -19,6 +23,10 @@ const upsertConfigBody = z.object({
selfStar: z.boolean().optional(),
})

const entriesQuery = z.object({
limit: z.coerce.number().int().min(1).max(50).optional(),
})

export function setupStarboardRoutes(app: Express): void {
app.get(
'/api/guilds/:guildId/starboard/config',
Expand Down Expand Up @@ -77,6 +85,7 @@ export function setupStarboardRoutes(app: Express): void {
'/api/guilds/:guildId/starboard/entries',
requireAuth,
validateParams(guildIdParam),
validateQuery(entriesQuery),
asyncHandler(async (req: AuthenticatedRequest, res: Response) => {
const guildId = p(req.params.guildId)
const limit = Number(req.query.limit) || 10
Expand Down
44 changes: 44 additions & 0 deletions packages/backend/tests/unit/routes/snowflakeValidation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,50 @@ describe('Guild ID Snowflake Validation', () => {
)
})

describe('Pagination limit bounds (#1183)', () => {
const validGuildId = '123456789012345678'

test.each([
['9999', 400],
['0', 400],
['-5', 400],
['abc', 400],
['25', 200],
])(
'GET levels/leaderboard with limit=%s returns %s-class',
async (limit, expected) => {
const app = createApp(setupLevelsRoutes)
const res = await request(app).get(
`/api/guilds/${validGuildId}/levels/leaderboard?limit=${limit}`,
)
if (expected === 400) {
expect(res.status).toBe(400)
} else {
expect(res.status).not.toBe(400)
}
},
)

test.each([
['9999', 400],
['0', 400],
['25', 200],
])(
'GET starboard/entries with limit=%s returns %s-class',
async (limit, expected) => {
const app = createApp(setupStarboardRoutes)
const res = await request(app).get(
`/api/guilds/${validGuildId}/starboard/entries?limit=${limit}`,
)
if (expected === 400) {
expect(res.status).toBe(400)
} else {
expect(res.status).not.toBe(400)
}
},
)
})

describe('Music Routes (#1200)', () => {
const validGuildId = '123456789012345678'
const invalidGuildId = 'not-a-snowflake'
Expand Down
Loading