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: Throw error when accessing URLs out of scope

Browse Source 
* feat: allow OriginalUrlExtractor to be configured with an identifierStrategy. Included the existing parameter 'includeQueryString' in the OriginalUrlExtractorArgs type.

* test: fixed OriginalUrlExtractor instantiation in OriginalUrlExtractor and RequestParser tests

* fix: Server no longer warns when accessing a URL out of scope #1148

* test: updated tests broken by #1148 fix

* test: ensuring 100% coverage

Co-authored-by: Wannes Kerckhove <wannes.kerckhove@ugent.be>
This commit is contained in:
wkerckho
2022-04-08 09:33:22 +02:00
committed by GitHub
parent 97e600bf4f
commit d42125a91d
5 changed files with 75 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/http/input/identifier/OriginalUrlExtractor.ts
View File

@@ -3,19 +3,34 @@ import type { HttpRequest } from '../../../server/HttpRequest';
import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError';
import { InternalServerError } from '../../../util/errors/InternalServerError';
import { parseForwarded } from '../../../util/HeaderUtil';
import type { IdentifierStrategy } from '../../../util/identifiers/IdentifierStrategy';
import { toCanonicalUriPath } from '../../../util/PathUtil';
import type { ResourceIdentifier } from '../../representation/ResourceIdentifier';
import { TargetExtractor } from './TargetExtractor';
export interface OriginalUrlExtractorArgs {
/**
* The IdentifierStrategy to use for checking the scope of the request
*/
identifierStrategy: IdentifierStrategy;
/**
* Specify wether the OriginalUrlExtractor should include the request query string.
*/
includeQueryString?: boolean;
}
/**
* Reconstructs the original URL of an incoming {@link HttpRequest}.
*/
export class OriginalUrlExtractor extends TargetExtractor {
private readonly identifierStrategy: IdentifierStrategy;
private readonly includeQueryString: boolean;
public constructor(options: { includeQueryString?: boolean } = {}) {
public constructor(args: OriginalUrlExtractorArgs) {
super();
this.includeQueryString = options.includeQueryString ?? true;
this.identifierStrategy = args.identifierStrategy;
this.includeQueryString = args.includeQueryString ?? true;
}
public async handle({ request: { url, connection, headers }}: { request: HttpRequest }): Promise<ResourceIdentifier> {
@@ -52,6 +67,15 @@ export class OriginalUrlExtractor extends TargetExtractor {
originalUrl.search = search;
}
return { path: originalUrl.href };
// Create ResourceIdentifier instance
const identifier = { path: originalUrl.href };
// Check if the configured IdentifierStrategy supports the identifier
if (!this.identifierStrategy.supportsIdentifier(identifier)) {
throw new InternalServerError(`The identifier ${identifier.path} is outside the configured identifier space.`,
{ errorCode: 'E0001', details: { path: identifier.path }});
}
return identifier;
}
}