Fix security issues: path traversal, typed errors, file validation
- Fix path traversal in file serve endpoint (validate company prefix, block ..) - Add typed error classes: ValidationError, NotFoundError, ForbiddenError, ConflictError, StorageError - Global error handler catches AppError subclasses with correct status codes - 4xx logged as warn, 5xx as error with request ID - File upload validates entityType whitelist, UUID format, category pattern - Remove fragile string-matching error handling from routes - Services throw typed errors instead of plain Error - Health endpoint documented as intentionally public
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
import type { FastifyPluginAsync } from 'fastify'
|
||||
import multipart from '@fastify/multipart'
|
||||
import { FileService } from '../../services/file.service.js'
|
||||
import { ValidationError } from '../../lib/errors.js'
|
||||
|
||||
export const fileRoutes: FastifyPluginAsync = async (app) => {
|
||||
await app.register(multipart, {
|
||||
limits: {
|
||||
fileSize: 25 * 1024 * 1024, // 25 MB max
|
||||
fileSize: 25 * 1024 * 1024,
|
||||
files: 1,
|
||||
},
|
||||
})
|
||||
@@ -14,11 +15,10 @@ export const fileRoutes: FastifyPluginAsync = async (app) => {
|
||||
app.get('/files', { preHandler: [app.authenticate] }, async (request, reply) => {
|
||||
const { entityType, entityId } = request.query as { entityType?: string; entityId?: string }
|
||||
if (!entityType || !entityId) {
|
||||
return reply.status(400).send({
|
||||
error: { message: 'entityType and entityId query params required', statusCode: 400 },
|
||||
})
|
||||
throw new ValidationError('entityType and entityId query params required')
|
||||
}
|
||||
|
||||
// Files are company-scoped in the service — companyId from JWT ensures access control
|
||||
const fileRecords = await FileService.listByEntity(app.db, request.companyId, entityType, entityId)
|
||||
const data = await Promise.all(
|
||||
fileRecords.map(async (f) => ({ ...f, url: await app.storage.getUrl(f.path) })),
|
||||
@@ -30,7 +30,7 @@ export const fileRoutes: FastifyPluginAsync = async (app) => {
|
||||
app.post('/files', { preHandler: [app.authenticate] }, async (request, reply) => {
|
||||
const data = await request.file()
|
||||
if (!data) {
|
||||
return reply.status(400).send({ error: { message: 'No file provided', statusCode: 400 } })
|
||||
throw new ValidationError('No file provided')
|
||||
}
|
||||
|
||||
const entityType = (data.fields.entityType as { value?: string })?.value
|
||||
@@ -38,38 +38,54 @@ export const fileRoutes: FastifyPluginAsync = async (app) => {
|
||||
const category = (data.fields.category as { value?: string })?.value
|
||||
|
||||
if (!entityType || !entityId || !category) {
|
||||
return reply.status(400).send({
|
||||
error: { message: 'entityType, entityId, and category are required', statusCode: 400 },
|
||||
})
|
||||
throw new ValidationError('entityType, entityId, and category are required')
|
||||
}
|
||||
|
||||
// Validate entityType is a known type
|
||||
const allowedEntityTypes = ['member', 'member_identifier', 'product', 'rental_agreement', 'repair_ticket']
|
||||
if (!allowedEntityTypes.includes(entityType)) {
|
||||
throw new ValidationError(`Invalid entityType: ${entityType}`)
|
||||
}
|
||||
|
||||
// Validate entityId format (UUID)
|
||||
if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(entityId)) {
|
||||
throw new ValidationError('entityId must be a valid UUID')
|
||||
}
|
||||
|
||||
// Validate category (alphanumeric + underscore only)
|
||||
if (!/^[a-z0-9_]+$/.test(category)) {
|
||||
throw new ValidationError('category must be lowercase alphanumeric with underscores')
|
||||
}
|
||||
|
||||
const buffer = await data.toBuffer()
|
||||
|
||||
try {
|
||||
const file = await FileService.upload(app.db, app.storage, request.companyId, {
|
||||
data: buffer,
|
||||
filename: data.filename,
|
||||
contentType: data.mimetype,
|
||||
entityType,
|
||||
entityId,
|
||||
category,
|
||||
uploadedBy: request.user.id,
|
||||
})
|
||||
const url = await app.storage.getUrl(file.path)
|
||||
return reply.status(201).send({ ...file, url })
|
||||
} catch (err) {
|
||||
if (err instanceof Error && (err.message.includes('not allowed') || err.message.includes('too large') || err.message.includes('Maximum'))) {
|
||||
return reply.status(400).send({ error: { message: err.message, statusCode: 400 } })
|
||||
}
|
||||
throw err
|
||||
}
|
||||
const file = await FileService.upload(app.db, app.storage, request.companyId, {
|
||||
data: buffer,
|
||||
filename: data.filename,
|
||||
contentType: data.mimetype,
|
||||
entityType,
|
||||
entityId,
|
||||
category,
|
||||
uploadedBy: request.user.id,
|
||||
})
|
||||
|
||||
request.log.info({ fileId: file.id, entityType, entityId, category, sizeBytes: file.sizeBytes }, 'File uploaded')
|
||||
|
||||
const url = await app.storage.getUrl(file.path)
|
||||
return reply.status(201).send({ ...file, url })
|
||||
})
|
||||
|
||||
// Serve file content (for local provider)
|
||||
// Path traversal protection: validate the path starts with the requesting company's ID
|
||||
app.get('/files/serve/*', { preHandler: [app.authenticate] }, async (request, reply) => {
|
||||
const filePath = (request.params as { '*': string })['*']
|
||||
if (!filePath) {
|
||||
return reply.status(400).send({ error: { message: 'Path required', statusCode: 400 } })
|
||||
throw new ValidationError('Path required')
|
||||
}
|
||||
|
||||
// Path traversal protection: must start with company ID, no '..' allowed
|
||||
if (filePath.includes('..') || !filePath.startsWith(request.companyId)) {
|
||||
return reply.status(403).send({ error: { message: 'Access denied', statusCode: 403 } })
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -101,6 +117,7 @@ export const fileRoutes: FastifyPluginAsync = async (app) => {
|
||||
const { id } = request.params as { id: string }
|
||||
const file = await FileService.delete(app.db, app.storage, request.companyId, id)
|
||||
if (!file) return reply.status(404).send({ error: { message: 'File not found', statusCode: 404 } })
|
||||
request.log.info({ fileId: id, path: file.path }, 'File deleted')
|
||||
return reply.send(file)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user