Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix downloading a password protected original file

Chocobozzz5ce41082629e
diff --git a/server/core/controllers/api/videos/token.ts b/server/core/controllers/api/videos/token.ts
index 1898ef29eb..5ef40bc230 100644
--- a/server/core/controllers/api/videos/token.ts
+++ b/server/core/controllers/api/videos/token.ts
@@ -1,6 +1,7 @@
-import express from 'express'
+import { VideoToken } from '@peertube/peertube-models'
+import { getAuthUser } from '@server/helpers/express-utils.js'
import { VideoTokensManager } from '@server/lib/video-tokens-manager.js'
-import { VideoPrivacy, VideoToken } from '@peertube/peertube-models'
+import express from 'express'
import { asyncMiddleware, optionalAuthenticate, videoFileTokenValidator, videoGetValidatorFactory } from '../../../middlewares/index.js'
const tokenRouter = express.Router()
@@ -24,11 +25,9 @@ export {
function generateToken (req: express.Request, res: express.Response) {
const video = res.locals.videoWithBlacklist
- const files = video.privacy === VideoPrivacy.PASSWORD_PROTECTED
- ? VideoTokensManager.Instance.createForPasswordProtectedVideo({ videoUUID: video.uuid })
- : VideoTokensManager.Instance.createForAuthUser({ videoUUID: video.uuid, user: res.locals.oauth.token.User })
-
- return res.json({
- files
- } as VideoToken)
+ return res.json(
+ {
+ files: VideoTokensManager.Instance.create({ videoUUID: video.uuid, user: getAuthUser(res) })
+ } satisfies VideoToken
+ )
}
diff --git a/server/core/lib/video-tokens-manager.ts b/server/core/lib/video-tokens-manager.ts
index 57128721a8..821c7c1e38 100644
--- a/server/core/lib/video-tokens-manager.ts
+++ b/server/core/lib/video-tokens-manager.ts
@@ -9,7 +9,6 @@ import { buildUUID } from '@peertube/peertube-node-utils'
// ---------------------------------------------------------------------------
class VideoTokensManager {
-
private static instance: VideoTokensManager
private readonly lruCache = new LRUCache<string, { videoUUID: string, user?: MUserAccountUrl }>({
@@ -19,7 +18,7 @@ class VideoTokensManager {
private constructor () {}
- createForAuthUser (options: {
+ create (options: {
user: MUserAccountUrl
videoUUID: string
}) {
@@ -30,16 +29,6 @@ class VideoTokensManager {
return { token, expires }
}
- createForPasswordProtectedVideo (options: {
- videoUUID: string
- }) {
- const { token, expires } = this.generateVideoToken()
-
- this.lruCache.set(token, pick(options, [ 'videoUUID' ]))
-
- return { token, expires }
- }
-
hasToken (options: {
token: string
videoUUID: string
diff --git a/server/core/middlewares/validators/videos/video-token.ts b/server/core/middlewares/validators/videos/video-token.ts
index baae137edc..437b6d89cc 100644
--- a/server/core/middlewares/validators/videos/video-token.ts
+++ b/server/core/middlewares/validators/videos/video-token.ts
@@ -1,23 +1,16 @@
import express from 'express'
import { HttpStatusCode, VideoPrivacy } from '@peertube/peertube-models'
import { exists } from '@server/helpers/custom-validators/misc.js'
+import { getAuthUser } from '@server/helpers/express-utils.js'
-const videoFileTokenValidator = [
+export const videoFileTokenValidator = [
(req: express.Request, res: express.Response, next: express.NextFunction) => {
const video = res.locals.videoWithBlacklist
- if (video.privacy !== VideoPrivacy.PASSWORD_PROTECTED && !exists(res.locals.oauth.token.User)) {
- return res.fail({
- status: HttpStatusCode.UNAUTHORIZED_401,
- message: 'Not authenticated'
- })
+
+ if (video.privacy !== VideoPrivacy.PASSWORD_PROTECTED && !exists(getAuthUser(res))) {
+ return res.sendStatus(HttpStatusCode.UNAUTHORIZED_401)
}
return next()
}
]
-
-// ---------------------------------------------------------------------------
-
-export {
- videoFileTokenValidator
-}