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: Do not show PUT in Allow header for existing containers

Browse Source
This commit is contained in:
Joachim Van Herwegen 2023-07-18 10:33:38 +02:00
parent a47cc8a5ee
commit 6f6784a288
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/http/output/metadata/AllowAcceptHeaderWriter.ts
View File

@ -50,10 +50,14 @@ export class AllowAcceptHeaderWriter extends MetadataWriter {
// POST is only allowed on containers. // POST is only allowed on containers.
// Metadata only has the resource URI in case it has resource metadata. // Metadata only has the resource URI in case it has resource metadata.
if (this.isPostAllowed(metadata)) { if (!this.isPostAllowed(metadata)) {
allowedMethods.delete('POST'); allowedMethods.delete('POST');
} }
if (!this.isPutAllowed(metadata)) {
allowedMethods.delete('PUT');
}
if (!this.isDeleteAllowed(metadata)) { if (!this.isDeleteAllowed(metadata)) {
allowedMethods.delete('DELETE'); allowedMethods.delete('DELETE');
} }
@ -76,7 +80,14 @@ export class AllowAcceptHeaderWriter extends MetadataWriter {
* otherwise it is just a blank node. * otherwise it is just a blank node.
*/ */
private isPostAllowed(metadata: RepresentationMetadata): boolean { private isPostAllowed(metadata: RepresentationMetadata): boolean {
return metadata.has(RDF.terms.type, LDP.terms.Resource) && !isContainerPath(metadata.identifier.value); return !metadata.has(RDF.terms.type, LDP.terms.Resource) || isContainerPath(metadata.identifier.value);
}
/**
* PUT is not allowed on existing containers.
*/
private isPutAllowed(metadata: RepresentationMetadata): boolean {
return !metadata.has(RDF.terms.type, LDP.terms.Resource) || !isContainerPath(metadata.identifier.value);
} }
/** /**

15
test/unit/http/output/metadata/AllowAcceptHeaderWriter.test.ts
View File

@ -49,36 +49,33 @@ describe('An AllowAcceptHeaderWriter', (): void => {
expect(headers['accept-post']).toBeUndefined(); expect(headers['accept-post']).toBeUndefined();
}); });
it('returns all methods for an empty container.', async(): Promise<void> => { it('returns all methods except PUT for an empty container.', async(): Promise<void> => {
await expect(writer.handleSafe({ response, metadata: emptyContainer })).resolves.toBeUndefined(); await expect(writer.handleSafe({ response, metadata: emptyContainer })).resolves.toBeUndefined();
const headers = response.getHeaders(); const headers = response.getHeaders();
expect(typeof headers.allow).toBe('string'); expect(typeof headers.allow).toBe('string');
expect(new Set((headers.allow as string).split(', '))) expect(new Set((headers.allow as string).split(', ')))
.toEqual(new Set([ 'OPTIONS', 'GET', 'HEAD', 'PUT', 'POST', 'PATCH', 'DELETE' ])); .toEqual(new Set([ 'OPTIONS', 'GET', 'HEAD', 'POST', 'PATCH', 'DELETE' ]));
expect(headers['accept-patch']).toBe('text/n3, application/sparql-update'); expect(headers['accept-patch']).toBe('text/n3, application/sparql-update');
expect(headers['accept-put']).toBe('*/*');
expect(headers['accept-post']).toBe('*/*'); expect(headers['accept-post']).toBe('*/*');
}); });
it('returns all methods except DELETE for a non-empty container.', async(): Promise<void> => { it('returns all methods except PUT/DELETE for a non-empty container.', async(): Promise<void> => {
await expect(writer.handleSafe({ response, metadata: fullContainer })).resolves.toBeUndefined(); await expect(writer.handleSafe({ response, metadata: fullContainer })).resolves.toBeUndefined();
const headers = response.getHeaders(); const headers = response.getHeaders();
expect(typeof headers.allow).toBe('string'); expect(typeof headers.allow).toBe('string');
expect(new Set((headers.allow as string).split(', '))) expect(new Set((headers.allow as string).split(', ')))
.toEqual(new Set([ 'OPTIONS', 'GET', 'HEAD', 'PUT', 'POST', 'PATCH' ])); .toEqual(new Set([ 'OPTIONS', 'GET', 'HEAD', 'POST', 'PATCH' ]));
expect(headers['accept-patch']).toBe('text/n3, application/sparql-update'); expect(headers['accept-patch']).toBe('text/n3, application/sparql-update');
expect(headers['accept-put']).toBe('*/*');
expect(headers['accept-post']).toBe('*/*'); expect(headers['accept-post']).toBe('*/*');
}); });
it('returns all methods except DELETE for a storage container.', async(): Promise<void> => { it('returns all methods except PUT/DELETE for a storage container.', async(): Promise<void> => {
await expect(writer.handleSafe({ response, metadata: storageContainer })).resolves.toBeUndefined(); await expect(writer.handleSafe({ response, metadata: storageContainer })).resolves.toBeUndefined();
const headers = response.getHeaders(); const headers = response.getHeaders();
expect(typeof headers.allow).toBe('string'); expect(typeof headers.allow).toBe('string');
expect(new Set((headers.allow as string).split(', '))) expect(new Set((headers.allow as string).split(', ')))
.toEqual(new Set([ 'OPTIONS', 'GET', 'HEAD', 'PUT', 'POST', 'PATCH' ])); .toEqual(new Set([ 'OPTIONS', 'GET', 'HEAD', 'POST', 'PATCH' ]));
expect(headers['accept-patch']).toBe('text/n3, application/sparql-update'); expect(headers['accept-patch']).toBe('text/n3, application/sparql-update');
expect(headers['accept-put']).toBe('*/*');
expect(headers['accept-post']).toBe('*/*'); expect(headers['accept-post']).toBe('*/*');
}); });