aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares/validators/logs.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-07-31 14:34:36 +0200
committerChocobozzz <me@florianbigard.com>2023-08-11 15:02:33 +0200
commit3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch)
treee4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/middlewares/validators/logs.ts
parent04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff)
downloadPeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz
PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst
PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip
Migrate server to ESM
Sorry for the very big commit that may lead to git log issues and merge conflicts, but it's a major step forward: * Server can be faster at startup because imports() are async and we can easily lazy import big modules * Angular doesn't seem to support ES import (with .js extension), so we had to correctly organize peertube into a monorepo: * Use yarn workspace feature * Use typescript reference projects for dependencies * Shared projects have been moved into "packages", each one is now a node module (with a dedicated package.json/tsconfig.json) * server/tools have been moved into apps/ and is now a dedicated app bundled and published on NPM so users don't have to build peertube cli tools manually * server/tests have been moved into packages/ so we don't compile them every time we want to run the server * Use isolatedModule option: * Had to move from const enum to const (https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums) * Had to explictely specify "type" imports when used in decorators * Prefer tsx (that uses esbuild under the hood) instead of ts-node to load typescript files (tests with mocha or scripts): * To reduce test complexity as esbuild doesn't support decorator metadata, we only test server files that do not import server models * We still build tests files into js files for a faster CI * Remove unmaintained peertube CLI import script * Removed some barrels to speed up execution (less imports)
Diffstat (limited to 'server/middlewares/validators/logs.ts')
-rw-r--r--server/middlewares/validators/logs.ts93
1 files changed, 0 insertions, 93 deletions
diff --git a/server/middlewares/validators/logs.ts b/server/middlewares/validators/logs.ts
deleted file mode 100644
index 2d828bb42..000000000
--- a/server/middlewares/validators/logs.ts
+++ /dev/null
@@ -1,93 +0,0 @@
1import express from 'express'
2import { body, query } from 'express-validator'
3import { isUrlValid } from '@server/helpers/custom-validators/activitypub/misc'
4import { isStringArray } from '@server/helpers/custom-validators/search'
5import { CONFIG } from '@server/initializers/config'
6import { arrayify } from '@shared/core-utils'
7import { HttpStatusCode } from '@shared/models'
8import {
9 isValidClientLogLevel,
10 isValidClientLogMessage,
11 isValidClientLogMeta,
12 isValidClientLogStackTrace,
13 isValidClientLogUserAgent,
14 isValidLogLevel
15} from '../../helpers/custom-validators/logs'
16import { isDateValid } from '../../helpers/custom-validators/misc'
17import { areValidationErrors } from './shared'
18
19const createClientLogValidator = [
20 body('message')
21 .custom(isValidClientLogMessage),
22
23 body('url')
24 .custom(isUrlValid),
25
26 body('level')
27 .custom(isValidClientLogLevel),
28
29 body('stackTrace')
30 .optional()
31 .custom(isValidClientLogStackTrace),
32
33 body('meta')
34 .optional()
35 .custom(isValidClientLogMeta),
36
37 body('userAgent')
38 .optional()
39 .custom(isValidClientLogUserAgent),
40
41 (req: express.Request, res: express.Response, next: express.NextFunction) => {
42 if (CONFIG.LOG.ACCEPT_CLIENT_LOG !== true) {
43 return res.sendStatus(HttpStatusCode.FORBIDDEN_403)
44 }
45
46 if (areValidationErrors(req, res)) return
47
48 return next()
49 }
50]
51
52const getLogsValidator = [
53 query('startDate')
54 .custom(isDateValid).withMessage('Should have a start date that conforms to ISO 8601'),
55 query('level')
56 .optional()
57 .custom(isValidLogLevel),
58 query('tagsOneOf')
59 .optional()
60 .customSanitizer(arrayify)
61 .custom(isStringArray).withMessage('Should have a valid one of tags array'),
62 query('endDate')
63 .optional()
64 .custom(isDateValid).withMessage('Should have an end date that conforms to ISO 8601'),
65
66 (req: express.Request, res: express.Response, next: express.NextFunction) => {
67 if (areValidationErrors(req, res)) return
68
69 return next()
70 }
71]
72
73const getAuditLogsValidator = [
74 query('startDate')
75 .custom(isDateValid).withMessage('Should have a start date that conforms to ISO 8601'),
76 query('endDate')
77 .optional()
78 .custom(isDateValid).withMessage('Should have a end date that conforms to ISO 8601'),
79
80 (req: express.Request, res: express.Response, next: express.NextFunction) => {
81 if (areValidationErrors(req, res)) return
82
83 return next()
84 }
85]
86
87// ---------------------------------------------------------------------------
88
89export {
90 getLogsValidator,
91 getAuditLogsValidator,
92 createClientLogValidator
93}