ActivityPub-federated video streaming platform using P2P directly in your web browser
Improve security logging
Chocobozzzafc427274114
diff --git a/server/core/controllers/api/server/debug.ts b/server/core/controllers/api/server/debug.tsindex 5bf20e7894..e848fc8a8f 100644--- a/server/core/controllers/api/server/debug.ts+++ b/server/core/controllers/api/server/debug.ts@@ -8,7 +8,7 @@ import {UserRegistrationState,UserRight} from '@peertube/peertube-models'-import { logger } from '@server/helpers/logger.js'+import { logger, loggerTagsFactory } from '@server/helpers/logger.js'import { CONFIG } from '@server/initializers/config.js'import { WEBSERVER } from '@server/initializers/constants.js'import { InboxManager } from '@server/lib/activitypub/inbox-manager.js'@@ -23,6 +23,8 @@ import { VideoStatsManager } from '@server/lib/stats/video-stats-manager.js'import express from 'express'import { asyncMiddleware, authenticate, ensureUserHasRight } from '../../../middlewares/index.js'+const lTags = loggerTagsFactory('debug-controller')+const debugRouter = express.Router()debugRouter.get(@@ -72,6 +74,8 @@ async function runCommand (req: express.Request, res: express.Response) {return res.fail({ message: 'Invalid command' })}+ logger.info('Executing debug command: ' + body.command, lTags())+await processors[body.command]()return res.status(HttpStatusCode.NO_CONTENT_204).end()diff --git a/server/core/middlewares/rate-limiter.ts b/server/core/middlewares/rate-limiter.tsindex 4e1c5a33d9..f3c51104e6 100644--- a/server/core/middlewares/rate-limiter.ts+++ b/server/core/middlewares/rate-limiter.ts@@ -4,7 +4,9 @@ import { UserRole, UserRoleType } from '@peertube/peertube-models'import { CONFIG } from '@server/initializers/config.js'import { RunnerModel } from '@server/models/runner/runner.js'import { optionalAuthenticate } from './auth.js'-import { logger } from '@server/helpers/logger.js'+import { logger, loggerTagsFactory } from '@server/helpers/logger.js'++const lTags = loggerTagsFactory('rate-limit')const whitelistRoles = new Set<UserRoleType>([ UserRole.ADMINISTRATOR, UserRole.MODERATOR ])@@ -56,7 +58,7 @@ export const activityPubRateLimiter = buildRateLimiter({// ---------------------------------------------------------------------------function sendRateLimited (req: express.Request, res: express.Response, options: RateLimitHandlerOptions) {- logger.debug('Rate limit exceeded for route ' + req.originalUrl)+ logger.debug('Rate limit exceeded for route ' + req.originalUrl, { route: req.originalUrl, ip: req.ip, ...lTags() })return res.status(options.statusCode).send(options.message)}