versia-pub/api
2
0
Fork 0
mirror of https://github.com/versia-pub/api.git synced 2025-12-06 08:28:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(federation): 🐛 Use full URLs for requests, not just pathnames

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-07-26 17:58:38 +02:00
parent 39f27cd87f
commit 97826e18a9
No known key found for this signature in database
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
federation/requester/index.ts
View file

@ -70,7 +70,7 @@ export class FederationRequester {
* @returns The user's profile link. * @returns The user's profile link.
* @throws If the request fails or the response is invalid. * @throws If the request fails or the response is invalid.
* @example * @example
* const profileLink = await requester.webFinger("example"); * const profileLink = await requester.webFinger("testuser", "example.com");
* *
* console.log(profileLink); * console.log(profileLink);
* // => "https://example.com/users/1" * // => "https://example.com/users/1"
@ -81,9 +81,12 @@ export class FederationRequester {
contentType = "application/json", contentType = "application/json",
): Promise<string> { ): Promise<string> {
const result = await this.get<User>( const result = await this.get<User>(
new URL(
`/.well-known/webfinger?${new URLSearchParams({ `/.well-known/webfinger?${new URLSearchParams({
resource: `acct:${username}@${hostname}`, resource: `acct:${username}@${hostname}`,
})}`, })}`,
`https://${hostname}`,
),
); );
// Validate the response // Validate the response
@ -159,7 +162,7 @@ export class FederationRequester {
} }
private async constructRequest( private async constructRequest(
path: string, url: string | URL,
method: HttpVerb, method: HttpVerb,
body?: object | FormData, body?: object | FormData,
extra?: RequestInit, extra?: RequestInit,
@ -178,7 +181,7 @@ export class FederationRequester {
headers.set("Accept", "application/json"); headers.set("Accept", "application/json");
const request = new Request(path, { const request = new Request(url, {
method, method,
headers, headers,
body: body body: body
@ -196,16 +199,16 @@ export class FederationRequester {
/** /**
* Make a GET request to a URL. * Make a GET request to a URL.
* @param path The path to make the request to. * @param url The path to make the request to.
* @param extra Any extra options to pass to the fetch function. * @param extra Any extra options to pass to the fetch function.
* @returns The data returned by the request. * @returns The data returned by the request.
*/ */
public async get<ReturnType>( public async get<ReturnType>(
path: string, url: string | URL,
extra?: RequestInit, extra?: RequestInit,
): Promise<Output<ReturnType>> { ): Promise<Output<ReturnType>> {
return this.request<ReturnType>( return this.request<ReturnType>(
await this.constructRequest(path, "GET", undefined, extra), await this.constructRequest(url, "GET", undefined, extra),
).catch((e) => { ).catch((e) => {
this.globalCatch(e); this.globalCatch(e);
throw e; throw e;
@ -214,18 +217,18 @@ export class FederationRequester {
/** /**
* Make a POST request to a URL. * Make a POST request to a URL.
* @param path The path to make the request to. * @param url The path to make the request to.
* @param body The body of the request. * @param body The body of the request.
* @param extra Any extra options to pass to the fetch function. * @param extra Any extra options to pass to the fetch function.
* @returns The data returned by the request. * @returns The data returned by the request.
*/ */
public async post<ReturnType>( public async post<ReturnType>(
path: string, url: string | URL,
body: object, body: object,
extra?: RequestInit, extra?: RequestInit,
): Promise<Output<ReturnType>> { ): Promise<Output<ReturnType>> {
return this.request<ReturnType>( return this.request<ReturnType>(
await this.constructRequest(path, "POST", body, extra), await this.constructRequest(url, "POST", body, extra),
).catch((e) => { ).catch((e) => {
this.globalCatch(e); this.globalCatch(e);
throw e; throw e;