From f5d260f97a9787a9f1af4c2d6432b8d4bb54dd06 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 15 Jan 2025 17:02:13 +0100 Subject: [PATCH] automatically set resize method for RDP Signed-off-by: Jens Langhammer --- authentik/enterprise/providers/rac/models.py | 6 +++--- .../providers/rac/tests/test_models.py | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/authentik/enterprise/providers/rac/models.py b/authentik/enterprise/providers/rac/models.py index 5c93c08d1c4f..39b59553ce9f 100644 --- a/authentik/enterprise/providers/rac/models.py +++ b/authentik/enterprise/providers/rac/models.py @@ -159,9 +159,9 @@ def get_settings(self) -> dict: default_settings["port"] = str(port) else: default_settings["hostname"] = self.endpoint.host - default_settings["client-name"] = "authentik" - # default_settings["enable-drive"] = "true" - # default_settings["drive-name"] = "authentik" + if self.endpoint.protocol == Protocols.RDP: + default_settings["resize-method"] = "display-update" + default_settings["client-name"] = f"authentik - {self.session.user}" settings = {} always_merger.merge(settings, default_settings) always_merger.merge(settings, self.endpoint.provider.settings) diff --git a/authentik/enterprise/providers/rac/tests/test_models.py b/authentik/enterprise/providers/rac/tests/test_models.py index 5e583d7b6dc6..b6e7258d8334 100644 --- a/authentik/enterprise/providers/rac/tests/test_models.py +++ b/authentik/enterprise/providers/rac/tests/test_models.py @@ -50,9 +50,10 @@ def test_settings_merge(self): { "hostname": self.endpoint.host.split(":")[0], "port": "1324", - "client-name": "authentik", + "client-name": f"authentik - {self.user}", "drive-path": path, "create-drive-path": "true", + "resize-method": "display-update", }, ) # Set settings in provider @@ -63,10 +64,11 @@ def test_settings_merge(self): { "hostname": self.endpoint.host.split(":")[0], "port": "1324", - "client-name": "authentik", + "client-name": f"authentik - {self.user}", "drive-path": path, "create-drive-path": "true", "level": "provider", + "resize-method": "display-update", }, ) # Set settings in endpoint @@ -79,10 +81,11 @@ def test_settings_merge(self): { "hostname": self.endpoint.host.split(":")[0], "port": "1324", - "client-name": "authentik", + "client-name": f"authentik - {self.user}", "drive-path": path, "create-drive-path": "true", "level": "endpoint", + "resize-method": "display-update", }, ) # Set settings in token @@ -95,10 +98,11 @@ def test_settings_merge(self): { "hostname": self.endpoint.host.split(":")[0], "port": "1324", - "client-name": "authentik", + "client-name": f"authentik - {self.user}", "drive-path": path, "create-drive-path": "true", "level": "token", + "resize-method": "display-update", }, ) # Set settings in property mapping (provider) @@ -114,10 +118,11 @@ def test_settings_merge(self): { "hostname": self.endpoint.host.split(":")[0], "port": "1324", - "client-name": "authentik", + "client-name": f"authentik - {self.user}", "drive-path": path, "create-drive-path": "true", "level": "property_mapping_provider", + "resize-method": "display-update", }, ) # Set settings in property mapping (endpoint) @@ -135,11 +140,12 @@ def test_settings_merge(self): { "hostname": self.endpoint.host.split(":")[0], "port": "1324", - "client-name": "authentik", + "client-name": f"authentik - {self.user}", "drive-path": path, "create-drive-path": "true", "level": "property_mapping_endpoint", "foo": "true", "bar": "6", + "resize-method": "display-update", }, )