From 49abbbbedca83b9031d3e2eb3ae9ad9b6a7d96ed Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Nov 2016 20:03:04 +0100 Subject: Pod URL -> pod host. HTTPS is required to make friends. Reason: in a network with mix http/https pods, https pods won't be able to play videos from http pod (insecure requests). --- server/middlewares/validators/pods.js | 4 ++-- server/middlewares/validators/remote.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/pods.js b/server/middlewares/validators/pods.js index fd3d1e2f2..4f8bad2f9 100644 --- a/server/middlewares/validators/pods.js +++ b/server/middlewares/validators/pods.js @@ -10,7 +10,7 @@ const validatorsPod = { } function makeFriends (req, res, next) { - req.checkBody('urls', 'Should have an array of unique urls').isEachUniqueUrlValid() + req.checkBody('hosts', 'Should have an array of unique hosts').isEachUniqueHostValid() logger.debug('Checking makeFriends parameters', { parameters: req.body }) @@ -32,7 +32,7 @@ function makeFriends (req, res, next) { } function podsAdd (req, res, next) { - req.checkBody('url', 'Should have an url').notEmpty().isURL({ require_protocol: true }) + req.checkBody('host', 'Should have an host').notEmpty().isURL() req.checkBody('publicKey', 'Should have a public key').notEmpty() // TODO: check we don't have it already diff --git a/server/middlewares/validators/remote.js b/server/middlewares/validators/remote.js index 8c29ef8ca..c6455e678 100644 --- a/server/middlewares/validators/remote.js +++ b/server/middlewares/validators/remote.js @@ -27,10 +27,10 @@ function remoteVideos (req, res, next) { } function signature (req, res, next) { - req.checkBody('signature.url', 'Should have a signature url').isURL() + req.checkBody('signature.host', 'Should have a signature host').isURL() req.checkBody('signature.signature', 'Should have a signature').notEmpty() - logger.debug('Checking signature parameters', { parameters: { signatureUrl: req.body.signature.url } }) + logger.debug('Checking signature parameters', { parameters: { signatureHost: req.body.signature.host } }) checkErrors(req, res, next) } -- cgit v1.2.3