yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 10:19:35 +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

16
server/controllers/api/pods.js
View file

@ -20,14 +20,14 @@ const Pod = mongoose.model('Pod')
router.get('/', listPods)
router.post('/',
validators.podsAdd,
podsMiddleware.setBodyUrlPort,
podsMiddleware.setBodyHostPort,
addPods
)
router.post('/makefriends',
oAuth.authenticate,
admin.ensureIsAdmin,
validators.makeFriends,
podsMiddleware.setBodyUrlsPort,
podsMiddleware.setBodyHostsPort,
makeFriends
)
router.get('/quitfriends',
@ -84,17 +84,17 @@ function addPods (req, res, next) {
}
function listPods (req, res, next) {
Pod.list(function (err, podsUrlList) {
Pod.list(function (err, podsList) {
if (err) return next(err)
res.json(getFormatedPods(podsUrlList))
res.json(getFormatedPods(podsList))
})
}
function makeFriends (req, res, next) {
const urls = req.body.urls
const hosts = req.body.hosts
friends.makeFriends(urls, function (err) {
friends.makeFriends(hosts, function (err) {
if (err) {
logger.error('Could not make friends.', { error: err })
return
@ -107,11 +107,11 @@ function makeFriends (req, res, next) {
}
function removePods (req, res, next) {
const url = req.body.signature.url
const host = req.body.signature.host
waterfall([
function loadPod (callback) {
Pod.loadByUrl(url, callback)
Pod.loadByHost(host, callback)
},
function removePod (pod, callback) {