From 3739fa401ebee59aa4f2385c20e2a54e47379407 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Tue, 16 Jan 2024 18:21:39 -0500 Subject: [PATCH] engine: resources: Refactor HTTP constants --- engine/resources/http.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/engine/resources/http.go b/engine/resources/http.go index 483388d9..b3905f43 100644 --- a/engine/resources/http.go +++ b/engine/resources/http.go @@ -37,17 +37,21 @@ import ( securefilepath "github.com/cyphar/filepath-securejoin" ) -func init() { - engine.RegisterResource("http:server", func() engine.Res { return &HTTPServerRes{} }) - engine.RegisterResource("http:file", func() engine.Res { return &HTTPFileRes{} }) -} - const ( // HTTPUseSecureJoin specifies that we should add in a "secure join" lib // so that we avoid the ../../etc/passwd and symlink problems. HTTPUseSecureJoin = true + + httpKind = "http" + httpServerKind = httpKind + ":server" + httpFileKind = httpKind + ":file" ) +func init() { + engine.RegisterResource(httpServerKind, func() engine.Res { return &HTTPServerRes{} }) + engine.RegisterResource(httpFileKind, func() engine.Res { return &HTTPFileRes{} }) +} + // HTTPServerRes is an http server resource. It serves files, but does not // actually apply any state. The name is used as the address to listen on, // unless the Address field is specified, and in that case it is used instead.