X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fconfig.ts;h=bd100ef9cddf03d46a4ff547071ee0bca3138091;hb=c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e;hp=b2f23c1b00977abb39fe90b5832eb2760380666e;hpb=174e0855873d7086ad8240599101c2f717ebbd59;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index b2f23c1b0..bd100ef9c 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -1,23 +1,22 @@ +import { Hooks } from '@server/lib/plugins/hooks' import * as express from 'express' +import { remove, writeJSON } from 'fs-extra' import { snakeCase } from 'lodash' -import { ServerConfig, UserRight } from '../../../shared' +import validator from 'validator' +import { RegisteredExternalAuthConfig, RegisteredIdAndPassAuthConfig, ServerConfig, UserRight } from '../../../shared' import { About } from '../../../shared/models/server/about.model' import { CustomConfig } from '../../../shared/models/server/custom-config.model' +import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger' +import { objectConverter } from '../../helpers/core-utils' import { isSignupAllowed, isSignupAllowedForCurrentIP } from '../../helpers/signup' +import { getServerCommit } from '../../helpers/utils' +import { CONFIG, isEmailEnabled, reloadConfig } from '../../initializers/config' import { CONSTRAINTS_FIELDS, DEFAULT_THEME_NAME, PEERTUBE_VERSION } from '../../initializers/constants' -import { asyncMiddleware, authenticate, ensureUserHasRight } from '../../middlewares' -import { customConfigUpdateValidator } from '../../middlewares/validators/config' import { ClientHtml } from '../../lib/client-html' -import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger' -import { remove, writeJSON } from 'fs-extra' -import { getServerCommit } from '../../helpers/utils' -import { Emailer } from '../../lib/emailer' -import { isNumeric } from 'validator' -import { objectConverter } from '../../helpers/core-utils' -import { CONFIG, reloadConfig } from '../../initializers/config' import { PluginManager } from '../../lib/plugins/plugin-manager' import { getThemeOrDefault } from '../../lib/plugins/theme-utils' -import { Hooks } from '@server/lib/plugins/hooks' +import { asyncMiddleware, authenticate, ensureUserHasRight } from '../../middlewares' +import { customConfigUpdateValidator } from '../../middlewares/validators/config' const configRouter = express.Router() @@ -31,12 +30,12 @@ configRouter.get('/', configRouter.get('/custom', authenticate, ensureUserHasRight(UserRight.MANAGE_CONFIGURATION), - asyncMiddleware(getCustomConfig) + getCustomConfig ) configRouter.put('/custom', authenticate, ensureUserHasRight(UserRight.MANAGE_CONFIGURATION), - asyncMiddleware(customConfigUpdateValidator), + customConfigUpdateValidator, asyncMiddleware(updateCustomConfig) ) configRouter.delete('/custom', @@ -50,7 +49,9 @@ let serverCommit: string async function getConfig (req: express.Request, res: express.Response) { const { allowed } = await Hooks.wrapPromiseFun( isSignupAllowed, - {}, + { + ip: req.ip + }, 'filter:api.user.signup.allowed.result' ) @@ -71,15 +72,29 @@ async function getConfig (req: express.Request, res: express.Response) { css: CONFIG.INSTANCE.CUSTOMIZATIONS.CSS } }, + search: { + remoteUri: { + users: CONFIG.SEARCH.REMOTE_URI.USERS, + anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS + }, + searchIndex: { + enabled: CONFIG.SEARCH.SEARCH_INDEX.ENABLED, + url: CONFIG.SEARCH.SEARCH_INDEX.URL, + disableLocalSearch: CONFIG.SEARCH.SEARCH_INDEX.DISABLE_LOCAL_SEARCH, + isDefaultSearch: CONFIG.SEARCH.SEARCH_INDEX.IS_DEFAULT_SEARCH + } + }, plugin: { - registered: getRegisteredPlugins() + registered: getRegisteredPlugins(), + registeredExternalAuths: getExternalAuthsPlugins(), + registeredIdAndPassAuths: getIdAndPassAuthPlugins() }, theme: { registered: getRegisteredThemes(), default: defaultTheme }, email: { - enabled: Emailer.isEnabled() + enabled: isEmailEnabled() }, contactForm: { enabled: CONFIG.CONTACT_FORM.ENABLED @@ -98,7 +113,15 @@ async function getConfig (req: express.Request, res: express.Response) { webtorrent: { enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED }, - enabledResolutions: getEnabledResolutions() + enabledResolutions: getEnabledResolutions('vod') + }, + live: { + enabled: CONFIG.LIVE.ENABLED, + + transcoding: { + enabled: CONFIG.LIVE.TRANSCODING.ENABLED, + enabledResolutions: getEnabledResolutions('live') + } }, import: { videos: { @@ -155,6 +178,21 @@ async function getConfig (req: express.Request, res: express.Response) { }, tracker: { enabled: CONFIG.TRACKER.ENABLED + }, + + followings: { + instance: { + autoFollowIndex: { + indexUrl: CONFIG.FOLLOWINGS.INSTANCE.AUTO_FOLLOW_INDEX.INDEX_URL + } + } + }, + + broadcastMessage: { + enabled: CONFIG.BROADCAST_MESSAGE.ENABLED, + message: CONFIG.BROADCAST_MESSAGE.MESSAGE, + level: CONFIG.BROADCAST_MESSAGE.LEVEL, + dismissable: CONFIG.BROADCAST_MESSAGE.DISMISSABLE } } @@ -186,7 +224,7 @@ function getAbout (req: express.Request, res: express.Response) { return res.json(about).end() } -async function getCustomConfig (req: express.Request, res: express.Response) { +function getCustomConfig (req: express.Request, res: express.Response) { const data = customConfig() return res.json(data).end() @@ -202,7 +240,7 @@ async function deleteCustomConfig (req: express.Request, res: express.Response) const data = customConfig() - return res.json(data).end() + return res.json(data) } async function updateCustomConfig (req: express.Request, res: express.Response) { @@ -224,7 +262,7 @@ async function updateCustomConfig (req: express.Request, res: express.Response) oldCustomConfigAuditKeys ) - return res.json(data).end() + return res.json(data) } function getRegisteredThemes () { @@ -238,9 +276,13 @@ function getRegisteredThemes () { })) } -function getEnabledResolutions () { - return Object.keys(CONFIG.TRANSCODING.RESOLUTIONS) - .filter(key => CONFIG.TRANSCODING.ENABLED && CONFIG.TRANSCODING.RESOLUTIONS[ key ] === true) +function getEnabledResolutions (type: 'vod' | 'live') { + const transcoding = type === 'vod' + ? CONFIG.TRANSCODING + : CONFIG.LIVE.TRANSCODING + + return Object.keys(transcoding.RESOLUTIONS) + .filter(key => transcoding.ENABLED && transcoding.RESOLUTIONS[key] === true) .map(r => parseInt(r, 10)) } @@ -254,6 +296,42 @@ function getRegisteredPlugins () { })) } +function getIdAndPassAuthPlugins () { + const result: RegisteredIdAndPassAuthConfig[] = [] + + for (const p of PluginManager.Instance.getIdAndPassAuths()) { + for (const auth of p.idAndPassAuths) { + result.push({ + npmName: p.npmName, + name: p.name, + version: p.version, + authName: auth.authName, + weight: auth.getWeight() + }) + } + } + + return result +} + +function getExternalAuthsPlugins () { + const result: RegisteredExternalAuthConfig[] = [] + + for (const p of PluginManager.Instance.getExternalAuths()) { + for (const auth of p.externalAuths) { + result.push({ + npmName: p.npmName, + name: p.name, + version: p.version, + authName: auth.authName, + authDisplayName: auth.authDisplayName() + }) + } + } + + return result +} + // --------------------------------------------------------------------------- export { @@ -330,13 +408,13 @@ function customConfig (): CustomConfig { allowAudioFiles: CONFIG.TRANSCODING.ALLOW_AUDIO_FILES, threads: CONFIG.TRANSCODING.THREADS, resolutions: { - '0p': CONFIG.TRANSCODING.RESOLUTIONS[ '0p' ], - '240p': CONFIG.TRANSCODING.RESOLUTIONS[ '240p' ], - '360p': CONFIG.TRANSCODING.RESOLUTIONS[ '360p' ], - '480p': CONFIG.TRANSCODING.RESOLUTIONS[ '480p' ], - '720p': CONFIG.TRANSCODING.RESOLUTIONS[ '720p' ], - '1080p': CONFIG.TRANSCODING.RESOLUTIONS[ '1080p' ], - '2160p': CONFIG.TRANSCODING.RESOLUTIONS[ '2160p' ] + '0p': CONFIG.TRANSCODING.RESOLUTIONS['0p'], + '240p': CONFIG.TRANSCODING.RESOLUTIONS['240p'], + '360p': CONFIG.TRANSCODING.RESOLUTIONS['360p'], + '480p': CONFIG.TRANSCODING.RESOLUTIONS['480p'], + '720p': CONFIG.TRANSCODING.RESOLUTIONS['720p'], + '1080p': CONFIG.TRANSCODING.RESOLUTIONS['1080p'], + '2160p': CONFIG.TRANSCODING.RESOLUTIONS['2160p'] }, webtorrent: { enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED @@ -345,6 +423,21 @@ function customConfig (): CustomConfig { enabled: CONFIG.TRANSCODING.HLS.ENABLED } }, + live: { + enabled: CONFIG.LIVE.ENABLED, + transcoding: { + enabled: CONFIG.LIVE.TRANSCODING.ENABLED, + threads: CONFIG.LIVE.TRANSCODING.THREADS, + resolutions: { + '240p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['240p'], + '360p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['360p'], + '480p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['480p'], + '720p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['720p'], + '1080p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['1080p'], + '2160p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['2160p'] + } + } + }, import: { videos: { http: { @@ -379,6 +472,24 @@ function customConfig (): CustomConfig { indexUrl: CONFIG.FOLLOWINGS.INSTANCE.AUTO_FOLLOW_INDEX.INDEX_URL } } + }, + broadcastMessage: { + enabled: CONFIG.BROADCAST_MESSAGE.ENABLED, + message: CONFIG.BROADCAST_MESSAGE.MESSAGE, + level: CONFIG.BROADCAST_MESSAGE.LEVEL, + dismissable: CONFIG.BROADCAST_MESSAGE.DISMISSABLE + }, + search: { + remoteUri: { + users: CONFIG.SEARCH.REMOTE_URI.USERS, + anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS + }, + searchIndex: { + enabled: CONFIG.SEARCH.SEARCH_INDEX.ENABLED, + url: CONFIG.SEARCH.SEARCH_INDEX.URL, + disableLocalSearch: CONFIG.SEARCH.SEARCH_INDEX.DISABLE_LOCAL_SEARCH, + isDefaultSearch: CONFIG.SEARCH.SEARCH_INDEX.IS_DEFAULT_SEARCH + } } } } @@ -393,7 +504,7 @@ function convertCustomConfigBody (body: CustomConfig) { } function valueConverter (v: any) { - if (isNumeric(v + '')) return parseInt('' + v, 10) + if (validator.isNumeric(v + '')) return parseInt('' + v, 10) return v }