ActivityPub-federated video streaming platform using P2P directly in your web browser
Invalidate tokens on password change
Chocobozzza805abaafafb
diff --git a/packages/tests/src/api/server/email.ts b/packages/tests/src/api/server/email.tsindex cf5ab2afc8..e17dc914cf 100644--- a/packages/tests/src/api/server/email.ts+++ b/packages/tests/src/api/server/email.ts@@ -123,6 +123,13 @@ describe('Test emails', function () {it('Should reset the password', async function () {await server.users.resetPassword({ userId, verificationString, password: 'super_password2' })+ user.password = 'super_password2'+ })++ it('Should have invalided user tokens', async function () {+ await server.users.getMyQuotaUsed({ token: userAccessToken, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })++ userAccessToken = await server.login.getAccessToken(user)})it('Should not reset the password with the same verification string', async function () {diff --git a/packages/tests/src/api/users/users.ts b/packages/tests/src/api/users/users.tsindex 4036fa10ca..2422c4356c 100644--- a/packages/tests/src/api/users/users.ts+++ b/packages/tests/src/api/users/users.ts@@ -197,6 +197,12 @@ describe('Test users', function () {})describe('Update my account', function () {+ let otherToken: string++ before(async function () {+ otherToken = await server.login.getAccessToken(user)+ })+it('Should update my password', async function () {await server.users.updateMe({token: userToken,@@ -208,6 +214,11 @@ describe('Test users', function () {await server.login.login({ user })})+ it('Should have invalided other tokens, but not the one that changed the password', async function () {+ await server.users.getMyQuotaUsed({ token: userToken })+ await server.users.getMyQuotaUsed({ token: otherToken, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })+ })+it('Should be able to change the NSFW display attribute', async function () {await server.users.updateMe({token: userToken,diff --git a/server/core/controllers/api/users/index.ts b/server/core/controllers/api/users/index.tsindex efd6dddadc..e5c565dffe 100644--- a/server/core/controllers/api/users/index.ts+++ b/server/core/controllers/api/users/index.ts@@ -298,7 +298,9 @@ async function updateUser (req: express.Request, res: express.Response) {const user = await userToUpdate.save()// Destroy user token to refresh rights- if (roleChanged || body.password !== undefined) await OAuthTokenModel.deleteUserToken(userToUpdate.id)+ if (roleChanged || body.password !== undefined) {+ await OAuthTokenModel.deleteUserToken({ userId: userToUpdate.id })+ }auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView)@@ -333,6 +335,7 @@ async function resetUserPassword (req: express.Request, res: express.Response) {await user.save()await Redis.Instance.removePasswordVerificationString(user.id)+ await OAuthTokenModel.deleteUserToken({ userId: user.id })logger.info(`User ${user.username} reset its password.`, lTags(user.username))@@ -345,10 +348,10 @@ async function changeUserBlock (res: express.Response, user: MUserAccountDefaultuser.blocked = blockuser.blockedReason = reason || null- await sequelizeTypescript.transaction(async t => {- await OAuthTokenModel.deleteUserToken(user.id, t)+ await sequelizeTypescript.transaction(async transaction => {+ await OAuthTokenModel.deleteUserToken({ userId: user.id, transaction })- await user.save({ transaction: t })+ await user.save({ transaction })})Emailer.Instance.addUserBlockJob({ username: user.username, email: user.email, language: user.getLanguage(), blocked: block, reason })diff --git a/server/core/controllers/api/users/me.ts b/server/core/controllers/api/users/me.tsindex 7d6c4716c9..1f58c7a331 100644--- a/server/core/controllers/api/users/me.ts+++ b/server/core/controllers/api/users/me.ts@@ -52,6 +52,7 @@ import { UserModel } from '../../../models/user/user.js'import { VideoImportModel } from '../../../models/video/video-import.js'import { VideoModel } from '../../../models/video/video.js'import { retryTransactionWrapper } from '@server/helpers/database-utils.js'+import { OAuthTokenModel } from '@server/models/oauth/oauth-token.js'const auditLogger = auditLoggerFactory('users')@@ -325,6 +326,14 @@ async function updateMe (req: express.Request, res: express.Response) {}await sequelizeTypescript.transaction(async t => {+ if (body.password !== undefined) {+ await OAuthTokenModel.deleteUserToken({+ userId: user.id,+ accessTokenException: res.locals.oauth.token.accessToken,+ transaction: t+ })+ }+await user.save({ transaction: t })if (body.displayName === undefined && body.description === undefined) returndiff --git a/server/core/lib/auth/oauth-model.ts b/server/core/lib/auth/oauth-model.tsindex 05f2a65ebc..885cad9a31 100644--- a/server/core/lib/auth/oauth-model.ts+++ b/server/core/lib/auth/oauth-model.ts@@ -6,7 +6,6 @@ import { PluginManager } from '@server/lib/plugins/plugin-manager.js'import { AccountModel } from '@server/models/account/account.js'import { AuthenticatedResultUpdaterFieldName, RegisterServerAuthenticatedResult } from '@server/types/index.js'import { MOAuthClient } from '@server/types/models/index.js'-import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token.js'import { MUser, MUserDefault } from '@server/types/models/user/user.js'import express from 'express'import { logger } from '../../helpers/logger.js'@@ -46,11 +45,9 @@ async function getAccessToken (bearerToken: string) {if (!bearerToken) return undefined- let tokenModel: MOAuthTokenUser+ let tokenModel = TokensCache.Instance.getToken(bearerToken)- if (TokensCache.Instance.hasToken(bearerToken)) {- tokenModel = TokensCache.Instance.getByToken(bearerToken)- } else {+ if (!tokenModel) {tokenModel = await OAuthTokenModel.getByTokenAndPopulateUser(bearerToken)if (tokenModel) TokensCache.Instance.setToken(tokenModel)@@ -189,7 +186,7 @@ async function revokeToken (redirectUrl = await PluginManager.Instance.onLogout(token.User.pluginAuth, token.authName, token.User, req)}- TokensCache.Instance.clearCacheByToken(token.accessToken)+ TokensCache.Instance.deleteToken(token.accessToken)try {await token.destroy()diff --git a/server/core/lib/auth/tokens-cache.ts b/server/core/lib/auth/tokens-cache.tsindex 45d62bcafe..0476d00f0c 100644--- a/server/core/lib/auth/tokens-cache.ts+++ b/server/core/lib/auth/tokens-cache.ts@@ -3,13 +3,32 @@ import { MOAuthTokenUser } from '@server/types/models/index.js'import { LRU_CACHE } from '../../initializers/constants.js'export class TokensCache {-private static instance: TokensCache- private readonly accessTokenCache = new LRUCache<string, MOAuthTokenUser>({ max: LRU_CACHE.USER_TOKENS.MAX_SIZE })- private readonly userHavingToken = new LRUCache<number, string>({ max: LRU_CACHE.USER_TOKENS.MAX_SIZE })+ private readonly accessTokenCache = new LRUCache<string, MOAuthTokenUser>({+ onInsert: (tokenModel, token) => {+ if (this.userHavingToken.has(tokenModel.userId)) {+ this.userHavingToken.get(tokenModel.userId).add(token)+ } else {+ this.userHavingToken.set(tokenModel.userId, new Set([ token ]))+ }+ },+ dispose: (tokenModel, token) => {+ if (this.userHavingToken.has(tokenModel.userId)) {+ const set = this.userHavingToken.get(tokenModel.userId)+ set.delete(token)++ if (set.size === 0) {+ this.userHavingToken.delete(tokenModel.userId)+ }+ }+ },+ max: LRU_CACHE.USER_TOKENS.MAX_SIZE+ })++ private readonly userHavingToken = new Map<number, Set<string>>()- private constructor () { }+ private constructor () {}static get Instance () {return this.instance || (this.instance = new this())@@ -19,33 +38,26 @@ export class TokensCache {return this.accessTokenCache.has(token)}- getByToken (token: string) {+ getToken (token: string) {return this.accessTokenCache.get(token)}setToken (token: MOAuthTokenUser) {this.accessTokenCache.set(token.accessToken, token)- this.userHavingToken.set(token.userId, token.accessToken)}- deleteUserToken (userId: number) {- this.clearCacheByUserId(userId)+ deleteToken (token: string) {+ this.accessTokenCache.delete(token)}- clearCacheByUserId (userId: number) {- const token = this.userHavingToken.get(userId)+ deleteUserTokens (userId: number, tokenException?: string) {+ if (!this.userHavingToken.has(userId)) return- if (token !== undefined) {- this.accessTokenCache.delete(token)- this.userHavingToken.delete(userId)- }- }+ const tokens = [ ...this.userHavingToken.get(userId) ]- clearCacheByToken (token: string) {- const tokenModel = this.accessTokenCache.get(token)+ for (const token of tokens) {+ if (tokenException && token === tokenException) continue- if (tokenModel !== undefined) {- this.userHavingToken.delete(tokenModel.userId)this.accessTokenCache.delete(token)}}diff --git a/server/core/models/oauth/oauth-token.ts b/server/core/models/oauth/oauth-token.tsindex 0da8b8ba6d..8516a38479 100644--- a/server/core/models/oauth/oauth-token.ts+++ b/server/core/models/oauth/oauth-token.ts@@ -152,7 +152,7 @@ export class OAuthTokenModel extends SequelizeModel<OAuthTokenModel> {@AfterUpdate@AfterDestroystatic removeTokenCache (token: OAuthTokenModel) {- return TokensCache.Instance.clearCacheByToken(token.accessToken)+ return TokensCache.Instance.deleteToken(token.accessToken)}static loadByRefreshToken (refreshToken: string) {@@ -280,17 +280,20 @@ export class OAuthTokenModel extends SequelizeModel<OAuthTokenModel> {// ---------------------------------------------------------------------------- static deleteUserToken (userId: number, t?: Transaction) {- TokensCache.Instance.deleteUserToken(userId)+ static deleteUserToken (options: {+ userId: number+ accessTokenException?: string+ transaction?: Transaction+ }) {+ const { userId, accessTokenException, transaction } = options- const query = {- where: {- userId- },- transaction: t- }+ TokensCache.Instance.deleteUserTokens(userId, accessTokenException)++ const where = accessTokenException+ ? { userId, accessToken: { [Op.ne]: accessTokenException } }+ : { userId }- return OAuthTokenModel.destroy(query)+ return OAuthTokenModel.destroy({ where, transaction })}toSessionFormattedJSON (activeToken: string): TokenSession {diff --git a/server/core/models/user/user-notification-setting.ts b/server/core/models/user/user-notification-setting.tsindex 82879a308c..46d4e31fca 100644--- a/server/core/models/user/user-notification-setting.ts+++ b/server/core/models/user/user-notification-setting.ts@@ -211,7 +211,7 @@ export class UserNotificationSettingModel extends SequelizeModel<UserNotificatio@AfterUpdate@AfterDestroystatic removeTokenCache (instance: UserNotificationSettingModel) {- return TokensCache.Instance.clearCacheByUserId(instance.userId)+ return TokensCache.Instance.deleteUserTokens(instance.userId)}// ---------------------------------------------------------------------------diff --git a/server/core/models/user/user.ts b/server/core/models/user/user.tsindex 1331a924bc..2663d174da 100644--- a/server/core/models/user/user.ts+++ b/server/core/models/user/user.ts@@ -499,7 +499,7 @@ export class UserModel extends SequelizeModel<UserModel> {@AfterUpdate@AfterDestroystatic removeTokenCache (instance: UserModel) {- return TokensCache.Instance.clearCacheByUserId(instance.id)+ return TokensCache.Instance.deleteUserTokens(instance.id)}// ---------------------------------------------------------------------------