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

Fix AP redirection

pull/1454/head
Chocobozzz 2018-11-30 15:06:06 +01:00
parent d7ea359d36
commit 1a8dd4da77
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/controllers/activitypub/client.ts
View File

@ -162,10 +162,10 @@ function getAccountVideoRate (rateType: VideoRateType) {
}
}
async function videoController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoController (req: express.Request, res: express.Response) {
const video: VideoModel = res.locals.video
if (video.isOwned() === false) return res.redirect(video.url)
if (video.url.startsWith(CONFIG.WEBSERVER.URL) === false) return res.redirect(video.url)
// We need captions to render AP object
video.VideoCaptions = await VideoCaptionModel.listVideoCaptions(video.id)
@ -181,17 +181,17 @@ async function videoController (req: express.Request, res: express.Response, nex
return activityPubResponse(activityPubContextify(videoObject), res)
}
async function videoAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoAnnounceController (req: express.Request, res: express.Response) {
const share = res.locals.videoShare as VideoShareModel
if (share.Actor.isOwned() === false) return res.redirect(share.url)
if (share.url.startsWith(CONFIG.WEBSERVER.URL) === false) return res.redirect(share.url)
const { activity } = await buildAnnounceWithVideoAudience(share.Actor, share, res.locals.video, undefined)
return activityPubResponse(activityPubContextify(activity), res)
}
async function videoAnnouncesController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoAnnouncesController (req: express.Request, res: express.Response) {
const video: VideoModel = res.locals.video
const handler = async (start: number, count: number) => {
@ -206,21 +206,21 @@ async function videoAnnouncesController (req: express.Request, res: express.Resp
return activityPubResponse(activityPubContextify(json), res)
}
async function videoLikesController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoLikesController (req: express.Request, res: express.Response) {
const video: VideoModel = res.locals.video
const json = await videoRates(req, 'like', video, getVideoLikesActivityPubUrl(video))
return activityPubResponse(activityPubContextify(json), res)
}
async function videoDislikesController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoDislikesController (req: express.Request, res: express.Response) {
const video: VideoModel = res.locals.video
const json = await videoRates(req, 'dislike', video, getVideoDislikesActivityPubUrl(video))
return activityPubResponse(activityPubContextify(json), res)
}
async function videoCommentsController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoCommentsController (req: express.Request, res: express.Response) {
const video: VideoModel = res.locals.video
const handler = async (start: number, count: number) => {
@ -235,30 +235,30 @@ async function videoCommentsController (req: express.Request, res: express.Respo
return activityPubResponse(activityPubContextify(json), res)
}
async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoChannelController (req: express.Request, res: express.Response) {
const videoChannel: VideoChannelModel = res.locals.videoChannel
return activityPubResponse(activityPubContextify(videoChannel.toActivityPubObject()), res)
}
async function videoChannelFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoChannelFollowersController (req: express.Request, res: express.Response) {
const videoChannel: VideoChannelModel = res.locals.videoChannel
const activityPubResult = await actorFollowers(req, videoChannel.Actor)
return activityPubResponse(activityPubContextify(activityPubResult), res)
}
async function videoChannelFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoChannelFollowingController (req: express.Request, res: express.Response) {
const videoChannel: VideoChannelModel = res.locals.videoChannel
const activityPubResult = await actorFollowing(req, videoChannel.Actor)
return activityPubResponse(activityPubContextify(activityPubResult), res)
}
async function videoCommentController (req: express.Request, res: express.Response, next: express.NextFunction) {
async function videoCommentController (req: express.Request, res: express.Response) {
const videoComment: VideoCommentModel = res.locals.videoComment
if (videoComment.isOwned() === false) return res.redirect(videoComment.url)
if (videoComment.url.startsWith(CONFIG.WEBSERVER.URL) === false) return res.redirect(videoComment.url)
const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined)
const isPublic = true // Comments are always public
@ -276,7 +276,7 @@ async function videoCommentController (req: express.Request, res: express.Respon
async function videoRedundancyController (req: express.Request, res: express.Response) {
const videoRedundancy: VideoRedundancyModel = res.locals.videoRedundancy
if (videoRedundancy.isOwned() === false) return res.redirect(videoRedundancy.url)
if (videoRedundancy.url.startsWith(CONFIG.WEBSERVER.URL) === false) return res.redirect(videoRedundancy.url)
const serverActor = await getServerActor()

44
server/tests/api/activitypub/client.ts
View File

@ -2,25 +2,42 @@
import * as chai from 'chai'
import 'mocha'
import { flushTests, killallServers, makeActivityPubGetRequest, runServer, ServerInfo, setAccessTokensToServers } from '../../utils'
import {
doubleFollow,
flushAndRunMultipleServers,
flushTests,
killallServers,
makeActivityPubGetRequest,
runServer,
ServerInfo,
setAccessTokensToServers, uploadVideo
} from '../../utils'
const expect = chai.expect
describe('Test activitypub', function () {
let server: ServerInfo = null
let servers: ServerInfo[] = []
let videoUUID: string
before(async function () {
this.timeout(30000)
await flushTests()
server = await runServer(1)
servers = await flushAndRunMultipleServers(2)
await setAccessTokensToServers([ server ])
await setAccessTokensToServers(servers)
{
const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video' })
videoUUID = res.body.video.uuid
}
await doubleFollow(servers[0], servers[1])
})
it('Should return the account object', async function () {
const res = await makeActivityPubGetRequest(server.url, '/accounts/root')
const res = await makeActivityPubGetRequest(servers[0].url, '/accounts/root')
const object = res.body
expect(object.type).to.equal('Person')
@ -29,7 +46,22 @@ describe('Test activitypub', function () {
expect(object.preferredUsername).to.equal('root')
})
it('Should return the video object', async function () {
const res = await makeActivityPubGetRequest(servers[0].url, '/videos/watch/' + videoUUID)
const object = res.body
expect(object.type).to.equal('Video')
expect(object.id).to.equal('http://localhost:9001/videos/watch/' + videoUUID)
expect(object.name).to.equal('video')
})
it('Should redirect to the origin video object', async function () {
const res = await makeActivityPubGetRequest(servers[1].url, '/videos/watch/' + videoUUID, 302)
expect(res.header.location).to.equal('http://localhost:9001/videos/watch/' + videoUUID)
})
after(async function () {
killallServers([ server ])
killallServers(servers)
})
})

5
server/tests/utils/server/activitypub.ts
View File

@ -1,11 +1,10 @@
import * as request from 'supertest'
function makeActivityPubGetRequest (url: string, path: string) {
function makeActivityPubGetRequest (url: string, path: string, expectedStatus = 200) {
return request(url)
.get(path)
.set('Accept', 'application/activity+json,text/html;q=0.9,\\*/\\*;q=0.8')
.expect(200)
.expect('Content-Type', /json/)
.expect(expectedStatus)
}
// ---------------------------------------------------------------------------