diff options
Diffstat (limited to 'server/helpers/utils.ts')
-rw-r--r-- | server/helpers/utils.ts | 62 |
1 files changed, 2 insertions, 60 deletions
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index c58117219..058c3211e 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts | |||
@@ -1,68 +1,13 @@ | |||
1 | import * as express from 'express' | ||
2 | import * as multer from 'multer' | ||
3 | import { Model } from 'sequelize-typescript' | 1 | import { Model } from 'sequelize-typescript' |
4 | import { ResultList } from '../../shared' | 2 | import { ResultList } from '../../shared' |
5 | import { VideoResolution } from '../../shared/models/videos' | 3 | import { VideoResolution } from '../../shared/models/videos' |
6 | import { CONFIG, REMOTE_SCHEME } from '../initializers' | 4 | import { CONFIG } from '../initializers' |
7 | import { UserModel } from '../models/account/user' | 5 | import { UserModel } from '../models/account/user' |
8 | import { ActorModel } from '../models/activitypub/actor' | 6 | import { ActorModel } from '../models/activitypub/actor' |
9 | import { ApplicationModel } from '../models/application/application' | 7 | import { ApplicationModel } from '../models/application/application' |
10 | import { pseudoRandomBytesPromise } from './core-utils' | 8 | import { pseudoRandomBytesPromise } from './core-utils' |
11 | import { logger } from './logger' | 9 | import { logger } from './logger' |
12 | 10 | ||
13 | function getHostWithPort (host: string) { | ||
14 | const splitted = host.split(':') | ||
15 | |||
16 | // The port was not specified | ||
17 | if (splitted.length === 1) { | ||
18 | if (REMOTE_SCHEME.HTTP === 'https') return host + ':443' | ||
19 | |||
20 | return host + ':80' | ||
21 | } | ||
22 | |||
23 | return host | ||
24 | } | ||
25 | |||
26 | function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) { | ||
27 | return res.type('json').status(400).end() | ||
28 | } | ||
29 | |||
30 | function createReqFiles ( | ||
31 | fieldNames: string[], | ||
32 | mimeTypes: { [ id: string ]: string }, | ||
33 | destinations: { [ fieldName: string ]: string } | ||
34 | ) { | ||
35 | const storage = multer.diskStorage({ | ||
36 | destination: (req, file, cb) => { | ||
37 | cb(null, destinations[file.fieldname]) | ||
38 | }, | ||
39 | |||
40 | filename: async (req, file, cb) => { | ||
41 | const extension = mimeTypes[file.mimetype] | ||
42 | let randomString = '' | ||
43 | |||
44 | try { | ||
45 | randomString = await generateRandomString(16) | ||
46 | } catch (err) { | ||
47 | logger.error('Cannot generate random string for file name.', { err }) | ||
48 | randomString = 'fake-random-string' | ||
49 | } | ||
50 | |||
51 | cb(null, randomString + extension) | ||
52 | } | ||
53 | }) | ||
54 | |||
55 | const fields = [] | ||
56 | for (const fieldName of fieldNames) { | ||
57 | fields.push({ | ||
58 | name: fieldName, | ||
59 | maxCount: 1 | ||
60 | }) | ||
61 | } | ||
62 | |||
63 | return multer({ storage }).fields(fields) | ||
64 | } | ||
65 | |||
66 | async function generateRandomString (size: number) { | 11 | async function generateRandomString (size: number) { |
67 | const raw = await pseudoRandomBytesPromise(size) | 12 | const raw = await pseudoRandomBytesPromise(size) |
68 | 13 | ||
@@ -151,14 +96,11 @@ type SortType = { sortModel: any, sortValue: string } | |||
151 | // --------------------------------------------------------------------------- | 96 | // --------------------------------------------------------------------------- |
152 | 97 | ||
153 | export { | 98 | export { |
154 | badRequest, | ||
155 | generateRandomString, | 99 | generateRandomString, |
156 | getFormattedObjects, | 100 | getFormattedObjects, |
157 | isSignupAllowed, | 101 | isSignupAllowed, |
158 | computeResolutionsToTranscode, | 102 | computeResolutionsToTranscode, |
159 | resetSequelizeInstance, | 103 | resetSequelizeInstance, |
160 | getServerActor, | 104 | getServerActor, |
161 | SortType, | 105 | SortType |
162 | getHostWithPort, | ||
163 | createReqFiles | ||
164 | } | 106 | } |