From 54141398354e6e7b94aa3065a705a1251390111c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 20 Nov 2017 09:43:39 +0100 Subject: Refractor activity pub lib/helpers --- server/middlewares/validators/follows.ts | 62 ++++++++++++++++++++++++++++++++ server/middlewares/validators/index.ts | 2 +- server/middlewares/validators/servers.ts | 32 ----------------- 3 files changed, 63 insertions(+), 33 deletions(-) create mode 100644 server/middlewares/validators/follows.ts delete mode 100644 server/middlewares/validators/servers.ts (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/follows.ts b/server/middlewares/validators/follows.ts new file mode 100644 index 000000000..e22349726 --- /dev/null +++ b/server/middlewares/validators/follows.ts @@ -0,0 +1,62 @@ +import * as express from 'express' +import { body } from 'express-validator/check' +import { isTestInstance } from '../../helpers/core-utils' +import { isAccountIdValid } from '../../helpers/custom-validators/activitypub/account' +import { isEachUniqueHostValid } from '../../helpers/custom-validators/servers' +import { logger } from '../../helpers/logger' +import { CONFIG, database as db } from '../../initializers' +import { checkErrors } from './utils' +import { getServerAccount } from '../../helpers/utils' + +const followValidator = [ + body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { + // Force https if the administrator wants to make friends + if (isTestInstance() === false && CONFIG.WEBSERVER.SCHEME === 'http') { + return res.status(400) + .json({ + error: 'Cannot follow non HTTPS web server.' + }) + .end() + } + + logger.debug('Checking follow parameters', { parameters: req.body }) + + checkErrors(req, res, next) + } +] + +const removeFollowingValidator = [ + body('accountId').custom(isAccountIdValid).withMessage('Should have a valid account id'), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking follow parameters', { parameters: req.body }) + + checkErrors(req, res, async () => { + try { + const serverAccount = await getServerAccount() + const following = await db.AccountFollow.loadByAccountAndTarget(serverAccount.id, req.params.accountId) + + if (!following) { + return res.status(404) + .end() + } + + res.locals.following = following + + return next() + } catch (err) { + logger.error('Error in remove following validator.', err) + return res.sendStatus(500) + } + }) + } +] + +// --------------------------------------------------------------------------- + +export { + followValidator, + removeFollowingValidator +} diff --git a/server/middlewares/validators/index.ts b/server/middlewares/validators/index.ts index 3f5afe5b3..9840e8f65 100644 --- a/server/middlewares/validators/index.ts +++ b/server/middlewares/validators/index.ts @@ -2,7 +2,7 @@ export * from './account' export * from './oembed' export * from './activitypub' export * from './pagination' -export * from './servers' +export * from './follows' export * from './sort' export * from './users' export * from './videos' diff --git a/server/middlewares/validators/servers.ts b/server/middlewares/validators/servers.ts deleted file mode 100644 index 95b69b789..000000000 --- a/server/middlewares/validators/servers.ts +++ /dev/null @@ -1,32 +0,0 @@ -import * as express from 'express' -import { body } from 'express-validator/check' -import { isEachUniqueHostValid } from '../../helpers/custom-validators/servers' -import { isTestInstance } from '../../helpers/core-utils' -import { CONFIG } from '../../initializers/constants' -import { logger } from '../../helpers/logger' -import { checkErrors } from './utils' - -const followValidator = [ - body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'), - - (req: express.Request, res: express.Response, next: express.NextFunction) => { - // Force https if the administrator wants to make friends - if (isTestInstance() === false && CONFIG.WEBSERVER.SCHEME === 'http') { - return res.status(400) - .json({ - error: 'Cannot follow non HTTPS web server.' - }) - .end() - } - - logger.debug('Checking follow parameters', { parameters: req.body }) - - checkErrors(req, res, next) - } -] - -// --------------------------------------------------------------------------- - -export { - followValidator -} -- cgit v1.2.3