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

More robust channel change federation

pull/3800/head
Chocobozzz 2021-02-26 11:50:18 +01:00
parent 23ac334389
commit 92315d979c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/lib/activitypub/process/process-update.ts
View File

@ -62,7 +62,15 @@ async function processUpdateVideo (actor: MActorSignature, activity: ActivityUpd
return undefined
}
const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoObject.id, allowRefresh: false, fetchType: 'all' })
const { video, created } = await getOrCreateVideoAndAccountAndChannel({
videoObject: videoObject.id,
allowRefresh: false,
fetchType: 'all'
})
// We did not have this video, it has been created so no need to update
if (created) return
// Load new channel
const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject)
const account = actor.Account as MAccountIdActor

13
server/lib/activitypub/videos.ts
View File

@ -336,10 +336,15 @@ async function updateVideoFromAP (options: {
videoFieldsSave = video.toJSON()
// Check actor has the right to update the video
const videoChannel = video.VideoChannel
if (videoChannel.Account.id !== account.id) {
throw new Error('Account ' + account.Actor.url + ' does not own video channel ' + videoChannel.Actor.url)
// Check we can update the channel: we trust the remote server
const oldVideoChannel = video.VideoChannel
if (!oldVideoChannel.Actor.serverId || !channel.Actor.serverId) {
throw new Error('Cannot check old channel/new channel validity because `serverId` is null')
}
if (oldVideoChannel.Actor.serverId !== channel.Actor.serverId) {
throw new Error('New channel ' + channel.Actor.url + ' is not on the same server than new channel ' + oldVideoChannel.Actor.url)
}
const to = overrideTo || videoObject.to