ActivityPub-federated video streaming platform using P2P directly in your web browser
Prevent external token replay
Chocobozzz3840f44c02c2
diff --git a/server/core/controllers/api/users/token.ts b/server/core/controllers/api/users/token.tsindex 6f7fa3616c..eaa2916e9c 100644--- a/server/core/controllers/api/users/token.ts+++ b/server/core/controllers/api/users/token.ts@@ -4,7 +4,7 @@ import { buildUUID } from '@peertube/peertube-node-utils'import { logger } from '@server/helpers/logger.js'import { CONFIG } from '@server/initializers/config.js'import { OTP } from '@server/initializers/constants.js'-import { getAuthNameFromRefreshGrant, getBypassFromExternalAuth, getBypassFromPasswordGrant } from '@server/lib/auth/external-auth.js'+import { getAuthNameFromRefreshGrant, consumeBypassFromExternalAuth, getBypassFromPasswordGrant } from '@server/lib/auth/external-auth.js'import { BypassLogin, revokeToken } from '@server/lib/auth/oauth-model.js'import { handleOAuthToken, MissingTwoFactorError } from '@server/lib/auth/oauth.js'import { Hooks } from '@server/lib/plugins/hooks.js'@@ -196,7 +196,7 @@ async function buildByPassLogin (req: express.Request, grantType: string): Promiif (req.body.externalAuthToken) {// Consistency with the getBypassFromPasswordGrant promise- return getBypassFromExternalAuth(req.body.username, req.body.externalAuthToken)+ return consumeBypassFromExternalAuth(req.body.username, req.body.externalAuthToken)}return getBypassFromPasswordGrant(req.body.username, req.body.password)diff --git a/server/core/lib/auth/external-auth.ts b/server/core/lib/auth/external-auth.tsindex 6b7b4a5b76..7883b4c27d 100644--- a/server/core/lib/auth/external-auth.ts+++ b/server/core/lib/auth/external-auth.ts@@ -172,10 +172,13 @@ async function getBypassFromPasswordGrant (username: string, password: string):return undefined}-function getBypassFromExternalAuth (username: string, externalAuthToken: string): BypassLogin {+function consumeBypassFromExternalAuth (username: string, externalAuthToken: string): BypassLogin {const obj = authBypassTokens.get(externalAuthToken)if (!obj) throw new Error('Cannot authenticate user with unknown bypass token')+ // Prevent replaying the same token+ authBypassTokens.delete(externalAuthToken)+const { expires, user, authName, npmName } = objconst now = new Date()@@ -245,7 +248,7 @@ function buildUserResult (pluginResult: RegisterServerAuthenticatedResult) {export {onExternalUserAuthenticated,- getBypassFromExternalAuth,+ consumeBypassFromExternalAuth,getAuthNameFromRefreshGrant,getBypassFromPasswordGrant}