X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Factivitypub%2Fclient.ts;h=c4d1be121e216820c6bcecb9ccc26abf9c7020d8;hb=d0800f7661f13fabe7bb6f4aa0ea50764f106405;hp=e44f1c6ab8440ac742c4bb768bcc8be4a2bd1660;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index e44f1c6ab..c4d1be121 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts @@ -1,50 +1,50 @@ -import * as express from 'express' -import * as cors from 'cors' +import cors from 'cors' +import express from 'express' +import { getServerActor } from '@server/models/application/application' +import { MAccountId, MActorId, MChannelId, MVideoId } from '@server/types/models' import { VideoPrivacy, VideoRateType } from '../../../shared/models/videos' +import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model' import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub' import { ROUTE_CACHE_LIFETIME, WEBSERVER } from '../../initializers/constants' -import { buildAnnounceWithVideoAudience, buildLikeActivity } from '../../lib/activitypub/send' import { audiencify, getAudience } from '../../lib/activitypub/audience' +import { buildAnnounceWithVideoAudience, buildLikeActivity } from '../../lib/activitypub/send' import { buildCreateActivity } from '../../lib/activitypub/send/send-create' +import { buildDislikeActivity } from '../../lib/activitypub/send/send-dislike' +import { + getLocalVideoCommentsActivityPubUrl, + getLocalVideoDislikesActivityPubUrl, + getLocalVideoLikesActivityPubUrl, + getLocalVideoSharesActivityPubUrl +} from '../../lib/activitypub/url' import { asyncMiddleware, + ensureIsLocalChannel, executeIfActivityPub, localAccountValidator, - localVideoChannelValidator, + videoChannelsNameWithHostValidator, videosCustomGetValidator, videosShareValidator } from '../../middlewares' +import { cacheRoute } from '../../middlewares/cache/cache' import { getAccountVideoRateValidatorFactory, videoCommentGetValidator } from '../../middlewares/validators' +import { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator } from '../../middlewares/validators/redundancy' +import { videoPlaylistElementAPGetValidator, videoPlaylistsGetValidator } from '../../middlewares/validators/videos/video-playlists' import { AccountModel } from '../../models/account/account' -import { ActorFollowModel } from '../../models/activitypub/actor-follow' -import { VideoModel } from '../../models/video/video' -import { VideoCommentModel } from '../../models/video/video-comment' -import { VideoShareModel } from '../../models/video/video-share' -import { cacheRoute } from '../../middlewares/cache' -import { activityPubResponse } from './utils' import { AccountVideoRateModel } from '../../models/account/account-video-rate' -import { - getVideoCommentsActivityPubUrl, - getVideoDislikesActivityPubUrl, - getVideoLikesActivityPubUrl, - getVideoSharesActivityPubUrl -} from '../../lib/activitypub/url' +import { ActorFollowModel } from '../../models/actor/actor-follow' import { VideoCaptionModel } from '../../models/video/video-caption' -import { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator } from '../../middlewares/validators/redundancy' -import { buildDislikeActivity } from '../../lib/activitypub/send/send-dislike' -import { videoPlaylistElementAPGetValidator, videoPlaylistsGetValidator } from '../../middlewares/validators/videos/video-playlists' +import { VideoCommentModel } from '../../models/video/video-comment' import { VideoPlaylistModel } from '../../models/video/video-playlist' -import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model' -import { MAccountId, MActorId, MVideoAPWithoutCaption, MVideoId } from '@server/typings/models' -import { getServerActor } from '@server/models/application/application' -import { getRateUrl } from '@server/lib/activitypub/video-rates' +import { VideoShareModel } from '../../models/video/video-share' +import { activityPubResponse } from './utils' const activityPubClientRouter = express.Router() activityPubClientRouter.use(cors()) // Intercept ActivityPub client requests -activityPubClientRouter.get('/accounts?/:name', +activityPubClientRouter.get( + [ '/accounts?/:name', '/accounts?/:name/video-channels', '/a/:name', '/a/:name/video-channels' ], executeIfActivityPub, asyncMiddleware(localAccountValidator), accountController @@ -75,15 +75,16 @@ activityPubClientRouter.get('/accounts?/:name/dislikes/:videoId', getAccountVideoRateFactory('dislike') ) -activityPubClientRouter.get('/videos/watch/:id', +activityPubClientRouter.get( + [ '/videos/watch/:id', '/w/:id' ], executeIfActivityPub, - asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS)), - asyncMiddleware(videosCustomGetValidator('only-video-with-rights')), + cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS), + asyncMiddleware(videosCustomGetValidator('all')), asyncMiddleware(videoController) ) activityPubClientRouter.get('/videos/watch/:id/activity', executeIfActivityPub, - asyncMiddleware(videosCustomGetValidator('only-video-with-rights')), + asyncMiddleware(videosCustomGetValidator('all')), asyncMiddleware(videoController) ) activityPubClientRouter.get('/videos/watch/:id/announces', @@ -122,21 +123,31 @@ activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/activity asyncMiddleware(videoCommentController) ) -activityPubClientRouter.get('/video-channels/:name', +activityPubClientRouter.get( + [ '/video-channels/:nameWithHost', '/video-channels/:nameWithHost/videos', '/c/:nameWithHost', '/c/:nameWithHost/videos' ], executeIfActivityPub, - asyncMiddleware(localVideoChannelValidator), + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, videoChannelController ) -activityPubClientRouter.get('/video-channels/:name/followers', +activityPubClientRouter.get('/video-channels/:nameWithHost/followers', executeIfActivityPub, - asyncMiddleware(localVideoChannelValidator), + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, asyncMiddleware(videoChannelFollowersController) ) -activityPubClientRouter.get('/video-channels/:name/following', +activityPubClientRouter.get('/video-channels/:nameWithHost/following', executeIfActivityPub, - asyncMiddleware(localVideoChannelValidator), + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, asyncMiddleware(videoChannelFollowingController) ) +activityPubClientRouter.get('/video-channels/:nameWithHost/playlists', + executeIfActivityPub, + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, + asyncMiddleware(videoChannelPlaylistsController) +) activityPubClientRouter.get('/redundancy/videos/:videoId/:resolution([0-9]+)(-:fps([0-9]+))?', executeIfActivityPub, @@ -149,12 +160,13 @@ activityPubClientRouter.get('/redundancy/streaming-playlists/:streamingPlaylistT asyncMiddleware(videoRedundancyController) ) -activityPubClientRouter.get('/video-playlists/:playlistId', +activityPubClientRouter.get( + [ '/video-playlists/:playlistId', '/videos/watch/playlist/:playlistId', '/w/p/:playlistId' ], executeIfActivityPub, asyncMiddleware(videoPlaylistsGetValidator('all')), asyncMiddleware(videoPlaylistController) ) -activityPubClientRouter.get('/video-playlists/:playlistId/:videoId', +activityPubClientRouter.get('/video-playlists/:playlistId/videos/:playlistElementId', executeIfActivityPub, asyncMiddleware(videoPlaylistElementAPGetValidator), videoPlaylistElementController @@ -190,7 +202,14 @@ async function accountFollowingController (req: express.Request, res: express.Re async function accountPlaylistsController (req: express.Request, res: express.Response) { const account = res.locals.account - const activityPubResult = await actorPlaylists(req, account) + const activityPubResult = await actorPlaylists(req, { account }) + + return activityPubResponse(activityPubContextify(activityPubResult), res) +} + +async function videoChannelPlaylistsController (req: express.Request, res: express.Response) { + const channel = res.locals.videoChannel + const activityPubResult = await actorPlaylists(req, { channel }) return activityPubResponse(activityPubContextify(activityPubResult), res) } @@ -200,20 +219,18 @@ function getAccountVideoRateFactory (rateType: VideoRateType) { const accountVideoRate = res.locals.accountVideoRate const byActor = accountVideoRate.Account.Actor - const url = getRateUrl(rateType, byActor, accountVideoRate.Video) const APObject = rateType === 'like' - ? buildLikeActivity(url, byActor, accountVideoRate.Video) - : buildDislikeActivity(url, byActor, accountVideoRate.Video) + ? buildLikeActivity(accountVideoRate.url, byActor, accountVideoRate.Video) + : buildDislikeActivity(accountVideoRate.url, byActor, accountVideoRate.Video) return activityPubResponse(activityPubContextify(APObject), res) } } async function videoController (req: express.Request, res: express.Response) { - // We need more attributes - const video = await VideoModel.loadForGetAPI({ id: res.locals.onlyVideoWithRights.id }) as MVideoAPWithoutCaption + const video = res.locals.videoAll - if (video.url.startsWith(WEBSERVER.URL) === false) return res.redirect(video.url) + if (redirectIfNotOwned(video.url, res)) return // We need captions to render AP object const captions = await VideoCaptionModel.listVideoCaptions(video.id) @@ -233,7 +250,7 @@ async function videoController (req: express.Request, res: express.Response) { async function videoAnnounceController (req: express.Request, res: express.Response) { const share = res.locals.videoShare - if (share.url.startsWith(WEBSERVER.URL) === false) return res.redirect(share.url) + if (redirectIfNotOwned(share.url, res)) return const { activity } = await buildAnnounceWithVideoAudience(share.Actor, share, res.locals.videoAll, undefined) @@ -243,28 +260,36 @@ async function videoAnnounceController (req: express.Request, res: express.Respo async function videoAnnouncesController (req: express.Request, res: express.Response) { const video = res.locals.onlyImmutableVideo + if (redirectIfNotOwned(video.url, res)) return + const handler = async (start: number, count: number) => { const result = await VideoShareModel.listAndCountByVideoId(video.id, start, count) return { - total: result.count, - data: result.rows.map(r => r.url) + total: result.total, + data: result.data.map(r => r.url) } } - const json = await activityPubCollectionPagination(getVideoSharesActivityPubUrl(video), handler, req.query.page) + const json = await activityPubCollectionPagination(getLocalVideoSharesActivityPubUrl(video), handler, req.query.page) return activityPubResponse(activityPubContextify(json), res) } async function videoLikesController (req: express.Request, res: express.Response) { const video = res.locals.onlyImmutableVideo - const json = await videoRates(req, 'like', video, getVideoLikesActivityPubUrl(video)) + + if (redirectIfNotOwned(video.url, res)) return + + const json = await videoRates(req, 'like', video, getLocalVideoLikesActivityPubUrl(video)) return activityPubResponse(activityPubContextify(json), res) } async function videoDislikesController (req: express.Request, res: express.Response) { const video = res.locals.onlyImmutableVideo - const json = await videoRates(req, 'dislike', video, getVideoDislikesActivityPubUrl(video)) + + if (redirectIfNotOwned(video.url, res)) return + + const json = await videoRates(req, 'dislike', video, getLocalVideoDislikesActivityPubUrl(video)) return activityPubResponse(activityPubContextify(json), res) } @@ -272,14 +297,17 @@ async function videoDislikesController (req: express.Request, res: express.Respo async function videoCommentsController (req: express.Request, res: express.Response) { const video = res.locals.onlyImmutableVideo + if (redirectIfNotOwned(video.url, res)) return + const handler = async (start: number, count: number) => { - const result = await VideoCommentModel.listAndCountByVideoId(video.id, start, count) + const result = await VideoCommentModel.listAndCountByVideoForAP(video, start, count) + return { - total: result.count, - data: result.rows.map(r => r.url) + total: result.total, + data: result.data.map(r => r.url) } } - const json = await activityPubCollectionPagination(getVideoCommentsActivityPubUrl(video), handler, req.query.page) + const json = await activityPubCollectionPagination(getLocalVideoCommentsActivityPubUrl(video), handler, req.query.page) return activityPubResponse(activityPubContextify(json), res) } @@ -307,7 +335,7 @@ async function videoChannelFollowingController (req: express.Request, res: expre async function videoCommentController (req: express.Request, res: express.Response) { const videoComment = res.locals.videoCommentFull - if (videoComment.url.startsWith(WEBSERVER.URL) === false) return res.redirect(videoComment.url) + if (redirectIfNotOwned(videoComment.url, res)) return const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined) const isPublic = true // Comments are always public @@ -328,7 +356,8 @@ async function videoCommentController (req: express.Request, res: express.Respon async function videoRedundancyController (req: express.Request, res: express.Response) { const videoRedundancy = res.locals.videoRedundancy - if (videoRedundancy.url.startsWith(WEBSERVER.URL) === false) return res.redirect(videoRedundancy.url) + + if (redirectIfNotOwned(videoRedundancy.url, res)) return const serverActor = await getServerActor() @@ -346,6 +375,8 @@ async function videoRedundancyController (req: express.Request, res: express.Res async function videoPlaylistController (req: express.Request, res: express.Response) { const playlist = res.locals.videoPlaylistFull + if (redirectIfNotOwned(playlist.url, res)) return + // We need more attributes playlist.OwnerAccount = await AccountModel.load(playlist.ownerAccountId) @@ -359,6 +390,8 @@ async function videoPlaylistController (req: express.Request, res: express.Respo function videoPlaylistElementController (req: express.Request, res: express.Response) { const videoPlaylistElement = res.locals.videoPlaylistElementAP + if (redirectIfNotOwned(videoPlaylistElement.url, res)) return + const json = videoPlaylistElement.toActivityPubObject() return activityPubResponse(activityPubContextify(json), res) } @@ -381,9 +414,9 @@ async function actorFollowers (req: express.Request, actor: MActorId) { return activityPubCollectionPagination(WEBSERVER.URL + req.path, handler, req.query.page) } -async function actorPlaylists (req: express.Request, account: MAccountId) { +async function actorPlaylists (req: express.Request, options: { account: MAccountId } | { channel: MChannelId }) { const handler = (start: number, count: number) => { - return VideoPlaylistModel.listPublicUrlsOfForAP(account.id, start, count) + return VideoPlaylistModel.listPublicUrlsOfForAP(options, start, count) } return activityPubCollectionPagination(WEBSERVER.URL + req.path, handler, req.query.page) @@ -393,9 +426,18 @@ function videoRates (req: express.Request, rateType: VideoRateType, video: MVide const handler = async (start: number, count: number) => { const result = await AccountVideoRateModel.listAndCountAccountUrlsByVideoId(rateType, video.id, start, count) return { - total: result.count, - data: result.rows.map(r => r.url) + total: result.total, + data: result.data.map(r => r.url) } } return activityPubCollectionPagination(url, handler, req.query.page) } + +function redirectIfNotOwned (url: string, res: express.Response) { + if (url.startsWith(WEBSERVER.URL) === false) { + res.redirect(url) + return true + } + + return false +}