X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=b556c392e262b321075afaa5c73d6dd79c9a7ea0;hb=f2eb23cd87cf32b8fe545178143b5f49e06a58da;hp=31cedd7689c6386d54a74519924df6eb9c0e2680;hpb=0d0e8dd0904b380b70e19ebcb4763d65601c4632;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index 31cedd768..b556c392e 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,97 +1,72 @@
-import * as replay from 'request-replay'
+import * as Bluebird from 'bluebird'
+import { createWriteStream, remove } from 'fs-extra'
 import * as request from 'request'
-import * as Promise from 'bluebird'
-
-import {
-  RETRY_REQUESTS,
-  REMOTE_SCHEME,
-  CONFIG
-} from '../initializers'
-import { PodInstance } from '../models'
-import { PodSignature } from '../../shared'
-import { signObject } from './peertube-crypto'
-import { createWriteStream } from 'fs'
-
-function doRequest (requestOptions: request.CoreOptions & request.UriOptions) {
-  return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
+import { ACTIVITY_PUB, PEERTUBE_VERSION, WEBSERVER } from '../initializers/constants'
+import { processImage } from './image-utils'
+import { join } from 'path'
+import { logger } from './logger'
+import { CONFIG } from '../initializers/config'
+
+function doRequest <T> (
+  requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean },
+  bodyKBLimit = 1000 // 1MB
+): Bluebird<{ response: request.RequestResponse, body: T }> {
+  if (!(requestOptions.headers)) requestOptions.headers = {}
+  requestOptions.headers['User-Agent'] = getUserAgent()
+
+  if (requestOptions.activityPub === true) {
+    requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER
+  }
+
+  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 doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
-  return new Promise<request.RequestResponse>((res, rej) => {
+function doRequestAndSaveToFile (
+  requestOptions: request.CoreOptions & request.UriOptions,
+  destPath: string,
+  bodyKBLimit = 10000 // 10MB
+) {
+  if (!requestOptions.headers) requestOptions.headers = {}
+  requestOptions.headers['User-Agent'] = getUserAgent()
+
+  return new Bluebird<void>((res, rej) => {
+    const file = createWriteStream(destPath)
+    file.on('finish', () => res())
+
     request(requestOptions)
-      .on('response', response => res(response as request.RequestResponse))
-      .on('error', err => rej(err))
-      .pipe(createWriteStream(destPath))
-  })
-}
+      .on('data', onRequestDataLengthCheck(bodyKBLimit))
+      .on('error', err => {
+        file.close()
 
-type MakeRetryRequestParams = {
-  url: string,
-  method: 'GET' | 'POST',
-  json: Object
-}
-function makeRetryRequest (params: MakeRetryRequestParams) {
-  return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
-    replay(
-      request(params, (err, response, body) => err ? rej(err) : res({ response, body })),
-      {
-        retries: RETRY_REQUESTS,
-        factor: 3,
-        maxTimeout: Infinity,
-        errorCodes: [ 'EADDRINFO', 'ETIMEDOUT', 'ECONNRESET', 'ESOCKETTIMEDOUT', 'ENOTFOUND', 'ECONNREFUSED' ]
-      }
-    )
+        remove(destPath)
+          .catch(err => logger.error('Cannot remove %s after request failure.', destPath, { err }))
+
+        return rej(err)
+      })
+      .pipe(file)
   })
 }
 
-type MakeSecureRequestParams = {
-  toPod: PodInstance
-  path: string
-  data?: Object
-}
-function makeSecureRequest (params: MakeSecureRequestParams) {
-  const requestParams: {
-    method: 'POST',
-    uri: string,
-    json: {
-      signature: PodSignature,
-      data: any
-    }
-  } = {
-    method: 'POST',
-    uri: REMOTE_SCHEME.HTTP + '://' + params.toPod.host + params.path,
-    json: {
-      signature: null,
-      data: null
-    }
-  }
+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)
 
-  const host = CONFIG.WEBSERVER.HOST
+  const destPath = join(destDir, destName)
 
-  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
-  }
+  try {
+    await processImage(tmpPath, destPath, size)
+  } catch (err) {
+    await remove(tmpPath)
 
-  sign(dataToSign).then(signature => {
-    requestParams.json.signature = {
-      host, // Which host we pretend to be
-      signature
-    }
-
-    // If there are data information
-    if (params.data) {
-      requestParams.json.data = params.data
-    }
+    throw err
+  }
+}
 
-    return doRequest(requestParams)
-  })
+function getUserAgent () {
+  return `PeerTube/${PEERTUBE_VERSION} (+${WEBSERVER.URL})`
 }
 
 // ---------------------------------------------------------------------------
@@ -99,6 +74,23 @@ function makeSecureRequest (params: MakeSecureRequestParams) {
 export {
   doRequest,
   doRequestAndSaveToFile,
-  makeRetryRequest,
-  makeSecureRequest
+  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)
+    }
+  }
 }