mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 20:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

emit IdentifiableErrors from validator.ts

Browse source
This commit is contained in:
Hazelnoot 2025-03-03 00:46:48 -05:00
parent 24b0d7a376
commit f644972760
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/backend/src/core/activitypub/misc/validator.ts
View file

@ -3,6 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { IdentifiableError } from '@/misc/identifiable-error.js';
import type { Response } from 'node-fetch'; import type { Response } from 'node-fetch';
// TODO throw identifiable or unrecoverable errors // TODO throw identifiable or unrecoverable errors
@ -11,7 +12,7 @@ export function validateContentTypeSetAsActivityPub(response: Response): void {
const contentType = (response.headers.get('content-type') ?? '').toLowerCase(); const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
if (contentType === '') { if (contentType === '') {
throw new Error(`invalid content type of AP response - no content-type header: ${response.url}`); throw new IdentifiableError('d09dc850-b76c-4f45-875a-7389339d78b8', `invalid content type of AP response - no content-type header: ${response.url}`, true);
} }
if ( if (
contentType.startsWith('application/activity+json') || contentType.startsWith('application/activity+json') ||
@ -19,7 +20,7 @@ export function validateContentTypeSetAsActivityPub(response: Response): void {
) { ) {
return; return;
} }
throw new Error(`invalid content type of AP response - content type is not application/activity+json or application/ld+json: ${response.url}`); throw new IdentifiableError('dc110060-a5f2-461d-808b-39c62702ca64', `invalid content type of AP response - content type "${contentType}" is not application/activity+json or application/ld+json: ${response.url}`);
} }
const plusJsonSuffixRegex = /^\s*(application|text)\/[a-zA-Z0-9\.\-\+]+\+json\s*(;|$)/; const plusJsonSuffixRegex = /^\s*(application|text)\/[a-zA-Z0-9\.\-\+]+\+json\s*(;|$)/;
@ -28,7 +29,7 @@ export function validateContentTypeSetAsJsonLD(response: Response): void {
const contentType = (response.headers.get('content-type') ?? '').toLowerCase(); const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
if (contentType === '') { if (contentType === '') {
throw new Error(`invalid content type of JSON LD - no content-type header: ${response.url}`); throw new IdentifiableError('45793ab7-7648-4886-b503-429f8a0d0f73', `invalid content type of JSON LD - no content-type header: ${response.url}`, true);
} }
if ( if (
contentType.startsWith('application/ld+json') || contentType.startsWith('application/ld+json') ||
@ -37,5 +38,5 @@ export function validateContentTypeSetAsJsonLD(response: Response): void {
) { ) {
return; return;
} }
throw new Error(`invalid content type of JSON LD - content type is not application/ld+json or application/json: ${response.url}`); throw new IdentifiableError('4bf8f36b-4d33-4ac9-ad76-63fa11f354e9', `invalid content type of JSON LD - content type "${contentType}" is not application/ld+json or application/json: ${response.url}`);
} }

4
packages/backend/src/server/api/endpoints/ap/show.ts
View file

@ -173,6 +173,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
case '09d79f9e-64f1-4316-9cfa-e75c4d091574': case '09d79f9e-64f1-4316-9cfa-e75c4d091574':
throw new ApiError(meta.errors.federationNotAllowed); throw new ApiError(meta.errors.federationNotAllowed);
case '72180409-793c-4973-868e-5a118eb5519b': case '72180409-793c-4973-868e-5a118eb5519b':
case 'd09dc850-b76c-4f45-875a-7389339d78b8':
case 'dc110060-a5f2-461d-808b-39c62702ca64':
case '45793ab7-7648-4886-b503-429f8a0d0f73':
case '4bf8f36b-4d33-4ac9-ad76-63fa11f354e9':
throw new ApiError(meta.errors.responseInvalid); throw new ApiError(meta.errors.responseInvalid);
// resolveLocal // resolveLocal