foster/denoland-deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-02-01 20:25:12 -05:00
Code Issues Packages 1 Wiki Activity

fix: file_server swallowing permission errors (#3467)

Browse source
This commit is contained in:
木杉 2019-12-12 13:05:26 +08:00 • committed by Ry Dahl
parent d146d45861
commit 7f27f649cc
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
std/http/file_server.ts
View file

@ -6,7 +6,7 @@
// TODO Add tests like these:
// https://github.com/indexzero/http-server/blob/master/test/http-server-test.js
const { ErrorKind, cwd, args, stat, readDir, open } = Deno;
const { ErrorKind, DenoError, cwd, args, stat, readDir, open } = Deno;
import { posix } from "../path/mod.ts";
import {
listenAndServe,
@ -142,10 +142,7 @@ async function serveDir(
}
async function serveFallback(req: ServerRequest, e: Error): Promise<Response> {
if (
e instanceof Deno.DenoError &&
(e as Deno.DenoError<Deno.ErrorKind.NotFound>).kind === ErrorKind.NotFound
) {
if (e instanceof DenoError && e.kind === ErrorKind.NotFound) {
return {
status: 404,
body: encoder.encode("Not found")
@ -297,6 +294,7 @@ listenAndServe(
response = await serveFile(req, fsPath);
}
} catch (e) {
console.error(e.message);
response = await serveFallback(req, e);
} finally {
if (CORSEnabled) {

26
std/http/file_server_test.ts
View file

@ -93,3 +93,29 @@ test(async function serveFallback(): Promise<void> {
killFileServer();
}
});
test(async function servePermissionDenied(): Promise<void> {
const deniedServer = Deno.run({
args: [Deno.execPath(), "run", "--allow-net", "http/file_server.ts"],
stdout: "piped",
stderr: "piped"
});
const reader = new TextProtoReader(new BufReader(deniedServer.stdout!));
const errReader = new TextProtoReader(new BufReader(deniedServer.stderr!));
const s = await reader.readLine();
assert(s !== Deno.EOF && s.includes("server listening"));
try {
await fetch("http://localhost:4500/");
assertEquals(
await errReader.readLine(),
"run again with the --allow-read flag"
);
} catch (e) {
throw e;
} finally {
deniedServer.close();
deniedServer.stdout!.close();
deniedServer.stderr!.close();
}
});