Fix check against disabled TLS

This commit is contained in:
Bolke de Bruin 2022-09-09 08:49:35 +02:00
parent 51af7d2ce4
commit cc6420b037
2 changed files with 17 additions and 3 deletions

View File

@ -11,6 +11,20 @@ import (
"strings"
)
const (
TlsDisable = "disable"
TlsAuto = "auto"
HostSelectionSigned = "signed"
HostSelectionRoundRobin = "roundrobin"
SessionStoreCookie = "cookie"
SessionStoreFile = "file"
AuthenticationOpenId = "openid"
AuthenticationBasic = "local"
)
type Configuration struct {
Server ServerConfig `koanf:"server"`
OpenId OpenIDConfig `koanf:"openid"`

View File

@ -124,7 +124,7 @@ func main() {
log.Printf("Starting remote desktop gateway server")
cfg := &tls.Config{}
if conf.Server.Tls == "disable" {
if conf.Server.Tls == config.TlsDisable {
log.Printf("TLS disabled - rdp gw connections require tls, make sure to have a terminator")
} else {
// auto config
@ -203,7 +203,7 @@ func main() {
ServerConf: &gwConfig,
}
if conf.Server.Authentication == "local" {
if conf.Server.Authentication == config.AuthenticationBasic {
h := web.BasicAuthHandler{SocketAddress: conf.Server.AuthSocket}
http.Handle("/remoteDesktopGateway/", common.EnrichContext(h.BasicAuth(gw.HandleGatewayProtocol)))
} else {
@ -216,7 +216,7 @@ func main() {
http.Handle("/metrics", promhttp.Handler())
http.HandleFunc("/tokeninfo", web.TokenInfo)
if conf.Server.Tls == "disabled" {
if conf.Server.Tls == config.TlsDisable {
err = server.ListenAndServe()
} else {
err = server.ListenAndServeTLS("", "")