Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Make sure there is always a fallback for error handling

Browse Source
This commit is contained in:
Joachim Van Herwegen
2021-07-23 11:55:27 +02:00
parent 850c590a51
commit bd10256e59
8 changed files with 108 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/index.ts
View File

@@ -117,10 +117,10 @@ export * from './ldp/http/PreferenceParser';
export * from './ldp/http/RawBodyParser';
export * from './ldp/http/RequestParser';
export * from './ldp/http/ResponseWriter';
export * from './ldp/http/SafeErrorHandler';
export * from './ldp/http/SparqlUpdateBodyParser';
export * from './ldp/http/SparqlUpdatePatch';
export * from './ldp/http/TargetExtractor';
export * from './ldp/http/TextErrorHandler';
// LDP/Operations
export * from './ldp/operations/DeleteOperationHandler';

21
src/ldp/http/TextErrorHandler.ts → src/ldp/http/SafeErrorHandler.ts
View File

@@ -1,4 +1,5 @@
import { getStatusCode } from '../../util/errors/ErrorUtil';
import { getLoggerFor } from '../../logging/LogUtil';
import { createErrorMessage, getStatusCode } from '../../util/errors/ErrorUtil';
import { guardedStreamFrom } from '../../util/StreamUtil';
import { toLiteral } from '../../util/TermUtil';
import { HTTP, XSD } from '../../util/Vocabularies';
@@ -9,17 +10,27 @@ import type { ResponseDescription } from './response/ResponseDescription';
/**
* Returns a simple text description of an error.
* This class is mostly a failsafe in case all other solutions fail.
* This class is a failsafe in case the wrapped error handler fails.
*/
export class TextErrorHandler extends ErrorHandler {
export class SafeErrorHandler extends ErrorHandler {
protected readonly logger = getLoggerFor(this);
private readonly errorHandler: ErrorHandler;
private readonly showStackTrace: boolean;
public constructor(showStackTrace = false) {
public constructor(errorHandler: ErrorHandler, showStackTrace = false) {
super();
this.errorHandler = errorHandler;
this.showStackTrace = showStackTrace;
}
public async handle({ error }: ErrorHandlerArgs): Promise<ResponseDescription> {
public async handle(input: ErrorHandlerArgs): Promise<ResponseDescription> {
try {
return await this.errorHandler.handleSafe(input);
} catch (error: unknown) {
this.logger.debug(`Recovering from error handler failure: ${createErrorMessage(error)}`);
}
const { error } = input;
const statusCode = getStatusCode(error);
const metadata = new RepresentationMetadata('text/plain');
metadata.add(HTTP.terms.statusCodeNumber, toLiteral(statusCode, XSD.terms.integer));