yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00
Code Issues Releases Wiki Activity

Pod URL -> pod host. HTTPS is required to make friends.

Browse source 
Reason: in a network with mix http/https pods, https pods won't be able
to play videos from http pod (insecure requests).
This commit is contained in:
Chocobozzz 2016-11-14 20:03:04 +01:00
parent 41b5da1d8c
commit 49abbbbedc
24 changed files with 167 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/controllers/api/remote.js
View file

@ -30,7 +30,7 @@ module.exports = router
function remoteVideos (req, res, next) {
const requests = req.body.data
const fromUrl = req.body.signature.url
const fromHost = req.body.signature.host
// We need to process in the same order to keep consistency
// TODO: optimization
@ -40,7 +40,7 @@ function remoteVideos (req, res, next) {
if (request.type === 'add') {
addRemoteVideo(videoData, callbackEach)
} else if (request.type === 'remove') {
removeRemoteVideo(videoData, fromUrl, callbackEach)
removeRemoteVideo(videoData, fromHost, callbackEach)
} else {
logger.error('Unkown remote request type %s.', request.type)
}
@ -62,16 +62,16 @@ function addRemoteVideo (videoToCreateData, callback) {
video.save(callback)
}
function removeRemoteVideo (videoToRemoveData, fromUrl, callback) {
function removeRemoteVideo (videoToRemoveData, fromHost, callback) {
// We need the list because we have to remove some other stuffs (thumbnail etc)
Video.listByUrlAndRemoteId(fromUrl, videoToRemoveData.remoteId, function (err, videosList) {
Video.listByHostAndRemoteId(fromHost, videoToRemoveData.remoteId, function (err, videosList) {
if (err) {
logger.error('Cannot list videos from url and magnets.', { error: err })
logger.error('Cannot list videos from host and magnets.', { error: err })
return callback(err)
}
if (videosList.length === 0) {
logger.error('No remote video was found for this pod.', { magnetUri: videoToRemoveData.magnetUri, podUrl: fromUrl })
logger.error('No remote video was found for this pod.', { magnetUri: videoToRemoveData.magnetUri, podHost: fromHost })
}
each(videosList, function (video, callbackEach) {