Add TMP persistent directory

[github/Chocobozzz/PeerTube.git] / server / controllers / download.ts

diff --git a/server/controllers/download.ts b/server/controllers/download.ts
index abd1df26fe14216bd827b0622896e9dc002b5866..d675a2d6cd4bfc56fc11664194be8c5beaaa155f 100644 (file)
--- a/server/controllers/download.ts
+++ b/server/controllers/download.ts
@@ -5,6 +5,7 @@ import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache
 import { Hooks } from '@server/lib/plugins/hooks'
 import { VideoPathManager } from '@server/lib/video-path-manager'
 import { MStreamingPlaylist, MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
+import { addQueryParams, forceNumber } from '@shared/core-utils'
 import { HttpStatusCode, VideoStorage, VideoStreamingPlaylistType } from '@shared/models'
 import { STATIC_DOWNLOAD_PATHS } from '../initializers/constants'
 import { asyncMiddleware, optionalAuthenticate, videosDownloadValidator } from '../middlewares'
@@ -49,7 +50,12 @@ async function downloadTorrent (req: express.Request, res: express.Response) {
     })
   }
 
-  const allowParameters = { torrentPath: result.path, downloadName: result.downloadName }
+  const allowParameters = {
+    req,
+    res,
+    torrentPath: result.path,
+    downloadName: result.downloadName
+  }
 
   const allowedResult = await Hooks.wrapFun(
     isTorrentDownloadAllowed,
@@ -73,7 +79,12 @@ async function downloadVideoFile (req: express.Request, res: express.Response) {
     })
   }
 
-  const allowParameters = { video, videoFile }
+  const allowParameters = {
+    req,
+    res,
+    video,
+    videoFile
+  }
 
   const allowedResult = await Hooks.wrapFun(
     isVideoDownloadAllowed,
@@ -84,7 +95,7 @@ async function downloadVideoFile (req: express.Request, res: express.Response) {
   if (!checkAllowResult(res, allowParameters, allowedResult)) return
 
   if (videoFile.storage === VideoStorage.OBJECT_STORAGE) {
-    return res.redirect(videoFile.getObjectStorageUrl())
+    return redirectToObjectStorage({ req, res, video, file: videoFile })
   }
 
   await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), path => {
@@ -109,7 +120,13 @@ async function downloadHLSVideoFile (req: express.Request, res: express.Response
     })
   }
 
-  const allowParameters = { video, streamingPlaylist, videoFile }
+  const allowParameters = {
+    req,
+    res,
+    video,
+    streamingPlaylist,
+    videoFile
+  }
 
   const allowedResult = await Hooks.wrapFun(
     isVideoDownloadAllowed,
@@ -120,7 +137,7 @@ async function downloadHLSVideoFile (req: express.Request, res: express.Response
   if (!checkAllowResult(res, allowParameters, allowedResult)) return
 
   if (videoFile.storage === VideoStorage.OBJECT_STORAGE) {
-    return res.redirect(videoFile.getObjectStorageUrl())
+    return redirectToObjectStorage({ req, res, video, file: videoFile })
   }
 
   await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(streamingPlaylist), path => {
@@ -131,7 +148,7 @@ async function downloadHLSVideoFile (req: express.Request, res: express.Response
 }
 
 function getVideoFile (req: express.Request, files: MVideoFile[]) {
-  const resolution = parseInt(req.params.resolution, 10)
+  const resolution = forceNumber(req.params.resolution)
   return files.find(f => f.resolution === resolution)
 }
 
@@ -174,3 +191,20 @@ function checkAllowResult (res: express.Response, allowParameters: any, result?:
 
   return true
 }
+
+function redirectToObjectStorage (options: {
+  req: express.Request
+  res: express.Response
+  video: MVideo
+  file: MVideoFile
+}) {
+  const { req, res, video, file } = options
+
+  const baseUrl = file.getObjectStorageUrl(video)
+
+  const url = video.hasPrivateStaticPath() && req.query.videoFileToken
+    ? addQueryParams(baseUrl, { videoFileToken: req.query.videoFileToken })
+    : baseUrl
+
+  return res.redirect(url)
+}