mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-24 23:26:07 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

[backend] Permit redirects for AP object lookups

Browse Source
This commit is contained in:
Laura Hausmann 2023-10-11 20:23:00 +02:00
parent 695528bed7
commit 8d7d95fd23
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/misc/fetch.ts
View File

@ -57,6 +57,7 @@ export async function getResponse(args: {
headers: Record<string, string>; headers: Record<string, string>;
timeout?: number; timeout?: number;
size?: number; size?: number;
redirect?: RequestRedirect;
}) { }) {
const timeout = args.timeout || 10 * 1000; const timeout = args.timeout || 10 * 1000;
@ -73,8 +74,13 @@ export async function getResponse(args: {
size: args.size || 10 * 1024 * 1024, size: args.size || 10 * 1024 * 1024,
agent: getAgentByUrl, agent: getAgentByUrl,
signal: controller.signal, signal: controller.signal,
redirect: args.redirect
}); });
if (args.redirect === "manual" && [301,302,307,308].includes(res.status)) {
return res;
}
if (!res.ok) { if (!res.ok) {
throw new StatusError( throw new StatusError(
`${res.status} ${res.statusText}`, `${res.status} ${res.statusText}`,

11
packages/backend/src/remote/activitypub/request.ts
View File

@ -34,8 +34,9 @@ export default async (user: { id: User["id"] }, url: string, object: any) => {
* Get AP object with http-signature * Get AP object with http-signature
* @param user http-signature user * @param user http-signature user
* @param url URL to fetch * @param url URL to fetch
* @param redirects whether or not to accept redirects
*/ */
export async function signedGet(url: string, user: { id: User["id"] }) { export async function signedGet(url: string, user: { id: User["id"] }, redirects: boolean = true) {
apLogger.debug(`Running signedGet on url: ${url}`); apLogger.debug(`Running signedGet on url: ${url}`);
const keypair = await getUserKeypair(user.id); const keypair = await getUserKeypair(user.id);
@ -54,7 +55,15 @@ export async function signedGet(url: string, user: { id: User["id"] }) {
url, url,
method: req.request.method, method: req.request.method,
headers: req.request.headers, headers: req.request.headers,
redirect: redirects ? "manual" : "error"
}); });
if (redirects && [301,302,307,308].includes(res.status)) {
const newUrl = res.headers.get('location');
if (!newUrl) throw new Error('signedGet got redirect but no target location');
apLogger.debug(`signedGet is redirecting to ${newUrl}`);
return signedGet(newUrl, user, false);
}
return await res.json(); return await res.json();
} }