foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-26 16:09:27 -05:00
Code Issues Packages 1 Wiki Activity

fix(std/http/file_server): File server should ignore query params (#8116)

Browse source
This commit is contained in:
uki00a 2020-10-26 22:55:26 +09:00 committed by GitHub
parent 57cad53945
commit b65171e37d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
std/http/file_server.ts
View file

@ -321,6 +321,21 @@ function html(strings: TemplateStringsArray, ...values: unknown[]): string {
return html;
}
function normalizeURL(url: string): string {
let normalizedUrl = posix.normalize(url);
try {
normalizedUrl = decodeURIComponent(normalizedUrl);
} catch (e) {
if (!(e instanceof URIError)) {
throw e;
}
}
const startOfParams = normalizedUrl.indexOf("?");
return startOfParams > -1
? normalizedUrl.slice(0, startOfParams)
: normalizedUrl;
}
function main(): void {
const CORSEnabled = serverArgs.cors ? true : false;
const port = serverArgs.port ?? serverArgs.p ?? 4507;
@ -362,14 +377,7 @@ function main(): void {
}
const handler = async (req: ServerRequest): Promise<void> => {
let normalizedUrl = posix.normalize(req.url);
try {
normalizedUrl = decodeURIComponent(normalizedUrl);
} catch (e) {
if (!(e instanceof URIError)) {
throw e;
}
}
const normalizedUrl = normalizeURL(req.url);
const fsPath = posix.join(target, normalizedUrl);
let response: Response | undefined;

15
std/http/file_server_test.ts
View file

@ -206,6 +206,21 @@ Deno.test("file_server running as library", async function (): Promise<void> {
}
});
Deno.test("file_server should ignore query params", async () => {
await startFileServer();
try {
const res = await fetch("http://localhost:4507/README.md?key=value");
assertEquals(res.status, 200);
const downloadedFile = await res.text();
const localFile = new TextDecoder().decode(
await Deno.readFile(join(moduleDir, "README.md")),
);
assertEquals(downloadedFile, localFile);
} finally {
await killFileServer();
}
});
async function startTlsFileServer({
target = ".",
port = 4577,