X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=60c94da81160d327df6fc9f3e02c829eef9b11fa;hb=74dc3bca2b14f5fd3fe80c394dfc34177a46db77;hp=8ded529728ea53927db1b9a89f7042afa8aee24f;hpb=65fcc3119c334b75dd13bcfdebf186afdc580a8f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 8ded52972..60c94da81 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,65 +1,80 @@ -import replay = require('request-replay') -import request = require('request') +import * as Bluebird from 'bluebird' +import { createWriteStream, remove } from 'fs-extra' +import * as request from 'request' +import { ACTIVITY_PUB } from '../initializers/constants' +import { processImage } from './image-utils' +import { join } from 'path' +import { logger } from './logger' +import { CONFIG } from '../initializers/config' -import { - RETRY_REQUESTS, - REMOTE_SCHEME, - CONFIG -} from '../initializers' -import { sign } from './peertube-crypto' +function doRequest ( + requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }, + bodyKBLimit = 1000 // 1MB +): Bluebird<{ response: request.RequestResponse, body: T }> { + if (requestOptions.activityPub === true) { + if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {} + requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER + } -function makeRetryRequest (params, callback) { - replay( - request(params, callback), - { - retries: RETRY_REQUESTS, - factor: 3, - maxTimeout: Infinity, - errorCodes: [ 'EADDRINFO', 'ETIMEDOUT', 'ECONNRESET', 'ESOCKETTIMEDOUT', 'ENOTFOUND', 'ECONNREFUSED' ] - } - ) + return new Bluebird<{ response: request.RequestResponse, body: T }>((res, rej) => { + request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body })) + .on('data', onRequestDataLengthCheck(bodyKBLimit)) + }) } -function makeSecureRequest (params, callback) { - const requestParams = { - url: REMOTE_SCHEME.HTTP + '://' + params.toPod.host + params.path, - json: {} - } +function doRequestAndSaveToFile ( + requestOptions: request.CoreOptions & request.UriOptions, + destPath: string, + bodyKBLimit = 10000 // 10MB +) { + return new Bluebird((res, rej) => { + const file = createWriteStream(destPath) + file.on('finish', () => res()) - if (params.method !== 'POST') { - return callback(new Error('Cannot make a secure request with a non POST method.')) - } + request(requestOptions) + .on('data', onRequestDataLengthCheck(bodyKBLimit)) + .on('error', err => { + file.close() - // Add signature if it is specified in the params - if (params.sign === true) { - const host = CONFIG.WEBSERVER.HOST + remove(destPath) + .catch(err => logger.error('Cannot remove %s after request failure.', destPath, { err })) - let dataToSign - if (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 - dataToSign = host - } - - requestParams.json['signature'] = { - host, // Which host we pretend to be - signature: sign(dataToSign) - } - } + return rej(err) + }) + .pipe(file) + }) +} - // If there are data informations - if (params.data) { - requestParams.json['data'] = params.data - } +async function downloadImage (url: string, destDir: string, destName: string, size: { width: number, height: number }) { + const tmpPath = join(CONFIG.STORAGE.TMP_DIR, 'pending-' + destName) + await doRequestAndSaveToFile({ method: 'GET', uri: url }, tmpPath) - request.post(requestParams, callback) + const destPath = join(destDir, destName) + await processImage({ path: tmpPath }, destPath, size) } // --------------------------------------------------------------------------- export { - makeRetryRequest, - makeSecureRequest + doRequest, + doRequestAndSaveToFile, + downloadImage +} + +// --------------------------------------------------------------------------- + +// Thanks to https://github.com/request/request/issues/2470#issuecomment-268929907 <3 +function onRequestDataLengthCheck (bodyKBLimit: number) { + let bufferLength = 0 + const bytesLimit = bodyKBLimit * 1000 + + return function (chunk) { + bufferLength += chunk.length + if (bufferLength > bytesLimit) { + this.abort() + + const error = new Error(`Response was too large - aborted after ${bytesLimit} bytes.`) + this.emit('error', error) + } + } }