From 8876b04466c510a4d67f1349680aaccb0f357d3f Mon Sep 17 00:00:00 2001
From: Bolke de Bruin <bolke@xs4all.nl>
Date: Mon, 31 Aug 2020 21:40:29 +0200
Subject: [PATCH] Allow default domain
---
api/web.go | 7 +++----
config/configuration.go | 1 +
dev/docker/docker-compose.yml | 14 +-------------
main.go | 1 +
4 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/api/web.go b/api/web.go
index 8a35069..edb0cb6 100644
--- a/api/web.go
+++ b/api/web.go
@@ -43,6 +43,7 @@ type Config struct {
BandwidthAutoDetect int
ConnectionType int
SplitUserDomain bool
+ DefaultDomain string
}
func (c *Config) NewApi() {
@@ -158,16 +159,14 @@ func (c *Config) HandleDownload(w http.ResponseWriter, r *http.Request) {
host = strings.Replace(host, "{{ preferred_username }}", userName, 1)
// split the username into user and domain
- var user string
- var domain string
+ var user = userName
+ var domain = c.DefaultDomain
if c.SplitUserDomain {
creds := strings.SplitN(userName, "@", 2)
user = creds[0]
if len(creds) > 1 {
domain = creds[1]
}
- } else {
- user = userName
}
render := user
diff --git a/config/configuration.go b/config/configuration.go
index 03de469..43b7705 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -58,6 +58,7 @@ type ClientConfig struct {
ConnectionType int
UsernameTemplate string
SplitUserDomain bool
+ DefaultDomain string
}
func init() {
diff --git a/dev/docker/docker-compose.yml b/dev/docker/docker-compose.yml
index e09fc15..a5e086f 100644
--- a/dev/docker/docker-compose.yml
+++ b/dev/docker/docker-compose.yml
@@ -33,16 +33,4 @@ services:
volumes:
- ${PWD}/xrdp_users.txt:/root/createusers.txt
environment:
- TZ: "Europe/London"
- rdpgw:
- build: .
- ports:
- - 9443:9443
- restart: on-failure
- depends_on:
- - keycloak
- healthcheck:
- test: ["CMD", "curl", "-f", "http://keycloak:8080"]
- interval: 30s
- timeout: 10s
- retries: 10
+ TZ: "Europe/Amsterdam"
diff --git a/main.go b/main.go
index 733e555..c6836d6 100644
--- a/main.go
+++ b/main.go
@@ -77,6 +77,7 @@ func main() {
BandwidthAutoDetect: conf.Client.BandwidthAutoDetect,
ConnectionType: conf.Client.ConnectionType,
SplitUserDomain: conf.Client.SplitUserDomain,
+ DefaultDomain: conf.Client.DefaultDomain,
}
api.NewApi()
--
GitLab