neil/silverbullet
1
0
Fork 0
Code

Check auth before serving static files

Browse Source
This commit is contained in:
Zef Hemel 2022-12-14 20:32:26 +01:00
parent aaebea5e54
commit 1d3ae7c822
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/http_server.ts
View File

@ -68,6 +68,8 @@ export class HttpServer {
await this.systemBoot.ensureSpaceIndex(); await this.systemBoot.ensureSpaceIndex();
await this.ensureAndLoadSettings(); await this.ensureAndLoadSettings();
this.addPasswordAuth(this.app);
// Serve static files (javascript, css, html) // Serve static files (javascript, css, html)
this.app.use(async ({ request, response }, next) => { this.app.use(async ({ request, response }, next) => {
if (request.url.pathname === "/") { if (request.url.pathname === "/") {
@ -111,8 +113,6 @@ export class HttpServer {
} }
}); });
this.addPasswordAuth(this.app);
// Pages API // Pages API
const fsRouter = this.buildFsRouter(this.systemBoot.spacePrimitives); const fsRouter = this.buildFsRouter(this.systemBoot.spacePrimitives);
this.app.use(fsRouter.routes()); this.app.use(fsRouter.routes());
@ -132,12 +132,18 @@ export class HttpServer {
}); });
this.abortController = new AbortController(); this.abortController = new AbortController();
this.app.listen({ hostname: this.hostname, port: this.port, signal: this.abortController.signal }) this.app.listen({
hostname: this.hostname,
port: this.port,
signal: this.abortController.signal,
})
.catch((e: any) => { .catch((e: any) => {
console.log("Server listen error:", e.message); console.log("Server listen error:", e.message);
Deno.exit(1); Deno.exit(1);
}); });
const visibleHostname = this.hostname === "0.0.0.0" ? "localhost" : this.hostname; const visibleHostname = this.hostname === "0.0.0.0"
? "localhost"
: this.hostname;
console.log( console.log(
`Silver Bullet is now running: http://${visibleHostname}:${this.port}`, `Silver Bullet is now running: http://${visibleHostname}:${this.port}`,
); );