OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Introduce abuse command

pull/4271/head
Chocobozzz 2021-07-06 12:01:59 +02:00
parent 8ef9457fde
commit 0c1a77e9cc
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
12 changed files with 633 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
server/tests/api/check-params/abuses.ts
View File

@ -1,46 +1,40 @@
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
import { AbuseCreate, AbuseState } from '@shared/models'
import { HttpStatusCode } from '@shared/core-utils'
import {
addAbuseMessage,
AbusesCommand,
checkBadCountPagination,
checkBadSortPagination,
checkBadStartPagination,
cleanupTests,
createUser,
deleteAbuse,
deleteAbuseMessage,
doubleFollow,
flushAndRunServer,
generateUserAccessToken,
getAdminAbusesList,
getVideoIdFromUUID,
listAbuseMessages,
makeGetRequest,
makePostBodyRequest,
reportAbuse,
ServerInfo,
setAccessTokensToServers,
updateAbuse,
uploadVideo,
userLogin,
waitJobs
} from '../../../../shared/extra-utils'
import {
checkBadCountPagination,
checkBadSortPagination,
checkBadStartPagination
} from '../../../../shared/extra-utils/requests/check-api-params'
import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
} from '@shared/extra-utils'
import { AbuseCreate, AbuseState } from '@shared/models'
describe('Test abuses API validators', function () {
const basePath = '/api/v1/abuses/'
let server: ServerInfo
let userAccessToken = ''
let userAccessToken2 = ''
let userToken = ''
let userToken2 = ''
let abuseId: number
let messageId: number
let command: AbusesCommand
// ---------------------------------------------------------------
before(async function () {
@ -53,14 +47,14 @@ describe('Test abuses API validators', function () {
const username = 'user1'
const password = 'my super password'
await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
userAccessToken = await userLogin(server, { username, password })
userToken = await userLogin(server, { username, password })
{
userAccessToken2 = await generateUserAccessToken(server, 'user_2')
}
userToken2 = await generateUserAccessToken(server, 'user_2')
const res = await uploadVideo(server.url, server.accessToken, {})
server.video = res.body.video
command = server.abusesCommand
})
describe('When listing abuses for admins', function () {
@ -90,7 +84,7 @@ describe('Test abuses API validators', function () {
await makeGetRequest({
url: server.url,
path,
token: userAccessToken,
token: userToken,
statusCodeExpected: HttpStatusCode.FORBIDDEN_403
})
})
@ -134,15 +128,15 @@ describe('Test abuses API validators', function () {
const path = '/api/v1/users/me/abuses'
it('Should fail with a bad start pagination', async function () {
await checkBadStartPagination(server.url, path, userAccessToken)
await checkBadStartPagination(server.url, path, userToken)
})
it('Should fail with a bad count pagination', async function () {
await checkBadCountPagination(server.url, path, userAccessToken)
await checkBadCountPagination(server.url, path, userToken)
})
it('Should fail with an incorrect sort', async function () {
await checkBadSortPagination(server.url, path, userAccessToken)
await checkBadSortPagination(server.url, path, userToken)
})
it('Should fail with a non authenticated user', async function () {
@ -154,12 +148,12 @@ describe('Test abuses API validators', function () {
})
it('Should fail with a bad id filter', async function () {
await makeGetRequest({ url: server.url, path, token: userAccessToken, query: { id: 'toto' } })
await makeGetRequest({ url: server.url, path, token: userToken, query: { id: 'toto' } })
})
it('Should fail with a bad state filter', async function () {
await makeGetRequest({ url: server.url, path, token: userAccessToken, query: { state: 'toto' } })
await makeGetRequest({ url: server.url, path, token: userAccessToken, query: { state: 0 } })
await makeGetRequest({ url: server.url, path, token: userToken, query: { state: 'toto' } })
await makeGetRequest({ url: server.url, path, token: userToken, query: { state: 0 } })
})
it('Should succeed with the correct params', async function () {
@ -168,7 +162,7 @@ describe('Test abuses API validators', function () {
state: 2
}
await makeGetRequest({ url: server.url, path, token: userAccessToken, query, statusCodeExpected: HttpStatusCode.OK_200 })
await makeGetRequest({ url: server.url, path, token: userToken, query, statusCodeExpected: HttpStatusCode.OK_200 })
})
})
@ -177,12 +171,12 @@ describe('Test abuses API validators', function () {
it('Should fail with nothing', async function () {
const fields = {}
await makePostBodyRequest({ url: server.url, path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
})
it('Should fail with a wrong video', async function () {
const fields = { video: { id: 'blabla' }, reason: 'my super reason' }
await makePostBodyRequest({ url: server.url, path: path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path: path, token: userToken, fields })
})
it('Should fail with an unknown video', async function () {
@ -190,7 +184,7 @@ describe('Test abuses API validators', function () {
await makePostBodyRequest({
url: server.url,
path,
token: userAccessToken,
token: userToken,
fields,
statusCodeExpected: HttpStatusCode.NOT_FOUND_404
})
@ -198,7 +192,7 @@ describe('Test abuses API validators', function () {
it('Should fail with a wrong comment', async function () {
const fields = { comment: { id: 'blabla' }, reason: 'my super reason' }
await makePostBodyRequest({ url: server.url, path: path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path: path, token: userToken, fields })
})
it('Should fail with an unknown comment', async function () {
@ -206,7 +200,7 @@ describe('Test abuses API validators', function () {
await makePostBodyRequest({
url: server.url,
path,
token: userAccessToken,
token: userToken,
fields,
statusCodeExpected: HttpStatusCode.NOT_FOUND_404
})
@ -214,7 +208,7 @@ describe('Test abuses API validators', function () {
it('Should fail with a wrong account', async function () {
const fields = { account: { id: 'blabla' }, reason: 'my super reason' }
await makePostBodyRequest({ url: server.url, path: path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path: path, token: userToken, fields })
})
it('Should fail with an unknown account', async function () {
@ -222,7 +216,7 @@ describe('Test abuses API validators', function () {
await makePostBodyRequest({
url: server.url,
path,
token: userAccessToken,
token: userToken,
fields,
statusCodeExpected: HttpStatusCode.NOT_FOUND_404
})
@ -233,7 +227,7 @@ describe('Test abuses API validators', function () {
await makePostBodyRequest({
url: server.url,
path,
token: userAccessToken,
token: userToken,
fields,
statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
})
@ -248,13 +242,13 @@ describe('Test abuses API validators', function () {
it('Should fail with a reason too short', async function () {
const fields = { video: { id: server.video.id }, reason: 'h' }
await makePostBodyRequest({ url: server.url, path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
})
it('Should fail with a too big reason', async function () {
const fields = { video: { id: server.video.id }, reason: 'super'.repeat(605) }
await makePostBodyRequest({ url: server.url, path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
})
it('Should succeed with the correct parameters (basic)', async function () {
@ -263,7 +257,7 @@ describe('Test abuses API validators', function () {
const res = await makePostBodyRequest({
url: server.url,
path,
token: userAccessToken,
token: userToken,
fields,
statusCodeExpected: HttpStatusCode.OK_200
})
@ -273,19 +267,19 @@ describe('Test abuses API validators', function () {
it('Should fail with a wrong predefined reason', async function () {
const fields = { video: { id: server.video.id }, reason: 'my super reason', predefinedReasons: [ 'wrongPredefinedReason' ] }
await makePostBodyRequest({ url: server.url, path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
})
it('Should fail with negative timestamps', async function () {
const fields = { video: { id: server.video.id, startAt: -1 }, reason: 'my super reason' }
await makePostBodyRequest({ url: server.url, path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
})
it('Should fail mith misordered startAt/endAt', async function () {
const fields = { video: { id: server.video.id, startAt: 5, endAt: 1 }, reason: 'my super reason' }
await makePostBodyRequest({ url: server.url, path, token: userAccessToken, fields })
await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
})
it('Should succeed with the corret parameters (advanced)', async function () {
@ -299,37 +293,37 @@ describe('Test abuses API validators', function () {
predefinedReasons: [ 'serverRules' ]
}
await makePostBodyRequest({ url: server.url, path, token: userAccessToken, fields, statusCodeExpected: HttpStatusCode.OK_200 })
await makePostBodyRequest({ url: server.url, path, token: userToken, fields, statusCodeExpected: HttpStatusCode.OK_200 })
})
})
describe('When updating an abuse', function () {
it('Should fail with a non authenticated user', async function () {
await updateAbuse(server.url, 'blabla', abuseId, {}, HttpStatusCode.UNAUTHORIZED_401)
await command.update({ token: 'blabla', abuseId, body: {}, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with a non admin user', async function () {
await updateAbuse(server.url, userAccessToken, abuseId, {}, HttpStatusCode.FORBIDDEN_403)
await command.update({ token: userToken, abuseId, body: {}, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should fail with a bad abuse id', async function () {
await updateAbuse(server.url, server.accessToken, 45, {}, HttpStatusCode.NOT_FOUND_404)
await command.update({ abuseId: 45, body: {}, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
it('Should fail with a bad state', async function () {
const body = { state: 5 }
await updateAbuse(server.url, server.accessToken, abuseId, body, HttpStatusCode.BAD_REQUEST_400)
await command.update({ abuseId, body, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
it('Should fail with a bad moderation comment', async function () {
const body = { moderationComment: 'b'.repeat(3001) }
await updateAbuse(server.url, server.accessToken, abuseId, body, HttpStatusCode.BAD_REQUEST_400)
await command.update({ abuseId, body, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
it('Should succeed with the correct params', async function () {
const body = { state: AbuseState.ACCEPTED }
await updateAbuse(server.url, server.accessToken, abuseId, body)
await command.update({ abuseId, body })
})
})
@ -337,23 +331,23 @@ describe('Test abuses API validators', function () {
const message = 'my super message'
it('Should fail with an invalid abuse id', async function () {
await addAbuseMessage(server.url, userAccessToken2, 888, message, HttpStatusCode.NOT_FOUND_404)
await command.addMessage({ token: userToken2, abuseId: 888, message, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
it('Should fail with a non authenticated user', async function () {
await addAbuseMessage(server.url, 'fake_token', abuseId, message, HttpStatusCode.UNAUTHORIZED_401)
await command.addMessage({ token: 'fake_token', abuseId, message, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with an invalid logged in user', async function () {
await addAbuseMessage(server.url, userAccessToken2, abuseId, message, HttpStatusCode.FORBIDDEN_403)
await command.addMessage({ token: userToken2, abuseId, message, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should fail with an invalid message', async function () {
await addAbuseMessage(server.url, userAccessToken, abuseId, 'a'.repeat(5000), HttpStatusCode.BAD_REQUEST_400)
await command.addMessage({ token: userToken, abuseId, message: 'a'.repeat(5000), expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
it('Should suceed with the correct params', async function () {
const res = await addAbuseMessage(server.url, userAccessToken, abuseId, message)
const res = await command.addMessage({ token: userToken, abuseId, message })
messageId = res.body.abuseMessage.id
})
})
@ -361,61 +355,60 @@ describe('Test abuses API validators', function () {
describe('When listing abuse messages', function () {
it('Should fail with an invalid abuse id', async function () {
await listAbuseMessages(server.url, userAccessToken, 888, HttpStatusCode.NOT_FOUND_404)
await command.listMessages({ token: userToken, abuseId: 888, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
it('Should fail with a non authenticated user', async function () {
await listAbuseMessages(server.url, 'fake_token', abuseId, HttpStatusCode.UNAUTHORIZED_401)
await command.listMessages({ token: 'fake_token', abuseId, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with an invalid logged in user', async function () {
await listAbuseMessages(server.url, userAccessToken2, abuseId, HttpStatusCode.FORBIDDEN_403)
await command.listMessages({ token: userToken2, abuseId, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should succeed with the correct params', async function () {
await listAbuseMessages(server.url, userAccessToken, abuseId)
await command.listMessages({ token: userToken, abuseId })
})
})
describe('When deleting an abuse message', function () {
it('Should fail with an invalid abuse id', async function () {
await deleteAbuseMessage(server.url, userAccessToken, 888, messageId, HttpStatusCode.NOT_FOUND_404)
await command.deleteMessage({ token: userToken, abuseId: 888, messageId, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
it('Should fail with an invalid message id', async function () {
await deleteAbuseMessage(server.url, userAccessToken, abuseId, 888, HttpStatusCode.NOT_FOUND_404)
await command.deleteMessage({ token: userToken, abuseId, messageId: 888, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
it('Should fail with a non authenticated user', async function () {
await deleteAbuseMessage(server.url, 'fake_token', abuseId, messageId, HttpStatusCode.UNAUTHORIZED_401)
await command.deleteMessage({ token: 'fake_token', abuseId, messageId, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with an invalid logged in user', async function () {
await deleteAbuseMessage(server.url, userAccessToken2, abuseId, messageId, HttpStatusCode.FORBIDDEN_403)
await command.deleteMessage({ token: userToken2, abuseId, messageId, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should succeed with the correct params', async function () {
await deleteAbuseMessage(server.url, userAccessToken, abuseId, messageId)
await command.deleteMessage({ token: userToken, abuseId, messageId })
})
})
describe('When deleting a video abuse', function () {
it('Should fail with a non authenticated user', async function () {
await deleteAbuse(server.url, 'blabla', abuseId, HttpStatusCode.UNAUTHORIZED_401)
await command.delete({ token: 'blabla', abuseId, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with a non admin user', async function () {
await deleteAbuse(server.url, userAccessToken, abuseId, HttpStatusCode.FORBIDDEN_403)
await command.delete({ token: userToken, abuseId, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should fail with a bad abuse id', async function () {
await deleteAbuse(server.url, server.accessToken, 45, HttpStatusCode.NOT_FOUND_404)
await command.delete({ abuseId: 45, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
it('Should succeed with the correct params', async function () {
await deleteAbuse(server.url, server.accessToken, abuseId)
await command.delete({ abuseId })
})
})
@ -432,25 +425,20 @@ describe('Test abuses API validators', function () {
await doubleFollow(anotherServer, server)
const server2VideoId = await getVideoIdFromUUID(anotherServer.url, server.video.uuid)
await reportAbuse({
url: anotherServer.url,
token: anotherServer.accessToken,
reason: 'remote server',
videoId: server2VideoId
})
await anotherServer.abusesCommand.report({ reason: 'remote server', videoId: server2VideoId })
await waitJobs([ server, anotherServer ])
const res = await getAdminAbusesList({ url: server.url, token: server.accessToken, sort: '-createdAt' })
remoteAbuseId = res.body.data[0].id
const body = await command.getAdminList({ sort: '-createdAt' })
remoteAbuseId = body.data[0].id
})
it('Should fail when listing abuse messages of a remote abuse', async function () {
await listAbuseMessages(server.url, server.accessToken, remoteAbuseId, HttpStatusCode.BAD_REQUEST_400)
await command.listMessages({ abuseId: remoteAbuseId, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
it('Should fail when creating abuse message of a remote abuse', async function () {
await addAbuseMessage(server.url, server.accessToken, remoteAbuseId, 'message', HttpStatusCode.BAD_REQUEST_400)
await command.addMessage({ abuseId: remoteAbuseId, message: 'message', expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
after(async function () {

631
server/tests/api/moderation/abuses.ts
View File

File diff suppressed because it is too large Load Diff

92
server/tests/api/notifications/moderation-notifications.ts
View File

@ -2,34 +2,10 @@
import 'mocha'
import { buildUUID } from '@server/helpers/uuid'
import { AbuseState } from '@shared/models'
import {
addAbuseMessage,
addUserSubscription,
addVideoCommentThread,
addVideoToBlacklist,
cleanupTests,
createUser,
follow,
generateUserAccessToken,
getAccount,
getCustomConfig,
getVideoCommentThreads,
getVideoIdFromUUID,
immutableAssign,
MockInstancesIndex,
registerUser,
removeVideoFromBlacklist,
reportAbuse,
unfollow,
updateAbuse,
updateCustomConfig,
updateCustomSubConfig,
wait
} from '../../../../shared/extra-utils'
import { ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index'
import { MockSmtpServer } from '../../../../shared/extra-utils/mock-servers/mock-email'
import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
import {
checkAbuseStateChange,
checkAutoInstanceFollowing,
CheckerBaseParams,
@ -43,12 +19,30 @@ import {
checkUserRegistered,
checkVideoAutoBlacklistForModerators,
checkVideoIsPublished,
prepareNotificationsTest
} from '../../../../shared/extra-utils/users/user-notifications'
import { addUserSubscription, removeUserSubscription } from '../../../../shared/extra-utils/users/user-subscriptions'
import { CustomConfig } from '../../../../shared/models/server'
import { UserNotification } from '../../../../shared/models/users'
import { VideoPrivacy } from '../../../../shared/models/videos'
cleanupTests,
createUser,
follow,
generateUserAccessToken,
getAccount,
getCustomConfig,
getVideoCommentThreads,
getVideoIdFromUUID,
immutableAssign,
MockInstancesIndex,
MockSmtpServer,
prepareNotificationsTest,
registerUser,
removeUserSubscription,
removeVideoFromBlacklist,
ServerInfo,
unfollow,
updateCustomConfig,
updateCustomSubConfig,
uploadVideo,
wait,
waitJobs
} from '@shared/extra-utils'
import { AbuseState, CustomConfig, UserNotification, VideoPrivacy } from '@shared/models'
describe('Test moderation notifications', function () {
let servers: ServerInfo[] = []
@ -89,7 +83,7 @@ describe('Test moderation notifications', function () {
const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
const video = resVideo.body.video
await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: video.id, reason: 'super reason' })
await servers[0].abusesCommand.report({ videoId: video.id, reason: 'super reason' })
await waitJobs(servers)
await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence')
@ -105,7 +99,7 @@ describe('Test moderation notifications', function () {
await waitJobs(servers)
const videoId = await getVideoIdFromUUID(servers[1].url, video.uuid)
await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, videoId, reason: 'super reason' })
await servers[1].abusesCommand.report({ videoId, reason: 'super reason' })
await waitJobs(servers)
await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence')
@ -122,7 +116,7 @@ describe('Test moderation notifications', function () {
await waitJobs(servers)
await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason: 'super reason' })
await servers[0].abusesCommand.report({ commentId: comment.id, reason: 'super reason' })
await waitJobs(servers)
await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence')
@ -140,7 +134,7 @@ describe('Test moderation notifications', function () {
const resComments = await getVideoCommentThreads(servers[1].url, video.uuid, 0, 5)
const commentId = resComments.body.data[0].id
await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, commentId, reason: 'super reason' })
await servers[1].abusesCommand.report({ commentId, reason: 'super reason' })
await waitJobs(servers)
await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence')
@ -153,7 +147,7 @@ describe('Test moderation notifications', function () {
const resUser = await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username, password: 'donald' })
const accountId = resUser.body.user.account.id
await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, accountId, reason: 'super reason' })
await servers[0].abusesCommand.report({ accountId, reason: 'super reason' })
await waitJobs(servers)
await checkNewAccountAbuseForModerators(baseParams, username, 'presence')
@ -169,7 +163,7 @@ describe('Test moderation notifications', function () {
await waitJobs(servers)
const resAccount = await getAccount(servers[1].url, username + '@' + servers[0].host)
await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, accountId: resAccount.body.id, reason: 'super reason' })
await servers[1].abusesCommand.report({ accountId: resAccount.body.id, reason: 'super reason' })
await waitJobs(servers)
await checkNewAccountAbuseForModerators(baseParams, username, 'presence')
@ -192,14 +186,14 @@ describe('Test moderation notifications', function () {
const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
const video = resVideo.body.video
const res = await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: video.id, reason: 'super reason' })
abuseId = res.body.abuse.id
const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason' })
abuseId = body.abuse.id
})
it('Should send a notification to reporter if the abuse has been accepted', async function () {
this.timeout(10000)
await updateAbuse(servers[0].url, servers[0].accessToken, abuseId, { state: AbuseState.ACCEPTED })
await servers[0].abusesCommand.update({ abuseId, body: { state: AbuseState.ACCEPTED } })
await waitJobs(servers)
await checkAbuseStateChange(baseParams, abuseId, AbuseState.ACCEPTED, 'presence')
@ -208,7 +202,7 @@ describe('Test moderation notifications', function () {
it('Should send a notification to reporter if the abuse has been rejected', async function () {
this.timeout(10000)
await updateAbuse(servers[0].url, servers[0].accessToken, abuseId, { state: AbuseState.REJECTED })
await servers[0].abusesCommand.update({ abuseId, body: { state: AbuseState.REJECTED } })
await waitJobs(servers)
await checkAbuseStateChange(baseParams, abuseId, AbuseState.REJECTED, 'presence')
@ -241,13 +235,13 @@ describe('Test moderation notifications', function () {
const video = resVideo.body.video
{
const res = await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: video.id, reason: 'super reason' })
abuseId = res.body.abuse.id
const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason' })
abuseId = body.abuse.id
}
{
const res = await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: video.id, reason: 'super reason 2' })
abuseId2 = res.body.abuse.id
const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason 2' })
abuseId2 = body.abuse.id
}
})
@ -255,7 +249,7 @@ describe('Test moderation notifications', function () {
this.timeout(10000)
const message = 'my super message to users'
await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, message)
await servers[0].abusesCommand.addMessage({ abuseId, message })
await waitJobs(servers)
await checkNewAbuseMessage(baseParamsUser, abuseId, message, 'user_1@example.com', 'presence')
@ -265,7 +259,7 @@ describe('Test moderation notifications', function () {
this.timeout(10000)
const message = 'my super message that should not be sent to the admin'
await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, message)
await servers[0].abusesCommand.addMessage({ abuseId, message })
await waitJobs(servers)
await checkNewAbuseMessage(baseParamsAdmin, abuseId, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'absence')
@ -275,7 +269,7 @@ describe('Test moderation notifications', function () {
this.timeout(10000)
const message = 'my super message to moderators'
await addAbuseMessage(servers[0].url, userAccessToken, abuseId2, message)
await servers[0].abusesCommand.addMessage({ token: userAccessToken, abuseId: abuseId2, message })
await waitJobs(servers)
await checkNewAbuseMessage(baseParamsAdmin, abuseId2, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'presence')
@ -285,7 +279,7 @@ describe('Test moderation notifications', function () {
this.timeout(10000)
const message = 'my super message that should not be sent to reporter'
await addAbuseMessage(servers[0].url, userAccessToken, abuseId2, message)
await servers[0].abusesCommand.addMessage({ token: userAccessToken, abuseId: abuseId2, message })
await waitJobs(servers)
await checkNewAbuseMessage(baseParamsUser, abuseId2, message, 'user_1@example.com', 'absence')

3
server/tests/api/server/email.ts
View File

@ -12,7 +12,6 @@ import {
createUser,
flushAndRunServer,
removeVideoFromBlacklist,
reportAbuse,
resetPassword,
ServerInfo,
setAccessTokensToServers,
@ -190,7 +189,7 @@ describe('Test emails', function () {
this.timeout(10000)
const reason = 'my super bad reason'
await reportAbuse({ url: server.url, token: server.accessToken, videoId, reason })
await server.abusesCommand.report({ videoId, reason })
await waitJobs(server)
expect(emails).to.have.lengthOf(3)

28
server/tests/api/users/users.ts
View File

@ -2,9 +2,7 @@
import 'mocha'
import * as chai from 'chai'
import { AbuseState, AbuseUpdate, MyUser, User, UserRole, Video, VideoPlaylistType } from '@shared/models'
import { CustomConfig, OAuth2ErrorCode } from '@shared/models/server'
import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import { HttpStatusCode } from '@shared/core-utils'
import {
addVideoCommentThread,
blockUser,
@ -13,13 +11,14 @@ import {
createUser,
deleteMe,
flushAndRunServer,
follow,
getAccountRatings,
getAdminAbusesList,
getBlacklistedVideosList,
getCustomConfig,
getMyUserInformation,
getMyUserVideoQuotaUsed,
getMyUserVideoRating,
getMyVideos,
getUserInformation,
getUsersList,
getUsersListPaginationAndSort,
@ -28,18 +27,19 @@ import {
installPlugin,
killallServers,
login,
logout,
makePutBodyRequest,
rateVideo,
refreshToken,
registerUserWithChannel,
removeUser,
removeVideo,
reportAbuse,
reRunServer,
ServerInfo,
setAccessTokensToServers,
setTokenField,
testImage,
unblockUser,
updateAbuse,
updateCustomSubConfig,
updateMyAvatar,
updateMyUser,
@ -47,11 +47,8 @@ import {
uploadVideo,
userLogin,
waitJobs
} from '../../../../shared/extra-utils'
import { follow } from '../../../../shared/extra-utils/server/follows'
import { logout, refreshToken, setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
import { getMyVideos } from '../../../../shared/extra-utils/videos/videos'
import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
} from '@shared/extra-utils'
import { AbuseState, CustomConfig, MyUser, OAuth2ErrorCode, User, UserAdminFlag, UserRole, Video, VideoPlaylistType } from '@shared/models'
const expect = chai.expect
@ -1002,10 +999,10 @@ describe('Test users', function () {
it('Should report correct abuses counts', async function () {
const reason = 'my super bad reason'
await reportAbuse({ url: server.url, token: user17AccessToken, videoId, reason })
await server.abusesCommand.report({ token: user17AccessToken, videoId, reason })
const res1 = await getAdminAbusesList({ url: server.url, token: server.accessToken })
const abuseId = res1.body.data[0].id
const body1 = await server.abusesCommand.getAdminList()
const abuseId = body1.data[0].id
const res2 = await getUserInformation(server.url, server.accessToken, user17Id, true)
const user2: User = res2.body
@ -1013,8 +1010,7 @@ describe('Test users', function () {
expect(user2.abusesCount).to.equal(1) // number of incriminations
expect(user2.abusesCreatedCount).to.equal(1) // number of reports created
const body: AbuseUpdate = { state: AbuseState.ACCEPTED }
await updateAbuse(server.url, server.accessToken, abuseId, body)
await server.abusesCommand.update({ abuseId, body: { state: AbuseState.ACCEPTED } })
const res3 = await getUserInformation(server.url, server.accessToken, user17Id, true)
const user3: User = res3.body

2
shared/extra-utils/index.ts
View File

@ -5,8 +5,8 @@ export * from './feeds'
export * from './logs'
export * from './miscs'
export * from './mock-servers'
export * from './moderation'
export * from './moderation/abuses'
export * from './plugins/mock-blocklist'
export * from './requests/check-api-params'

205
shared/extra-utils/moderation/abuses-command.ts Normal file
View File

@ -0,0 +1,205 @@
import { pick } from 'lodash'
import {
AbuseFilter,
AbuseMessage,
AbusePredefinedReasonsString,
AbuseState,
AbuseUpdate,
AbuseVideoIs,
AdminAbuse,
ResultList,
UserAbuse
} from '@shared/models'
import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
import { AbstractCommand, OverrideCommandOptions } from '../shared'
import { unwrapBody } from '../requests/requests'
export class AbusesCommand extends AbstractCommand {
report (options: OverrideCommandOptions & {
reason: string
accountId?: number
videoId?: number
commentId?: number
predefinedReasons?: AbusePredefinedReasonsString[]
startAt?: number
endAt?: number
}) {
const path = '/api/v1/abuses'
const video = options.videoId
? {
id: options.videoId,
startAt: options.startAt,
endAt: options.endAt
}
: undefined
const comment = options.commentId
? { id: options.commentId }
: undefined
const account = options.accountId
? { id: options.accountId }
: undefined
const body = {
account,
video,
comment,
reason: options.reason,
predefinedReasons: options.predefinedReasons
}
return unwrapBody<{ abuse: { id: number } }>(this.postBodyRequest({
...options,
path,
fields: body,
defaultExpectedStatus: HttpStatusCode.OK_200
}))
}
getAdminList (options: OverrideCommandOptions & {
start?: number
count?: number
sort?: string
id?: number
predefinedReason?: AbusePredefinedReasonsString
search?: string
filter?: AbuseFilter
state?: AbuseState
videoIs?: AbuseVideoIs
searchReporter?: string
searchReportee?: string
searchVideo?: string
searchVideoChannel?: string
} = {}) {
const toPick = [
'count',
'filter',
'id',
'predefinedReason',
'search',
'searchReportee',
'searchReporter',
'searchVideo',
'searchVideoChannel',
'sort',
'start',
'state',
'videoIs'
]
const path = '/api/v1/abuses'
const defaultQuery = { sort: 'createdAt' }
const query = { ...defaultQuery, ...pick(options, toPick) }
return this.getRequestBody<ResultList<AdminAbuse>>({
...options,
path,
query,
defaultExpectedStatus: HttpStatusCode.OK_200
})
}
getUserList (options: OverrideCommandOptions & {
start?: number
count?: number
sort?: string
id?: number
search?: string
state?: AbuseState
}) {
const toPick = [
'id',
'search',
'state',
'start',
'count',
'sort'
]
const path = '/api/v1/users/me/abuses'
const defaultQuery = { sort: 'createdAt' }
const query = { ...defaultQuery, ...pick(options, toPick) }
return this.getRequestBody<ResultList<UserAbuse>>({
...options,
path,
query,
defaultExpectedStatus: HttpStatusCode.OK_200
})
}
update (options: OverrideCommandOptions & {
abuseId: number
body: AbuseUpdate
}) {
const { abuseId, body } = options
const path = '/api/v1/abuses/' + abuseId
return this.putBodyRequest({
...options,
path,
fields: body,
defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
})
}
delete (options: OverrideCommandOptions & {
abuseId: number
}) {
const { abuseId } = options
const path = '/api/v1/abuses/' + abuseId
return this.deleteRequest({ ...options, path, defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 })
}
listMessages (options: OverrideCommandOptions & {
abuseId: number
}) {
const { abuseId } = options
const path = '/api/v1/abuses/' + abuseId + '/messages'
return this.getRequestBody<ResultList<AbuseMessage>>({ ...options, path, defaultExpectedStatus: HttpStatusCode.OK_200 })
}
deleteMessage (options: OverrideCommandOptions & {
abuseId: number
messageId: number
}) {
const { abuseId, messageId } = options
const path = '/api/v1/abuses/' + abuseId + '/messages/' + messageId
return this.deleteRequest({ ...options, path, defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 })
}
addMessage (options: OverrideCommandOptions & {
abuseId: number
message: string
}) {
const { abuseId, message } = options
const path = '/api/v1/abuses/' + abuseId + '/messages'
return this.postBodyRequest({
...options,
path,
fields: { message },
defaultExpectedStatus: HttpStatusCode.OK_200
})
}
}

244
shared/extra-utils/moderation/abuses.ts
View File

@ -1,244 +0,0 @@
import { AbuseFilter, AbusePredefinedReasonsString, AbuseState, AbuseUpdate, AbuseVideoIs } from '@shared/models'
import { makeDeleteRequest, makeGetRequest, makePostBodyRequest, makePutBodyRequest } from '../requests/requests'
import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
function reportAbuse (options: {
url: string
token: string
reason: string
accountId?: number
videoId?: number
commentId?: number
predefinedReasons?: AbusePredefinedReasonsString[]
startAt?: number
endAt?: number
statusCodeExpected?: number
}) {
const path = '/api/v1/abuses'
const video = options.videoId
? {
id: options.videoId,
startAt: options.startAt,
endAt: options.endAt
}
: undefined
const comment = options.commentId
? { id: options.commentId }
: undefined
const account = options.accountId
? { id: options.accountId }
: undefined
const body = {
account,
video,
comment,
reason: options.reason,
predefinedReasons: options.predefinedReasons
}
return makePostBodyRequest({
url: options.url,
path,
token: options.token,
fields: body,
statusCodeExpected: options.statusCodeExpected || HttpStatusCode.OK_200
})
}
function getAdminAbusesList (options: {
url: string
token: string
start?: number
count?: number
sort?: string
id?: number
predefinedReason?: AbusePredefinedReasonsString
search?: string
filter?: AbuseFilter
state?: AbuseState
videoIs?: AbuseVideoIs
searchReporter?: string
searchReportee?: string
searchVideo?: string
searchVideoChannel?: string
}) {
const {
url,
token,
start,
count,
sort,
id,
predefinedReason,
search,
filter,
state,
videoIs,
searchReporter,
searchReportee,
searchVideo,
searchVideoChannel
} = options
const path = '/api/v1/abuses'
const query = {
id,
predefinedReason,
search,
state,
filter,
videoIs,
start,
count,
sort: sort || 'createdAt',
searchReporter,
searchReportee,
searchVideo,
searchVideoChannel
}
return makeGetRequest({
url,
path,
token,
query,
statusCodeExpected: HttpStatusCode.OK_200
})
}
function getUserAbusesList (options: {
url: string
token: string
start?: number
count?: number
sort?: string
id?: number
search?: string
state?: AbuseState
}) {
const {
url,
token,
start,
count,
sort,
id,
search,
state
} = options
const path = '/api/v1/users/me/abuses'
const query = {
id,
search,
state,
start,
count,
sort: sort || 'createdAt'
}
return makeGetRequest({
url,
path,
token,
query,
statusCodeExpected: HttpStatusCode.OK_200
})
}
function updateAbuse (
url: string,
token: string,
abuseId: number,
body: AbuseUpdate,
statusCodeExpected = HttpStatusCode.NO_CONTENT_204
) {
const path = '/api/v1/abuses/' + abuseId
return makePutBodyRequest({
url,
token,
path,
fields: body,
statusCodeExpected
})
}
function deleteAbuse (url: string, token: string, abuseId: number, statusCodeExpected = HttpStatusCode.NO_CONTENT_204) {
const path = '/api/v1/abuses/' + abuseId
return makeDeleteRequest({
url,
token,
path,
statusCodeExpected
})
}
function listAbuseMessages (url: string, token: string, abuseId: number, statusCodeExpected = HttpStatusCode.OK_200) {
const path = '/api/v1/abuses/' + abuseId + '/messages'
return makeGetRequest({
url,
token,
path,
statusCodeExpected
})
}
function deleteAbuseMessage (
url: string,
token: string,
abuseId: number,
messageId: number,
statusCodeExpected = HttpStatusCode.NO_CONTENT_204
) {
const path = '/api/v1/abuses/' + abuseId + '/messages/' + messageId
return makeDeleteRequest({
url,
token,
path,
statusCodeExpected
})
}
function addAbuseMessage (url: string, token: string, abuseId: number, message: string, statusCodeExpected = HttpStatusCode.OK_200) {
const path = '/api/v1/abuses/' + abuseId + '/messages'
return makePostBodyRequest({
url,
token,
path,
fields: { message },
statusCodeExpected
})
}
// ---------------------------------------------------------------------------
export {
reportAbuse,
getAdminAbusesList,
updateAbuse,
deleteAbuse,
getUserAbusesList,
listAbuseMessages,
deleteAbuseMessage,
addAbuseMessage
}

1
shared/extra-utils/moderation/index.ts Normal file
View File

@ -0,0 +1 @@
export * from './abuses-command'

3
shared/extra-utils/server/servers.ts
View File

@ -12,6 +12,7 @@ import { CustomPagesCommand } from '../custom-pages'
import { FeedCommand } from '../feeds'
import { LogsCommand } from '../logs'
import { buildServerDirectory, getFileSize, isGithubCI, root, wait } from '../miscs/miscs'
import { AbusesCommand } from '../moderation'
import { makeGetRequest } from '../requests/requests'
interface ServerInfo {
@ -71,6 +72,7 @@ interface ServerInfo {
customPageCommand?: CustomPagesCommand
feedCommand?: FeedCommand
logsCommand?: LogsCommand
abusesCommand?: AbusesCommand
}
function parallelTests () {
@ -281,6 +283,7 @@ async function runServer (server: ServerInfo, configOverrideArg?: any, args = []
server.customPageCommand = new CustomPagesCommand(server)
server.feedCommand = new FeedCommand(server)
server.logsCommand = new LogsCommand(server)
server.abusesCommand = new AbusesCommand(server)
res(server)
})

6
shared/extra-utils/shared/abstract-command.ts
View File

@ -1,5 +1,5 @@
import { HttpStatusCode } from '@shared/core-utils'
import { makeGetRequest, makePostBodyRequest, makePutBodyRequest, unwrapBody, unwrapText } from '../requests/requests'
import { makeDeleteRequest, makeGetRequest, makePostBodyRequest, makePutBodyRequest, unwrapBody, unwrapText } from '../requests/requests'
import { ServerInfo } from '../server/servers'
export interface OverrideCommandOptions {
@ -44,6 +44,10 @@ abstract class AbstractCommand {
return unwrapText(this.getRequest(options))
}
protected deleteRequest (options: CommonCommandOptions) {
return makeDeleteRequest(this.buildCommonRequestOptions(options))
}
protected putBodyRequest (options: CommonCommandOptions & {
fields?: { [ fieldName: string ]: any }
}) {

1
tsconfig.json
View File

@ -8,6 +8,7 @@
"emitDecoratorMetadata": true,
"importHelpers": true,
"removeComments": true,
"strictBindCallApply": true,
"outDir": "./dist",
"lib": [
"dom",