-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fallback for unavailable uma servers
Signed-off-by: Wouter Termont <[email protected]>
- Loading branch information
1 parent
25dbf94
commit 2309560
Showing
7 changed files
with
126 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { getLoggerFor } from '@solid/community-server'; | ||
| import type { FetchParams, Fetcher } from './Fetcher'; | ||
| import retryFetcher from 'fetch-retry'; | ||
|
|
||
| /** | ||
| * A {@link Fetcher} wrapper that retries failed fetches. | ||
| */ | ||
| export class RetryingFetcher implements Fetcher { | ||
| protected readonly logger = getLoggerFor(this); | ||
| protected readonly retryFetch: (...args: FetchParams) => Promise<Response>; | ||
|
|
||
| constructor( | ||
| protected fetcher: Fetcher, | ||
| retries: number = 150, | ||
| exponent: number = 3, | ||
| retryOn: number[] = [], | ||
| ) { | ||
| this.retryFetch = retryFetcher(fetcher.fetch.bind(fetcher), { | ||
| retryOn, | ||
| retries, | ||
| retryDelay: (attempt) => Math.pow(exponent, attempt) * 1000, | ||
| }); | ||
| } | ||
|
|
||
| async fetch(...args: FetchParams): Promise<Response> { | ||
| return this.retryFetch(...args) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| import { InternalServerError, getLoggerFor, type JwkGenerator } from '@solid/community-server'; | ||
| import type { Fetcher } from './Fetcher'; | ||
| import { httpbis, type SigningKey } from 'http-message-signatures'; | ||
|
|
||
| const algMap = { | ||
| 'ES256': { name: 'ECDSA', namedCurve: 'P-256', hash: 'SHA-256' }, | ||
| 'ES384': { name: 'ECDSA', namedCurve: 'P-384', hash: 'SHA-384' }, | ||
| 'ES512': { name: 'ECDSA', namedCurve: 'P-512', hash: 'SHA-512' }, | ||
| 'HS256': { name: 'HMAC', hash: 'SHA-256' }, | ||
| 'HS384': { name: 'HMAC', hash: 'SHA-384' }, | ||
| 'HS512': { name: 'HMAC', hash: 'SHA-512' }, | ||
| 'PS256': { name: 'RSASSA-PSS', hash: 'SHA-256' }, | ||
| 'PS384': { name: 'RSASSA-PSS', hash: 'SHA-384' }, | ||
| 'PS512': { name: 'RSASSA-PSS', hash: 'SHA-512' }, | ||
| 'RS256': { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256' }, | ||
| 'RS384': { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-384' }, | ||
| 'RS512': { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-512' }, | ||
| } | ||
|
|
||
| /** | ||
| * A {@link Fetcher} wrapper that signes requests. | ||
| */ | ||
| export class SignedFetcher implements Fetcher { | ||
| protected readonly logger = getLoggerFor(this); | ||
|
|
||
| constructor( | ||
| protected fetcher: Fetcher, | ||
| protected baseUrl: string, | ||
| protected keyGen: JwkGenerator, | ||
| ) {} | ||
|
|
||
| public async fetch(input: NodeJS.fetch.RequestInfo, init?: RequestInit): Promise<Response> { | ||
| const jwk = await this.keyGen.getPrivateKey(); | ||
|
|
||
| const { alg, kid } = jwk; | ||
| if (alg === 'EdDSA') throw new InternalServerError('EdDSA signing is not supported'); | ||
| if (alg === 'ES256K') throw new InternalServerError('ES256K signing is not supported'); | ||
|
|
||
| const key: SigningKey = { | ||
| id: kid, | ||
| alg: alg, | ||
| async sign(data: BufferSource) { | ||
| const params = algMap[alg]; | ||
| const key = await crypto.subtle.importKey('jwk', jwk, params, false, ['sign']); | ||
| return Buffer.from(await crypto.subtle.sign(params, key, data)); | ||
| }, | ||
| }; | ||
|
|
||
| const url = input instanceof URL ? input.href : input instanceof Request ? input.url : input as string; | ||
|
|
||
| const request = { | ||
| ...init ?? {}, | ||
| url, | ||
| method: init?.method ?? 'GET', | ||
| headers: {} as Record<string, string> | ||
| } | ||
| ; | ||
| new Headers(init?.headers).forEach((value, key) => request.headers[key] = value); | ||
| request.headers['Authorization'] = `HttpSig cred="${this.baseUrl}"`; | ||
|
|
||
| const signed = await httpbis.signMessage({ key, paramValues: { keyid: 'TODO' } }, request); | ||
|
|
||
| return await this.fetcher.fetch(url, signed); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters