-import { body, param } from 'express-validator/check'
+import { body, param } from 'express-validator'
import * as express from 'express'
import { logger } from '../../helpers/logger'
import { areValidationErrors } from './utils'
-import { isAccountNameWithHostExist } from '../../helpers/custom-validators/accounts'
-import { UserModel } from '../../models/account/user'
import { AccountBlocklistModel } from '../../models/account/account-blocklist'
import { isHostValid } from '../../helpers/custom-validators/servers'
import { ServerBlocklistModel } from '../../models/server/server-blocklist'
import { ServerModel } from '../../models/server/server'
-import { CONFIG } from '../../initializers'
+import { getServerActor } from '../../helpers/utils'
+import { WEBSERVER } from '../../initializers/constants'
+import { doesAccountNameWithHostExist } from '../../helpers/middlewares'
-const blockAccountByAccountValidator = [
+const blockAccountValidator = [
body('accountName').exists().withMessage('Should have an account name with host'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking blockAccountByAccountValidator parameters', { parameters: req.body })
if (areValidationErrors(req, res)) return
- if (!await isAccountNameWithHostExist(req.body.accountName, res)) return
+ if (!await doesAccountNameWithHostExist(req.body.accountName, res)) return
- const user = res.locals.oauth.token.User as UserModel
+ const user = res.locals.oauth.token.User
const accountToBlock = res.locals.account
if (user.Account.id === accountToBlock.id) {
logger.debug('Checking unblockAccountByAccountValidator parameters', { parameters: req.params })
if (areValidationErrors(req, res)) return
- if (!await isAccountNameWithHostExist(req.params.accountName, res)) return
+ if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return
- const user = res.locals.oauth.token.User as UserModel
+ const user = res.locals.oauth.token.User
const targetAccount = res.locals.account
- if (!await isUnblockAccountExists(user.Account.id, targetAccount.id, res)) return
+ if (!await doesUnblockAccountExist(user.Account.id, targetAccount.id, res)) return
return next()
}
]
-const blockServerByAccountValidator = [
+const unblockAccountByServerValidator = [
+ param('accountName').exists().withMessage('Should have an account name with host'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking unblockAccountByServerValidator parameters', { parameters: req.params })
+
+ if (areValidationErrors(req, res)) return
+ if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return
+
+ const serverActor = await getServerActor()
+ const targetAccount = res.locals.account
+ if (!await doesUnblockAccountExist(serverActor.Account.id, targetAccount.id, res)) return
+
+ return next()
+ }
+]
+
+const blockServerValidator = [
body('host').custom(isHostValid).withMessage('Should have a valid host'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
const host: string = req.body.host
- if (host === CONFIG.WEBSERVER.HOST) {
+ if (host === WEBSERVER.HOST) {
return res.status(409)
.send({ error: 'You cannot block your own server.' })
.end()
if (areValidationErrors(req, res)) return
- const user = res.locals.oauth.token.User as UserModel
- if (!await isUnblockServerExists(user.Account.id, req.params.host, res)) return
+ const user = res.locals.oauth.token.User
+ if (!await doesUnblockServerExist(user.Account.id, req.params.host, res)) return
+
+ return next()
+ }
+]
+
+const unblockServerByServerValidator = [
+ param('host').custom(isHostValid).withMessage('Should have an account name with host'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking unblockServerByServerValidator parameters', { parameters: req.params })
+
+ if (areValidationErrors(req, res)) return
+
+ const serverActor = await getServerActor()
+ if (!await doesUnblockServerExist(serverActor.Account.id, req.params.host, res)) return
return next()
}
// ---------------------------------------------------------------------------
export {
- blockServerByAccountValidator,
- blockAccountByAccountValidator,
+ blockServerValidator,
+ blockAccountValidator,
unblockAccountByAccountValidator,
- unblockServerByAccountValidator
+ unblockServerByAccountValidator,
+ unblockAccountByServerValidator,
+ unblockServerByServerValidator
}
// ---------------------------------------------------------------------------
-async function isUnblockAccountExists (accountId: number, targetAccountId: number, res: express.Response) {
+async function doesUnblockAccountExist (accountId: number, targetAccountId: number, res: express.Response) {
const accountBlock = await AccountBlocklistModel.loadByAccountAndTarget(accountId, targetAccountId)
if (!accountBlock) {
res.status(404)
return true
}
-async function isUnblockServerExists (accountId: number, host: string, res: express.Response) {
+async function doesUnblockServerExist (accountId: number, host: string, res: express.Response) {
const serverBlock = await ServerBlocklistModel.loadByAccountAndHost(accountId, host)
if (!serverBlock) {
res.status(404)