PolyculeConnect/polycule-connect
4
0
Fork 0
Code Issues Pull requests Releases Packages 1 Wiki Activity Actions

fix: allow setting base path for static files

Browse source
This commit is contained in:
Melora Hugues 2024-05-08 16:07:40 +02:00
parent db665a30fa
commit 9cf1428517
4 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polyculeconnect/cmd/serve/serve.go
View file

@ -43,7 +43,7 @@ func serve() {
logger.L.Infof("Initialized storage backend %q", conf.StorageType) logger.L.Infof("Initialized storage backend %q", conf.StorageType)
dexConf := dex_server.Config{ dexConf := dex_server.Config{
Web: dex_server.WebConfig{ Web: dex_server.WebConfig{
Dir: "./", Dir: conf.StaticDir,
Theme: "default", Theme: "default",
}, },
Storage: storageType, Storage: storageType,

20
polyculeconnect/config/config.go
View file

@ -17,10 +17,11 @@ type envVar string
const ( const (
varLogLevel envVar = "LOG_LEVEL" varLogLevel envVar = "LOG_LEVEL"
varServerMode envVar = "SERVER_MODE" varServerMode envVar = "SERVER_MODE"
varServerHost envVar = "SERVER_HOST" varServerHost envVar = "SERVER_HOST"
varServerPort envVar = "SERVER_PORT" varServerPort envVar = "SERVER_PORT"
varServerSocket envVar = "SERVER_SOCK_PATH" varServerSocket envVar = "SERVER_SOCK_PATH"
varServerStaticDir envVar = "SERVER_STATIC_DIR"
varIssuer envVar = "ISSUER" varIssuer envVar = "ISSUER"
@ -52,10 +53,11 @@ const (
const ( const (
defaultLogLevel = logrus.InfoLevel defaultLogLevel = logrus.InfoLevel
defaultServerMode = ModeNet defaultServerMode = ModeNet
defaultServerHost = "0.0.0.0" defaultServerHost = "0.0.0.0"
defaultServerPort = 5000 defaultServerPort = 5000
defaultServerSocket = "" defaultServerSocket = ""
defaultServerStaticDir = "./"
defaultIssuer = "locahost" defaultIssuer = "locahost"
@ -112,6 +114,7 @@ type AppConfig struct {
StorageType string StorageType string
StorageConfig *StorageConfig StorageConfig *StorageConfig
OpenConnectConfig *OpenConnectConfig OpenConnectConfig *OpenConnectConfig
StaticDir string
} }
func parseLevel(lvlStr string) logrus.Level { func parseLevel(lvlStr string) logrus.Level {
@ -142,6 +145,7 @@ func (ac *AppConfig) getConfFromEnv() {
ac.Host = getStringFromEnv(varServerHost, defaultServerHost) ac.Host = getStringFromEnv(varServerHost, defaultServerHost)
ac.Port = getIntFromEnv(varServerPort, defaultServerPort) ac.Port = getIntFromEnv(varServerPort, defaultServerPort)
ac.SockPath = getStringFromEnv(varServerSocket, defaultServerSocket) ac.SockPath = getStringFromEnv(varServerSocket, defaultServerSocket)
ac.StaticDir = getStringFromEnv(varServerStaticDir, defaultServerStaticDir)
ac.StorageType = getStringFromEnv(varStorageType, string(defaultStorageType)) ac.StorageType = getStringFromEnv(varStorageType, string(defaultStorageType))
ac.StorageConfig.Database = getStringFromEnv(varStorageDB, defaultStorageDB) ac.StorageConfig.Database = getStringFromEnv(varStorageDB, defaultStorageDB)

19
polyculeconnect/controller/ui/static.go
View file

@ -15,22 +15,31 @@ import (
const StaticRoute = "/static/" const StaticRoute = "/static/"
type StaticController struct { type StaticController struct {
baseDir string
}
func NewStaticController(baseDir string) *StaticController {
return &StaticController{
baseDir: baseDir,
}
} }
func (sc *StaticController) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (sc *StaticController) ServeHTTP(w http.ResponseWriter, r *http.Request) {
fs := http.FileServer(http.Dir("./static")) fs := http.FileServer(http.Dir(sc.baseDir + "/static"))
http.StripPrefix(StaticRoute, fs).ServeHTTP(w, r) http.StripPrefix(StaticRoute, fs).ServeHTTP(w, r)
} }
type IndexController struct { type IndexController struct {
l *logrus.Logger l *logrus.Logger
downstreamConstroller http.Handler downstreamConstroller http.Handler
baseDir string
} }
func NewIndexController(l *logrus.Logger, downstream http.Handler) *IndexController { func NewIndexController(l *logrus.Logger, downstream http.Handler, baseDir string) *IndexController {
return &IndexController{ return &IndexController{
l: l, l: l,
downstreamConstroller: downstream, downstreamConstroller: downstream,
baseDir: baseDir,
} }
} }
@ -39,9 +48,9 @@ func (ic IndexController) serveUI(w http.ResponseWriter, r *http.Request) (int,
"issuer": func() string { return "toto" }, "issuer": func() string { return "toto" },
} }
lp := filepath.Join("templates", "index.html") lp := filepath.Join(ic.baseDir, "templates", "index.html")
hdrTpl := filepath.Join("templates", "header.html") hdrTpl := filepath.Join(ic.baseDir, "templates", "header.html")
footTpl := filepath.Join("templates", "footer.html") footTpl := filepath.Join(ic.baseDir, "templates", "footer.html")
tmpl, err := template.New("index.html").Funcs(funcs).ParseFiles(hdrTpl, footTpl, lp) tmpl, err := template.New("index.html").Funcs(funcs).ParseFiles(hdrTpl, footTpl, lp)
if err != nil { if err != nil {
return http.StatusInternalServerError, -1, fmt.Errorf("failed to init template: %w", err) return http.StatusInternalServerError, -1, fmt.Errorf("failed to init template: %w", err)

4
polyculeconnect/server/server.go
View file

@ -64,8 +64,8 @@ func New(appConf *config.AppConfig, dexSrv *dex_server.Server, logger *logrus.Lo
} }
controllers := map[string]http.Handler{ controllers := map[string]http.Handler{
ui.StaticRoute: middlewares.WithLogger(&ui.StaticController{}, logger), ui.StaticRoute: middlewares.WithLogger(ui.NewStaticController(appConf.StaticDir), logger),
"/": middlewares.WithLogger(ui.NewIndexController(logger, dexSrv), logger), "/": middlewares.WithLogger(ui.NewIndexController(logger, dexSrv, appConf.StaticDir), logger),
} }
m := http.NewServeMux() m := http.NewServeMux()