From 5a976a8c351d2a9e23ceee1e193fca2893b7f12d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 5 May 2017 17:35:58 +0200 Subject: [PATCH] Server: move requests lib in their own directory --- server/helpers/requests.js | 2 +- server/lib/friends.js | 6 +++--- server/lib/{ => request}/base-request-scheduler.js | 8 ++++---- server/lib/{ => request}/request-scheduler.js | 6 +++--- server/lib/{ => request}/request-video-event-scheduler.js | 4 ++-- server/lib/{ => request}/request-video-qadu-scheduler.js | 6 +++--- server/middlewares/secure.js | 2 ++ 7 files changed, 18 insertions(+), 16 deletions(-) rename server/lib/{ => request}/base-request-scheduler.js (94%) rename server/lib/{ => request}/request-scheduler.js (93%) rename server/lib/{ => request}/request-video-event-scheduler.js (96%) rename server/lib/{ => request}/request-video-qadu-scheduler.js (95%) diff --git a/server/helpers/requests.js b/server/helpers/requests.js index 427864117..efe056937 100644 --- a/server/helpers/requests.js +++ b/server/helpers/requests.js @@ -40,7 +40,7 @@ function makeSecureRequest (params, callback) { let dataToSign if (params.data) { - dataToSign = dataToSign = params.data + dataToSign = params.data } else { // We do not have data to sign so we just take our host // It is not ideal but the connection should be in HTTPS diff --git a/server/lib/friends.js b/server/lib/friends.js index 1c7567527..6dd32406c 100644 --- a/server/lib/friends.js +++ b/server/lib/friends.js @@ -13,9 +13,9 @@ const logger = require('../helpers/logger') const peertubeCrypto = require('../helpers/peertube-crypto') const requests = require('../helpers/requests') const utils = require('../helpers/utils') -const RequestScheduler = require('./request-scheduler') -const RequestVideoQaduScheduler = require('./request-video-qadu-scheduler') -const RequestVideoEventScheduler = require('./request-video-event-scheduler') +const RequestScheduler = require('./request/request-scheduler') +const RequestVideoQaduScheduler = require('./request/request-video-qadu-scheduler') +const RequestVideoEventScheduler = require('./request/request-video-event-scheduler') const ENDPOINT_ACTIONS = constants.REQUEST_ENDPOINT_ACTIONS[constants.REQUEST_ENDPOINTS.VIDEOS] diff --git a/server/lib/base-request-scheduler.js b/server/lib/request/base-request-scheduler.js similarity index 94% rename from server/lib/base-request-scheduler.js rename to server/lib/request/base-request-scheduler.js index 7378971c8..782448340 100644 --- a/server/lib/base-request-scheduler.js +++ b/server/lib/request/base-request-scheduler.js @@ -2,10 +2,10 @@ const eachLimit = require('async/eachLimit') -const constants = require('../initializers/constants') -const db = require('../initializers/database') -const logger = require('../helpers/logger') -const requests = require('../helpers/requests') +const constants = require('../../initializers/constants') +const db = require('../../initializers/database') +const logger = require('../../helpers/logger') +const requests = require('../../helpers/requests') module.exports = class BaseRequestScheduler { constructor (options) { diff --git a/server/lib/request-scheduler.js b/server/lib/request/request-scheduler.js similarity index 93% rename from server/lib/request-scheduler.js rename to server/lib/request/request-scheduler.js index f6020e746..555ec3e54 100644 --- a/server/lib/request-scheduler.js +++ b/server/lib/request/request-scheduler.js @@ -1,9 +1,9 @@ 'use strict' -const constants = require('../initializers/constants') +const constants = require('../../initializers/constants') const BaseRequestScheduler = require('./base-request-scheduler') -const db = require('../initializers/database') -const logger = require('../helpers/logger') +const db = require('../../initializers/database') +const logger = require('../../helpers/logger') module.exports = class RequestScheduler extends BaseRequestScheduler { constructor () { diff --git a/server/lib/request-video-event-scheduler.js b/server/lib/request/request-video-event-scheduler.js similarity index 96% rename from server/lib/request-video-event-scheduler.js rename to server/lib/request/request-video-event-scheduler.js index c7631253a..e54d34f4a 100644 --- a/server/lib/request-video-event-scheduler.js +++ b/server/lib/request/request-video-event-scheduler.js @@ -1,8 +1,8 @@ 'use strict' const BaseRequestScheduler = require('./base-request-scheduler') -const constants = require('../initializers/constants') -const db = require('../initializers/database') +const constants = require('../../initializers/constants') +const db = require('../../initializers/database') module.exports = class RequestVideoEventScheduler extends BaseRequestScheduler { constructor () { diff --git a/server/lib/request-video-qadu-scheduler.js b/server/lib/request/request-video-qadu-scheduler.js similarity index 95% rename from server/lib/request-video-qadu-scheduler.js rename to server/lib/request/request-video-qadu-scheduler.js index a85d35160..17402b556 100644 --- a/server/lib/request-video-qadu-scheduler.js +++ b/server/lib/request/request-video-qadu-scheduler.js @@ -1,9 +1,9 @@ 'use strict' const BaseRequestScheduler = require('./base-request-scheduler') -const constants = require('../initializers/constants') -const db = require('../initializers/database') -const logger = require('../helpers/logger') +const constants = require('../../initializers/constants') +const db = require('../../initializers/database') +const logger = require('../../helpers/logger') module.exports = class RequestVideoQaduScheduler extends BaseRequestScheduler { constructor () { diff --git a/server/middlewares/secure.js b/server/middlewares/secure.js index b6e6d818b..7c5c72508 100644 --- a/server/middlewares/secure.js +++ b/server/middlewares/secure.js @@ -24,6 +24,8 @@ function checkSignature (req, res, next) { logger.debug('Checking signature from %s.', host) let signatureShouldBe + // If there is data in the body the sender used it for its signature + // If there is no data we just use its host as signature if (req.body.data) { signatureShouldBe = req.body.data } else { -- 2.41.0