X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Factivitypub%2Fclient.ts;h=1982e171deae04b7a60a8c0b38fa396cf2d1bc14;hb=7d9ba5c08999c6482f0bc5e0c09c6f55b7724090;hp=62412cd6237676ed6d1d0631242f7fbf4902fd5a;hpb=f2f0eda543ab54eec0f6bcdd8ccf6e382d5cafb6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 62412cd62..1982e171d 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts @@ -1,11 +1,21 @@ -// Intercept ActivityPub client requests +import * as cors from 'cors' import * as 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, executeIfActivityPub, @@ -14,34 +24,27 @@ import { videosCustomGetValidator, videosShareValidator } from '../../middlewares' -import { getAccountVideoRateValidator, videoCommentGetValidator } from '../../middlewares/validators' +import { cacheRoute } from '../../middlewares/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 { AccountVideoRateModel } from '../../models/account/account-video-rate' +import { ActorFollowModel } from '../../models/actor/actor-follow' import { VideoModel } from '../../models/video/video' +import { VideoCaptionModel } from '../../models/video/video-caption' import { VideoCommentModel } from '../../models/video/video-comment' +import { VideoPlaylistModel } from '../../models/video/video-playlist' 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 { - getRateUrl, - getVideoCommentsActivityPubUrl, - getVideoDislikesActivityPubUrl, - getVideoLikesActivityPubUrl, - getVideoSharesActivityPubUrl -} from '../../lib/activitypub' -import { VideoCaptionModel } from '../../models/video/video-caption' -import { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator } from '../../middlewares/validators/redundancy' -import { getServerActor } from '../../helpers/utils' -import { buildDislikeActivity } from '../../lib/activitypub/send/send-dislike' -import { videoPlaylistElementAPGetValidator, videoPlaylistsGetValidator } from '../../middlewares/validators/videos/video-playlists' -import { VideoPlaylistModel } from '../../models/video/video-playlist' -import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model' -import { MAccountId, MActorId, MVideo, MVideoAPWithoutCaption } from '@server/typings/models' const activityPubClientRouter = express.Router() +activityPubClientRouter.use(cors()) + +// Intercept ActivityPub client requests -activityPubClientRouter.get('/accounts?/:name', +activityPubClientRouter.get( + [ '/accounts?/:name', '/accounts?/:name/video-channels' ], executeIfActivityPub, asyncMiddleware(localAccountValidator), accountController @@ -63,13 +66,13 @@ activityPubClientRouter.get('/accounts?/:name/playlists', ) activityPubClientRouter.get('/accounts?/:name/likes/:videoId', executeIfActivityPub, - asyncMiddleware(getAccountVideoRateValidator('like')), - getAccountVideoRate('like') + asyncMiddleware(getAccountVideoRateValidatorFactory('like')), + getAccountVideoRateFactory('like') ) activityPubClientRouter.get('/accounts?/:name/dislikes/:videoId', executeIfActivityPub, - asyncMiddleware(getAccountVideoRateValidator('dislike')), - getAccountVideoRate('dislike') + asyncMiddleware(getAccountVideoRateValidatorFactory('dislike')), + getAccountVideoRateFactory('dislike') ) activityPubClientRouter.get('/videos/watch/:id', @@ -85,7 +88,7 @@ activityPubClientRouter.get('/videos/watch/:id/activity', ) activityPubClientRouter.get('/videos/watch/:id/announces', executeIfActivityPub, - asyncMiddleware(videosCustomGetValidator('only-video')), + asyncMiddleware(videosCustomGetValidator('only-immutable-attributes')), asyncMiddleware(videoAnnouncesController) ) activityPubClientRouter.get('/videos/watch/:id/announces/:actorId', @@ -95,17 +98,17 @@ activityPubClientRouter.get('/videos/watch/:id/announces/:actorId', ) activityPubClientRouter.get('/videos/watch/:id/likes', executeIfActivityPub, - asyncMiddleware(videosCustomGetValidator('only-video')), + asyncMiddleware(videosCustomGetValidator('only-immutable-attributes')), asyncMiddleware(videoLikesController) ) activityPubClientRouter.get('/videos/watch/:id/dislikes', executeIfActivityPub, - asyncMiddleware(videosCustomGetValidator('only-video')), + asyncMiddleware(videosCustomGetValidator('only-immutable-attributes')), asyncMiddleware(videoDislikesController) ) activityPubClientRouter.get('/videos/watch/:id/comments', executeIfActivityPub, - asyncMiddleware(videosCustomGetValidator('only-video')), + asyncMiddleware(videosCustomGetValidator('only-immutable-attributes')), asyncMiddleware(videoCommentsController) ) activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId', @@ -119,10 +122,11 @@ activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/activity asyncMiddleware(videoCommentController) ) -activityPubClientRouter.get('/video-channels/:name', +activityPubClientRouter.get( + [ '/video-channels/:name', '/video-channels/:name/videos' ], executeIfActivityPub, asyncMiddleware(localVideoChannelValidator), - asyncMiddleware(videoChannelController) + videoChannelController ) activityPubClientRouter.get('/video-channels/:name/followers', executeIfActivityPub, @@ -134,6 +138,11 @@ activityPubClientRouter.get('/video-channels/:name/following', asyncMiddleware(localVideoChannelValidator), asyncMiddleware(videoChannelFollowingController) ) +activityPubClientRouter.get('/video-channels/:name/playlists', + executeIfActivityPub, + asyncMiddleware(localVideoChannelValidator), + asyncMiddleware(videoChannelPlaylistsController) +) activityPubClientRouter.get('/redundancy/videos/:videoId/:resolution([0-9]+)(-:fps([0-9]+))?', executeIfActivityPub, @@ -151,10 +160,10 @@ activityPubClientRouter.get('/video-playlists/:playlistId', asyncMiddleware(videoPlaylistsGetValidator('all')), asyncMiddleware(videoPlaylistController) ) -activityPubClientRouter.get('/video-playlists/:playlistId/:videoId', +activityPubClientRouter.get('/video-playlists/:playlistId/videos/:playlistElementId', executeIfActivityPub, asyncMiddleware(videoPlaylistElementAPGetValidator), - asyncMiddleware(videoPlaylistElementController) + videoPlaylistElementController ) // --------------------------------------------------------------------------- @@ -187,20 +196,26 @@ 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) } -function getAccountVideoRate (rateType: VideoRateType) { +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) +} + +function getAccountVideoRateFactory (rateType: VideoRateType) { return (req: express.Request, res: express.Response) => { 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) } @@ -208,9 +223,9 @@ function getAccountVideoRate (rateType: VideoRateType) { 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 = await VideoModel.loadAndPopulateAccountAndServerAndTags(res.locals.onlyVideoWithRights.id) - 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) @@ -230,15 +245,17 @@ 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) - return activityPubResponse(activityPubContextify(activity), res) + return activityPubResponse(activityPubContextify(activity, 'Announce'), res) } async function videoAnnouncesController (req: express.Request, res: express.Response) { - const video = res.locals.onlyVideo + 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) @@ -247,41 +264,49 @@ async function videoAnnouncesController (req: express.Request, res: express.Resp data: result.rows.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.onlyVideo - const json = await videoRates(req, 'like', video, getVideoLikesActivityPubUrl(video)) + const video = res.locals.onlyImmutableVideo + + 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.onlyVideo - const json = await videoRates(req, 'dislike', video, getVideoDislikesActivityPubUrl(video)) + const video = res.locals.onlyImmutableVideo + + if (redirectIfNotOwned(video.url, res)) return + + const json = await videoRates(req, 'dislike', video, getLocalVideoDislikesActivityPubUrl(video)) return activityPubResponse(activityPubContextify(json), res) } async function videoCommentsController (req: express.Request, res: express.Response) { - const video = res.locals.onlyVideo + 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) } } - 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) } -async function videoChannelController (req: express.Request, res: express.Response) { +function videoChannelController (req: express.Request, res: express.Response) { const videoChannel = res.locals.videoChannel return activityPubResponse(activityPubContextify(videoChannel.toActivityPubObject()), res) @@ -304,7 +329,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 @@ -325,7 +350,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() @@ -334,15 +360,17 @@ async function videoRedundancyController (req: express.Request, res: express.Res if (req.path.endsWith('/activity')) { const data = buildCreateActivity(videoRedundancy.url, serverActor, object, audience) - return activityPubResponse(activityPubContextify(data), res) + return activityPubResponse(activityPubContextify(data, 'CacheFile'), res) } - return activityPubResponse(activityPubContextify(object), res) + return activityPubResponse(activityPubContextify(object, 'CacheFile'), 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) @@ -353,9 +381,11 @@ async function videoPlaylistController (req: express.Request, res: express.Respo return activityPubResponse(activityPubContextify(object), res) } -async function videoPlaylistElementController (req: express.Request, res: express.Response) { +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) } @@ -378,15 +408,15 @@ 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) } -function videoRates (req: express.Request, rateType: VideoRateType, video: MVideo, url: string) { +function videoRates (req: express.Request, rateType: VideoRateType, video: MVideoId, url: string) { const handler = async (start: number, count: number) => { const result = await AccountVideoRateModel.listAndCountAccountUrlsByVideoId(rateType, video.id, start, count) return { @@ -396,3 +426,12 @@ function videoRates (req: express.Request, rateType: VideoRateType, video: MVide } 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 +}