From efc32059d980c51793e8e9ac0fb6a885a8026f94 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 16 Nov 2017 11:08:25 +0100 Subject: Send server announce when users upload a video --- server/helpers/activitypub.ts | 30 +++++++++++++++++++++- server/helpers/core-utils.ts | 9 +------ .../custom-validators/activitypub/videos.ts | 15 ++++++----- server/helpers/peertube-crypto.ts | 10 ++++---- server/helpers/utils.ts | 18 ++++++++----- 5 files changed, 55 insertions(+), 27 deletions(-) (limited to 'server/helpers') diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts index de20ba55d..b376b8ca2 100644 --- a/server/helpers/activitypub.ts +++ b/server/helpers/activitypub.ts @@ -1,15 +1,19 @@ import { join } from 'path' import * as request from 'request' +import * as Sequelize from 'sequelize' import * as url from 'url' import { ActivityIconObject } from '../../shared/index' import { ActivityPubActor } from '../../shared/models/activitypub/activitypub-actor' import { ResultList } from '../../shared/models/result-list.model' import { database as db, REMOTE_SCHEME } from '../initializers' import { ACTIVITY_PUB_ACCEPT_HEADER, CONFIG, STATIC_PATHS } from '../initializers/constants' +import { sendAnnounce } from '../lib/activitypub/send-request' +import { VideoChannelInstance } from '../models/video/video-channel-interface' import { VideoInstance } from '../models/video/video-interface' import { isRemoteAccountValid } from './custom-validators' import { logger } from './logger' import { doRequest, doRequestAndSaveToFile } from './requests' +import { getServerAccount } from './utils' function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObject) { const thumbnailName = video.getThumbnailName() @@ -22,6 +26,28 @@ function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObjec return doRequestAndSaveToFile(options, thumbnailPath) } +async function shareVideoChannelByServer (videoChannel: VideoChannelInstance, t: Sequelize.Transaction) { + const serverAccount = await getServerAccount() + + await db.VideoChannelShare.create({ + accountId: serverAccount.id, + videoChannelId: videoChannel.id + }, { transaction: t }) + + return sendAnnounce(serverAccount, videoChannel, t) +} + +async function shareVideoByServer (video: VideoInstance, t: Sequelize.Transaction) { + const serverAccount = await getServerAccount() + + await db.VideoShare.create({ + accountId: serverAccount.id, + videoId: video.id + }, { transaction: t }) + + return sendAnnounce(serverAccount, video, t) +} + function getActivityPubUrl (type: 'video' | 'videoChannel' | 'account' | 'videoAbuse', id: string) { if (type === 'video') return CONFIG.WEBSERVER.URL + '/videos/watch/' + id else if (type === 'videoChannel') return CONFIG.WEBSERVER.URL + '/video-channels/' + id @@ -172,7 +198,9 @@ export { generateThumbnailFromUrl, getOrCreateAccount, fetchRemoteVideoPreview, - fetchRemoteVideoDescription + fetchRemoteVideoDescription, + shareVideoChannelByServer, + shareVideoByServer } // --------------------------------------------------------------------------- diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index d8748e1d7..4ff07848c 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts @@ -20,9 +20,6 @@ import * as bcrypt from 'bcrypt' import * as createTorrent from 'create-torrent' import * as rimraf from 'rimraf' import * as pem from 'pem' -import * as jsonld from 'jsonld' -import * as jsig from 'jsonld-signatures' -jsig.use('jsonld', jsonld) function isTestInstance () { return process.env.NODE_ENV === 'test' @@ -120,8 +117,6 @@ const bcryptHashPromise = promisify2(bcrypt.hash) const createTorrentPromise = promisify2(createTorrent) const rimrafPromise = promisify1WithVoid(rimraf) const statPromise = promisify1(stat) -const jsonldSignPromise = promisify2(jsig.sign) -const jsonldVerifyPromise = promisify2(jsig.verify) // --------------------------------------------------------------------------- @@ -150,7 +145,5 @@ export { bcryptHashPromise, createTorrentPromise, rimrafPromise, - statPromise, - jsonldSignPromise, - jsonldVerifyPromise + statPromise } diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts index 9ddacd601..89c49b0df 100644 --- a/server/helpers/custom-validators/activitypub/videos.ts +++ b/server/helpers/custom-validators/activitypub/videos.ts @@ -34,7 +34,7 @@ function isActivityPubVideoDurationValid (value: string) { typeof value === 'string' && value.startsWith('PT') && value.endsWith('S') && - isVideoDurationValid(value.replace(/[^0-9]+/, '')) + isVideoDurationValid(value.replace(/[^0-9]+/g, '')) } function isVideoTorrentObjectValid (video: any) { @@ -46,13 +46,14 @@ function isVideoTorrentObjectValid (video: any) { isRemoteIdentifierValid(video.category) && isRemoteIdentifierValid(video.licence) && isRemoteIdentifierValid(video.language) && - isVideoViewsValid(video.video) && + isVideoViewsValid(video.views) && isVideoNSFWValid(video.nsfw) && isDateValid(video.published) && isDateValid(video.updated) && isRemoteVideoContentValid(video.mediaType, video.content) && isRemoteVideoIconValid(video.icon) && - setValidRemoteVideoUrls(video.url) + setValidRemoteVideoUrls(video) && + video.url.length !== 0 } function isVideoFlagValid (activity: any) { @@ -132,8 +133,8 @@ function isRemoteVideoIconValid (icon: any) { return icon.type === 'Image' && isVideoUrlValid(icon.url) && icon.mediaType === 'image/jpeg' && - validator.isInt(icon.width, { min: 0 }) && - validator.isInt(icon.height, { min: 0 }) + validator.isInt(icon.width + '', { min: 0 }) && + validator.isInt(icon.height + '', { min: 0 }) } function setValidRemoteVideoUrls (video: any) { @@ -149,6 +150,6 @@ function isRemoteVideoUrlValid (url: any) { return url.type === 'Link' && ACTIVITY_PUB.VIDEO_URL_MIME_TYPES.indexOf(url.mimeType) !== -1 && isVideoUrlValid(url.url) && - validator.isInt(url.width, { min: 0 }) && - validator.isInt(url.size, { min: 0 }) + validator.isInt(url.width + '', { min: 0 }) && + validator.isInt(url.size + '', { min: 0 }) } diff --git a/server/helpers/peertube-crypto.ts b/server/helpers/peertube-crypto.ts index 6d50e446f..04a8d5681 100644 --- a/server/helpers/peertube-crypto.ts +++ b/server/helpers/peertube-crypto.ts @@ -1,4 +1,6 @@ +import * as jsonld from 'jsonld' import * as jsig from 'jsonld-signatures' +jsig.use('jsonld', jsonld) import { PRIVATE_RSA_KEY_SIZE, @@ -9,9 +11,7 @@ import { bcryptGenSaltPromise, bcryptHashPromise, createPrivateKey, - getPublicKey, - jsonldSignPromise, - jsonldVerifyPromise + getPublicKey } from './core-utils' import { logger } from './logger' import { AccountInstance } from '../models/account/account-interface' @@ -45,7 +45,7 @@ function isSignatureVerified (fromAccount: AccountInstance, signedDocument: obje publicKeyOwner: publicKeyOwnerObject } - return jsonldVerifyPromise(signedDocument, options) + return jsig.promises.verify(signedDocument, options) .catch(err => { logger.error('Cannot check signature.', err) return false @@ -58,7 +58,7 @@ function signObject (byAccount: AccountInstance, data: any) { creator: byAccount.url } - return jsonldSignPromise(data, options) + return jsig.promises.sign(data, options) } function comparePassword (plainPassword: string, hashPassword: string) { diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index 39957c90f..3af14a68a 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -6,6 +6,7 @@ import { CONFIG, database as db } from '../initializers' import { ResultList } from '../../shared' import { VideoResolution } from '../../shared/models/videos/video-resolution.enum' import { AccountInstance } from '../models/account/account-interface' +import { logger } from './logger' function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) { return res.type('json').status(400).end() @@ -79,13 +80,18 @@ function resetSequelizeInstance (instance: Sequelize.Instance, savedFields: }) } -let applicationAccount: AccountInstance -async function getApplicationAccount () { - if (applicationAccount === undefined) { - applicationAccount = await db.Account.loadApplication() +let serverAccount: AccountInstance +async function getServerAccount () { + if (serverAccount === undefined) { + serverAccount = await db.Account.loadApplication() } - return Promise.resolve(applicationAccount) + if (!serverAccount) { + logger.error('Cannot load server account.') + process.exit(0) + } + + return Promise.resolve(serverAccount) } type SortType = { sortModel: any, sortValue: string } @@ -99,6 +105,6 @@ export { isSignupAllowed, computeResolutionsToTranscode, resetSequelizeInstance, - getApplicationAccount, + getServerAccount, SortType } -- cgit v1.2.3