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
6 changes: 4 additions & 2 deletions src/compartilhado/utilitarios/criptografia.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { scrypt, randomBytes } from 'crypto'
import { scrypt, randomBytes, timingSafeEqual } from 'crypto'
import { promisify } from 'util'

const scryptAsync = promisify(scrypt)
Expand All @@ -13,5 +13,7 @@ export async function verificarSenha(senha: string, hash: string): Promise<boole
const [sal, hashArmazenado] = hash.split(':')
if (!sal || !hashArmazenado) return false
const derivado = (await scryptAsync(senha, sal, 64)) as Buffer
return derivado.toString('hex') === hashArmazenado
const hashArmazenadoBuffer = Buffer.from(hashArmazenado, 'hex')
if (derivado.length !== hashArmazenadoBuffer.length) return false
return timingSafeEqual(derivado, hashArmazenadoBuffer)
}
16 changes: 12 additions & 4 deletions src/infra/http/aplicacao.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,19 @@ export async function criarAplicacao(): Promise<FastifyInstance> {
disableRequestLogging: true,
}) as unknown as FastifyInstance

function sanitizarUrl(url: string): string {
return url.replace(/([?&]cpf=)[^&]*/gi, '$1[OMITIDO]')
}

app.addHook('onRequest', (request, _reply, done) => {
request.log.info({ req: { method: request.method, url: request.url } }, 'incoming request')
request.log.info({ req: { method: request.method, url: sanitizarUrl(request.url) } }, 'incoming request')
done()
})

app.addHook('onResponse', (request, reply, done) => {
request.log.info(
{
req: { method: request.method, url: request.url },
req: { method: request.method, url: sanitizarUrl(request.url) },
res: { statusCode: reply.statusCode },
responseTime: reply.elapsedTime,
},
Expand Down Expand Up @@ -70,8 +74,12 @@ export async function criarAplicacao(): Promise<FastifyInstance> {
})

await app.register(cookie)
const jwtSecreto = process.env.JWT_SECRETO
if (!jwtSecreto || jwtSecreto.length < 32) {
throw new Error('JWT_SECRETO não definido ou com menos de 32 caracteres.')
}
await app.register(jwt, {
secret: process.env.JWT_SECRETO ?? '',
secret: jwtSecreto,
sign: { expiresIn: process.env.JWT_EXPIRACAO_ACCESS ?? '1h' },
})

Expand Down Expand Up @@ -148,7 +156,7 @@ export async function criarAplicacao(): Promise<FastifyInstance> {

app.get('/saude', () => ({
sucesso: true,
dados: { status: 'ok', ambiente: process.env.NODE_ENV },
dados: { status: 'ok' },
}))

return app
Expand Down
9 changes: 6 additions & 3 deletions src/modulos/usuarios/apresentacao/rotas/rotas-usuario.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'
import type { ZodTypeProvider } from 'fastify-type-provider-zod'
import { z } from 'zod'
import type { ControladorUsuario } from '@/modulos/usuarios/apresentacao/controladores/controlador-usuario'
import {
schemaCadastrarUsuario,
Expand Down Expand Up @@ -41,11 +42,13 @@ export function rotasUsuario(
})

rotas.patch('/:id', {
schema: { body: schemaAtualizarUsuario },
schema: {
params: z.object({ id: z.string().length(24, 'ID deve ter 24 caracteres.') }),
body: schemaAtualizarUsuario,
},
preHandler: [autenticar(app), autorizarAdmin(app)],
handler: async (req, reply) => {
const { id } = req.params as { id: string }
const dados = await controlador.atualizar(id, req.body, req.user.usuarioId)
const dados = await controlador.atualizar(req.params.id, req.body, req.user.usuarioId)
return reply.status(200).send({ sucesso: true, dados })
},
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ interface DocumentoVisitante {
atualizadoPor: ObjectId
}

function escaparRegex(texto: string): string {
return texto.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
}

export class RepositorioVisitanteMongo implements RepositorioVisitante {
private readonly colecao: Collection<DocumentoVisitante>

Expand Down Expand Up @@ -97,7 +101,7 @@ export class RepositorioVisitanteMongo implements RepositorioVisitante {
}
if (filtros.setorDestinoId) query.setorDestinoId = filtros.setorDestinoId
if (filtros.nomeCompleto) {
query.nomeCompleto = { $regex: filtros.nomeCompleto, $options: 'i' }
query.nomeCompleto = { $regex: escaparRegex(filtros.nomeCompleto), $options: 'i' }
}

const skip = (filtros.pagina - 1) * filtros.itensPorPagina
Expand All @@ -113,7 +117,7 @@ export class RepositorioVisitanteMongo implements RepositorioVisitante {
const query: Filter<DocumentoVisitante> = {}
if (filtros.cpf) query.cpf = filtros.cpf
if (filtros.nomeCompleto) {
query.nomeCompleto = { $regex: filtros.nomeCompleto, $options: 'i' }
query.nomeCompleto = { $regex: escaparRegex(filtros.nomeCompleto), $options: 'i' }
}

const skip = (filtros.pagina - 1) * filtros.itensPorPagina
Expand Down
Loading