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: Prevent errors in JSON storage when data is invalid

Browse Source
This commit is contained in:
Joachim Van Herwegen
2023-11-17 15:54:25 +01:00
parent 2f928bd2d4
commit 4318479154
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/storage/keyvalue/JsonResourceStorage.ts
View File

@@ -2,6 +2,7 @@ import { BasicRepresentation } from '../../http/representation/BasicRepresentati
import type { Representation } from '../../http/representation/Representation';
import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
import { getLoggerFor } from '../../logging/LogUtil';
import { createErrorMessage } from '../../util/errors/ErrorUtil';
import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError';
import { ensureTrailingSlash, isContainerIdentifier, joinUrl, trimLeadingSlashes } from '../../util/PathUtil';
import { readableToString } from '../../util/StreamUtil';
@@ -88,8 +89,14 @@ export class JsonResourceStorage<T> implements KeyValueStorage<string, T> {
yield* this.getResourceEntries({ path });
}
} else {
const json = JSON.parse(await readableToString(representation.data)) as T;
yield [ this.identifierToKey(identifier), json ];
try {
const json = JSON.parse(await readableToString(representation.data)) as T;
yield [ this.identifierToKey(identifier), json ];
} catch (error: unknown) {
this.logger.error(`Unable to parse ${identifier.path
}. You should probably delete this resource manually. Error: ${
createErrorMessage(error)}`);
}
}
}
}

5
test/unit/storage/keyvalue/JsonResourceStorage.test.ts
View File

@@ -5,7 +5,7 @@ import type { ResourceIdentifier } from '../../../../src/http/representation/Res
import { JsonResourceStorage } from '../../../../src/storage/keyvalue/JsonResourceStorage';
import type { ResourceStore } from '../../../../src/storage/ResourceStore';
import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError';
import { isContainerIdentifier } from '../../../../src/util/PathUtil';
import { isContainerIdentifier, joinUrl } from '../../../../src/util/PathUtil';
import { readableToString } from '../../../../src/util/StreamUtil';
import { LDP } from '../../../../src/util/Vocabularies';
@@ -112,6 +112,9 @@ describe('A JsonResourceStorage', (): void => {
data.set(containerIdentifier, '');
data.set(subContainerIdentifier, '');
// Manually setting invalid data which will be ignored
data.set(joinUrl(containerIdentifier, 'badData'), 'invalid JSON');
const entries = [];
for await (const entry of storage.entries()) {
entries.push(entry);