deblan/remote-i3wm-go
deblan/remote-i3wm-go
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 6 Wiki Activity

run the server using the configuration

Browse source
This commit is contained in:
Simon Vieille 2023-08-26 11:41:43 +02:00
parent d1cefa4131
commit 9339cdbd93
Signed by: deblan
GPG key ID: 579388D585F70417
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
main.go
View file

@ -25,51 +25,40 @@ func main() {
e := echo.New() e := echo.New()
e.HideBanner = true e.HideBanner = true
RI3_USERNAME := os.Getenv("RI3_USERNAME")
RI3_PASSWORD := os.Getenv("RI3_PASSWORD")
RI3_BIND := os.Getenv("RI3_BIND")
if RI3_BIND == "" {
RI3_BIND = "0.0.0.0:4000"
}
if len(os.Args) != 2 { if len(os.Args) != 2 {
fmt.Errorf("Configuration requried") fmt.Errorf("Configuration required!")
os.Exit(1) os.Exit(1)
} }
value, err := createConfigFromFile(os.Args[1]) value, err := createConfigFromFile(os.Args[1])
if err != nil { if err != nil {
fmt.Printf("Configuration error:")
fmt.Printf("%+v\n", err) fmt.Printf("%+v\n", err)
fmt.Errorf("Configuration error")
os.Exit(1) os.Exit(1)
} }
config = value config = value
fmt.Printf("%+v\n", config)
assetHandler := http.FileServer(rice.MustFindBox("static").HTTPBox())
e.Use(middleware.BasicAuth(func(username, password string, c echo.Context) (bool, error) { e.Use(middleware.BasicAuth(func(username, password string, c echo.Context) (bool, error) {
if RI3_USERNAME == "" && RI3_PASSWORD == "" { if config.Server.Auth.Username == "" && config.Server.Auth.Password == "" {
return true, nil return true, nil
} }
isValidUsername := subtle.ConstantTimeCompare([]byte(username), []byte(RI3_USERNAME)) == 1 isValidUsername := subtle.ConstantTimeCompare([]byte(username), []byte(config.Server.Auth.Username)) == 1
isValidPassword := subtle.ConstantTimeCompare([]byte(password), []byte(RI3_PASSWORD)) == 1 isValidPassword := subtle.ConstantTimeCompare([]byte(password), []byte(config.Server.Auth.Password)) == 1
if isValidUsername && isValidPassword { if isValidUsername && isValidPassword {
return true, nil return true, nil
} }
return false, nil return false, nil
})) }))
e.GET("/", echo.WrapHandler(assetHandler)) assetHandler := http.FileServer(rice.MustFindBox("static").HTTPBox())
e.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static/", assetHandler))) e.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static/", assetHandler)))
e.GET("/", homeController) e.GET("/", homeController)
e.GET("/ws", wsController) e.GET("/ws", wsController)
e.Logger.Fatal(e.Start(RI3_BIND)) e.Logger.Fatal(e.Start(config.Server.Listen))
} }