From 357c65b356f4a293e5a4bc34e09716be1eda2dfa Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Thu, 29 Jun 2023 02:35:55 +0200 Subject: [PATCH] unref? --- .../src/server/oauth/OAuth2ProviderService.ts | 13 +++---------- packages/backend/test/e2e/oauth.ts | 1 + 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/backend/src/server/oauth/OAuth2ProviderService.ts b/packages/backend/src/server/oauth/OAuth2ProviderService.ts index b219d20e54..c3a2efe87b 100644 --- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts +++ b/packages/backend/src/server/oauth/OAuth2ProviderService.ts @@ -101,30 +101,22 @@ interface ClientInformation { // Authorization endpoints verifying that a redirect_uri is allowed for use by a client MUST // look for an exact match of the given redirect_uri in the request against the list of // redirect_uris discovered after resolving any relative URLs." -async function discoverClientInformation(httpRequestService: HttpRequestService, id: string): Promise { +async function discoverClientInformation(logger: Logger, httpRequestService: HttpRequestService, id: string): Promise { try { const res = await httpRequestService.send(id); - console.log('TEST', 'marker1'); const redirectUris: string[] = []; const linkHeader = res.headers.get('link'); if (linkHeader) { redirectUris.push(...httpLinkHeader.parse(linkHeader).get('rel', 'redirect_uri').map(r => r.uri)); } - console.log('TEST', 'marker2'); const fragment = JSDOM.fragment(await res.text()); - console.log('TEST', 'marker3'); - redirectUris.push(...[...fragment.querySelectorAll('link[rel=redirect_uri][href]')].map(el => el.href)); - console.log('TEST', 'marker4'); - const name = fragment.querySelector('.h-app .p-name')?.textContent?.trim() ?? id; - console.log('TEST', 'marker5'); - return { id, redirectUris: redirectUris.map(uri => new URL(uri, res.url).toString()), @@ -132,6 +124,7 @@ async function discoverClientInformation(httpRequestService: HttpRequestService, }; } catch (err) { console.error(err); + logger.error('Failed to fetch client information', { err }); throw new AuthorizationError('Failed to fetch client information', 'server_error'); } } @@ -406,7 +399,7 @@ export class OAuth2ProviderService { } // Find client information from the remote. - const clientInfo = await discoverClientInformation(this.httpRequestService, clientUrl.href); + const clientInfo = await discoverClientInformation(this.#logger, this.httpRequestService, clientUrl.href); // Require the redirect URI to be included in an explicit list, per // https://datatracker.ietf.org/doc/html/draft-ietf-oauth-security-topics#section-4.1.3 diff --git a/packages/backend/test/e2e/oauth.ts b/packages/backend/test/e2e/oauth.ts index 3762762ebc..3e638d387a 100644 --- a/packages/backend/test/e2e/oauth.ts +++ b/packages/backend/test/e2e/oauth.ts @@ -173,6 +173,7 @@ describe('OAuth', () => { afterEach(async () => { await fastify.close(); + fastify.server.unref(); }); test('Full flow', async () => {