From 1567a2ea3efd9d06b2c771f3bc3d1a5739e7ccd5 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Thu, 22 Jun 2023 01:25:40 +0200 Subject: [PATCH] error in rfc6750 --- .../src/server/oauth/OAuth2ProviderService.ts | 17 ++++++++++++----- packages/backend/test/e2e/oauth.ts | 7 ++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/backend/src/server/oauth/OAuth2ProviderService.ts b/packages/backend/src/server/oauth/OAuth2ProviderService.ts index 4c639c7fa6..1ec9553860 100644 --- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts +++ b/packages/backend/src/server/oauth/OAuth2ProviderService.ts @@ -167,8 +167,16 @@ function getQueryMode(issuerUrl: string): oauth2orize.grant.Options['modes'] { }; } +/** + * Maps the transaction ID and the oauth/authorize parameters. + * + * Flow: + * 1. oauth/authorize endpoint will call store() to store the parameters + * and puts the generated transaction ID to the dialog page + * 2. oauth/decision will call load() to retrieve the parameters and then remove() + */ class OAuth2Store { - #cache = new MemoryKVCache(1000 * 60 * 5); // 5min + #cache = new MemoryKVCache(1000 * 60 * 5); // expires after 5min load(req: OAuth2DecisionRequest, cb: (err: Error | null, txn?: OAuth2) => void): void { const { transaction_id } = req.body; @@ -178,7 +186,7 @@ class OAuth2Store { } const loaded = this.#cache.get(transaction_id); if (!loaded) { - cb(new AuthorizationError('Failed to load transaction', 'access_denied')); + cb(new AuthorizationError('Invalid or expired transaction ID', 'access_denied')); return; } cb(null, loaded); @@ -217,7 +225,6 @@ export class OAuth2ProviderService { ) { this.#logger = loggerService.getLogger('oauth'); - // XXX: But MemoryKVCache just grows forever without being cleared if grant codes are left unused const grantCodeCache = new MemoryKVCache<{ clientId: string, userId: string, @@ -229,7 +236,7 @@ export class OAuth2ProviderService { grantedToken?: string, revoked?: boolean, used?: boolean, - }>(1000 * 60 * 5); // 5m + }>(1000 * 60 * 5); // expires after 5m // https://datatracker.ietf.org/doc/html/rfc7636.html this.#server.grant(oauth2Pkce.extensions()); @@ -238,7 +245,7 @@ export class OAuth2ProviderService { }, (client, redirectUri, token, ares, areq, locals, done) => { (async (): Promise>> => { this.#logger.info(`Checking the user before sending authorization code to ${client.id}`); - const code = secureRndstr(32, true); + const code = secureRndstr(128, true); if (!token) { throw new AuthorizationError('No user', 'invalid_request'); diff --git a/packages/backend/test/e2e/oauth.ts b/packages/backend/test/e2e/oauth.ts index 921b140448..f5b87b1b2a 100644 --- a/packages/backend/test/e2e/oauth.ts +++ b/packages/backend/test/e2e/oauth.ts @@ -471,7 +471,7 @@ describe('OAuth', () => { }, body: JSON.stringify({ text: 'test' }), }); - assert.strictEqual(createResponse2.status, 403); + assert.strictEqual(createResponse2.status, 401); }); }); @@ -659,10 +659,7 @@ describe('OAuth', () => { // "The access token provided is expired, revoked, malformed, or // invalid for other reasons. The resource SHOULD respond with // the HTTP 401 (Unauthorized) status code." - // (but it's SHOULD not MUST. 403 should be okay for now.) - assert.strictEqual(createResponse.status, 403); - - // TODO: error code (wrong Authorization header should emit OAuth error instead of Misskey API error) + await assertDirectError(createResponse as Response, 401, 'invalid_token'); }); // https://datatracker.ietf.org/doc/html/rfc6749.html#section-3.1.2.4