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

Merge branch 'main' into versions/5.0.0

Browse Source 
# Conflicts:
#	RELEASE_NOTES.md
#	config/quota-file.json
This commit is contained in:
Joachim Van Herwegen
2022-07-04 13:53:17 +02:00
parent cddf46dd5c 027c803b33
commit affcb7a7b3
26 changed files with 193 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/http/UnsecureWebSocketsProtocol.ts
View File

@@ -1,4 +1,5 @@
import { EventEmitter } from 'events';
import type { TLSSocket } from 'tls';
import type { WebSocket } from 'ws';
import { getLoggerFor } from '../logging/LogUtil';
import type { HttpRequest } from '../server/HttpRequest';
@@ -47,7 +48,7 @@ class WebSocketListener extends EventEmitter {
// Store the HTTP host and protocol
const forwarded = parseForwarded(headers);
this.host = forwarded.host ?? headers.host ?? 'localhost';
this.protocol = forwarded.proto === 'https' || (socket as any).secure ? 'https:' : 'http:';
this.protocol = forwarded.proto === 'https' || (socket as TLSSocket).encrypted ? 'https:' : 'http:';
}
private stop(): void {
@@ -91,10 +92,10 @@ class WebSocketListener extends EventEmitter {
// Resolve and verify the URL
const resolved = new URL(path, `${this.protocol}${this.host}`);
if (resolved.host !== this.host) {
throw new Error(`Mismatched host: ${resolved.host} instead of ${this.host}`);
throw new Error(`Mismatched host: expected ${this.host} but got ${resolved.host}`);
}
if (resolved.protocol !== this.protocol) {
throw new Error(`Mismatched protocol: ${resolved.protocol} instead of ${this.protocol}`);
throw new Error(`Mismatched protocol: expected ${this.protocol} but got ${resolved.protocol}`);
}
// Subscribe to the URL
const url = resolved.href;

5
src/storage/conversion/RdfToQuadConverter.ts
View File

@@ -13,7 +13,10 @@ import type { RepresentationConverterArgs } from './RepresentationConverter';
*/
export class RdfToQuadConverter extends BaseTypedRepresentationConverter {
public constructor() {
super(rdfParser.getContentTypes(), INTERNAL_QUADS);
const inputTypes = rdfParser.getContentTypes()
// ContentType application/json MAY NOT be converted to Quad.
.then((types): string[] => types.filter((type): boolean => type !== 'application/json'));
super(inputTypes, INTERNAL_QUADS);
}
public async handle({ representation, identifier }: RepresentationConverterArgs): Promise<Representation> {