X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Foauth.ts;h=9d0eaa51f277dbbbbb60cb52ac06145eb90e3500;hb=feb34f6b6b991046aab6a10df747b48fa4da07a7;hp=3faecdbcc69fbb818ef28189f22b04ffe32b6a9a;hpb=075f16caac5236cb04c98ae7b3a989766d764bb3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index 3faecdbcc..9d0eaa51f 100644
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,36 +1,74 @@
-import 'express-validator'
 import * as express from 'express'
-import * as OAuthServer from 'express-oauth-server'
+import { logger } from '../helpers/logger'
+import { Socket } from 'socket.io'
+import { getAccessToken } from '../lib/oauth-model'
+import { oAuthServer } from '@server/lib/auth'
 
-import { OAUTH_LIFETIME } from '../initializers'
-import { logger } from '../helpers'
+function authenticate (req: express.Request, res: express.Response, next: express.NextFunction, authenticateInQuery = false) {
+  const options = authenticateInQuery ? { allowBearerTokensInQueryString: true } : {}
 
-const oAuthServer = new OAuthServer({
-  accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
-  refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
-  model: require('../lib/oauth-model')
-})
-
-function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
-  oAuthServer.authenticate()(req, res, err => {
+  oAuthServer.authenticate(options)(req, res, err => {
     if (err) {
-      logger.error('Cannot authenticate.', err)
-      return res.sendStatus(500)
-    }
+      logger.warn('Cannot authenticate.', { err })
 
-    if (res.statusCode === 401 || res.statusCode === 400 || res.statusCode === 503) return res.end()
+      return res.status(err.status)
+        .json({
+          error: 'Token is invalid.',
+          code: err.name
+        })
+        .end()
+    }
 
     return next()
   })
 }
 
-function token (req: express.Request, res: express.Response, next: express.NextFunction) {
-  return oAuthServer.token()(req, res, next)
+function authenticateSocket (socket: Socket, next: (err?: any) => void) {
+  const accessToken = socket.handshake.query.accessToken
+
+  logger.debug('Checking socket access token %s.', accessToken)
+
+  if (!accessToken) return next(new Error('No access token provided'))
+
+  getAccessToken(accessToken)
+    .then(tokenDB => {
+      const now = new Date()
+
+      if (!tokenDB || tokenDB.accessTokenExpiresAt < now || tokenDB.refreshTokenExpiresAt < now) {
+        return next(new Error('Invalid access token.'))
+      }
+
+      socket.handshake.query.user = tokenDB.User
+
+      return next()
+    })
+    .catch(err => logger.error('Cannot get access token.', { err }))
+}
+
+function authenticatePromiseIfNeeded (req: express.Request, res: express.Response, authenticateInQuery = false) {
+  return new Promise(resolve => {
+    // Already authenticated? (or tried to)
+    if (res.locals.oauth && res.locals.oauth.token.User) return resolve()
+
+    if (res.locals.authenticated === false) return res.sendStatus(401)
+
+    authenticate(req, res, () => resolve(), authenticateInQuery)
+  })
+}
+
+function optionalAuthenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
+  if (req.header('authorization')) return authenticate(req, res, next)
+
+  res.locals.authenticated = false
+
+  return next()
 }
 
 // ---------------------------------------------------------------------------
 
 export {
   authenticate,
-  token
+  authenticateSocket,
+  authenticatePromiseIfNeeded,
+  optionalAuthenticate
 }