diff --git a/server/src/uds/transports/RDP/rdp.py b/server/src/uds/transports/RDP/rdp.py
index 5187e7dcf..a91b30a57 100644
--- a/server/src/uds/transports/RDP/rdp.py
+++ b/server/src/uds/transports/RDP/rdp.py
@@ -97,7 +97,6 @@ class RDPTransport(BaseRDPTransport):
lnx_custom_parameters = BaseRDPTransport.lnx_custom_parameters
mac_custom_parameters = BaseRDPTransport.mac_custom_parameters
wnd_custom_parameters = BaseRDPTransport.wnd_custom_parameters
- wnd_optimize_teams = BaseRDPTransport.wnd_optimize_teams
def get_transport_script( # pylint: disable=too-many-locals
self,
@@ -147,7 +146,6 @@ class RDPTransport(BaseRDPTransport):
r.printer_params = self.lnx_printer_string.value
r.enforced_shares = self.enforce_drives.value
r.redir_usb = self.allow_usb_redirection.value
- r.optimize_teams = self.wnd_optimize_teams.as_bool()
sp: collections.abc.MutableMapping[str, typing.Any] = {
'password': ci.password,
@@ -164,7 +162,6 @@ class RDPTransport(BaseRDPTransport):
sp.update(
{
'as_file': r.as_file,
- 'optimize_teams': self.wnd_optimize_teams.as_bool(),
}
)
elif os.os == types.os.KnownOS.LINUX:
diff --git a/server/src/uds/transports/RDP/rdp_base.py b/server/src/uds/transports/RDP/rdp_base.py
index 66add4e43..562bd7dbc 100644
--- a/server/src/uds/transports/RDP/rdp_base.py
+++ b/server/src/uds/transports/RDP/rdp_base.py
@@ -354,14 +354,6 @@ class BaseRDPTransport(transports.Transport):
old_field_name='customParametersWindows',
)
- wnd_optimize_teams = gui.CheckBoxField(
- label=_('Optimize Teams'),
- order=46,
- tooltip=_('If checked, Teams will be optimized (only works on Windows clients)'),
- tab='Windows Client',
- old_field_name='optimizeTeams',
- )
-
def is_ip_allowed(self, userservice: 'models.UserService', ip: str) -> bool:
"""
Checks if the transport is available for the requested destination ip
@@ -434,9 +426,6 @@ class BaseRDPTransport(transports.Transport):
if azure_ad:
username = 'AzureAD\\' + username
- if self.wnd_optimize_teams.as_bool():
- password = '' # nosec
-
return types.connections.ConnectionData(
protocol=self.protocol,
username=username,
diff --git a/server/src/uds/transports/RDP/rdp_file.py b/server/src/uds/transports/RDP/rdp_file.py
index 4543b553f..a277e58bc 100644
--- a/server/src/uds/transports/RDP/rdp_file.py
+++ b/server/src/uds/transports/RDP/rdp_file.py
@@ -71,7 +71,6 @@ class RDPFile:
enable_clipboard: bool = False
custom_parameters: typing.Optional[str] = None
enforced_shares: typing.Optional[str] = None
- optimize_teams: bool = False
def __init__(
self,
@@ -236,7 +235,7 @@ class RDPFile:
if self.username:
res += 'username:s:' + self.username + '\n'
res += 'domain:s:' + self.domain + '\n'
- if self.target == types.os.KnownOS.WINDOWS and not self.optimize_teams:
+ if self.target == types.os.KnownOS.WINDOWS:
res += 'password 51:b:' + password + '\n'
res += 'alternate shell:s:' + '\n'
diff --git a/server/src/uds/transports/RDP/rdptunnel.py b/server/src/uds/transports/RDP/rdptunnel.py
index f31634b5e..e1b6ba6c6 100644
--- a/server/src/uds/transports/RDP/rdptunnel.py
+++ b/server/src/uds/transports/RDP/rdptunnel.py
@@ -179,7 +179,6 @@ class TRDPTransport(BaseRDPTransport):
r.printer_params = self.lnx_printer_string.value
r.enforced_shares = self.enforce_drives.value
r.redir_usb = self.allow_usb_redirection.value
- r.optimize_teams = self.wnd_optimize_teams.as_bool()
sp: collections.abc.MutableMapping[str, typing.Any] = {
'tunHost': tunnel_host,
@@ -199,7 +198,6 @@ class TRDPTransport(BaseRDPTransport):
sp.update(
{
'as_file': r.as_file,
- 'optimize_teams': self.wnd_optimize_teams.as_bool(),
}
)
elif os.os == types.os.KnownOS.LINUX:
diff --git a/server/src/uds/transports/RDP/scripts/windows/direct.py b/server/src/uds/transports/RDP/scripts/windows/direct.py
index cec1f173f..4ac790e3c 100644
--- a/server/src/uds/transports/RDP/scripts/windows/direct.py
+++ b/server/src/uds/transports/RDP/scripts/windows/direct.py
@@ -1,6 +1,5 @@
# pyright: reportUnknownMemberType=false,reportUnknownArgumentType=false,reportAttributeAccessIssue=false
import typing
-import os
import win32crypt # type: ignore
import codecs
@@ -46,24 +45,10 @@ except Exception as e: # nosec: Not really interested in the exception
theFile = sp['as_file'].format(password=password) # type: ignore
filename = tools.saveTempFile(theFile)
-if sp['optimize_teams'] == True: # type: ignore
- try:
- # Very basic check for RDP client from Microsoft Store
- h = wreg.OpenKey(wreg.HKEY_CLASSES_ROOT, '.rdp\\OpenWithProgids', 0, wreg.KEY_READ) # type: ignore
- h.Close()
- except Exception:
- raise Exception(
- 'Required Microsoft Remote Desktop Application is not found. Please, install it from Microsoft store.'
- )
- # Add .rdp to filename for open with
- os.rename(filename, filename + '.rdp')
- filename = filename + '.rdp'
- os.startfile(filename) # type: ignore # nosec
-else:
- executable = tools.findApp('mstsc.exe')
- if executable is None:
- raise Exception('Unable to find mstsc.exe. Check that path points to your SYSTEM32 folder')
+executable = tools.findApp('mstsc.exe')
+if executable is None:
+ raise Exception('Unable to find mstsc.exe. Check that path points to your SYSTEM32 folder')
- subprocess.Popen([executable, filename]) # nosec
+subprocess.Popen([executable, filename]) # nosec
# tools.addFileToUnlink(filename)
diff --git a/server/src/uds/transports/RDP/scripts/windows/direct.py.signature b/server/src/uds/transports/RDP/scripts/windows/direct.py.signature
index ec38b1b28..6995441d8 100644
--- a/server/src/uds/transports/RDP/scripts/windows/direct.py.signature
+++ b/server/src/uds/transports/RDP/scripts/windows/direct.py.signature
@@ -1 +1 @@
-kBJEVUJkPgpeSDRG4H4qcTOKmKhQgFIW1mtGWGvHiyALe/RTrBo8VcA9moZcGADAmZV0TYRmQRU4xQg0yD7A1fAo9ohMCxcszGSuEhbfC7Zk5KMMccqNRDVczRB2Kfc/KjcFcxpvcIMledEnJVWzjgzPdoogVWsNAKzXaRxugRxBa8vKYMaErnc9ffkdyWLMnQJrET7UNqLeOfFkClGdvilq4ARrkaM2IcYyTbpuNiUB6LlZh4ChrNGzMkNBHmUs/njPGd289MV+pkx4IQD3sZZCzXjNXQWIijjvzZ7udydqy6n0m2XMaRLb4RLnqTyQXTMR2IW6sSu4FZ770Mz2aGp6xN1L/RFuJD3llCJCIVshu92EHjG3oUeiNejrPnydy/wFOmaBuBs6s92LUNjpnxQ8zFHnJYSMYOzmV0/Dw+TOGuZqKCJeYsMp76ijwUSIb0UzQdWHYtEu8p7VyQPmHmD5pmI0yIsgqMoaiddmV4t/qk95QMZBWjsU+CdDETSx3F+pDX7q9Z2IDIKWNpT0zVSktNG4FOC8xZL0vJ13f3aOYPPnFzwDePujfqWacFQHmEDIUkYWJuTSvDpaxPdj/JO6eHLIoBsP5Dp7pWxrHKNSgsuSVBaF4hmEiAjY3hTIGpdReRCqurzS6Zsrwd069UmLYTL1BAWCrR4XPzO3zPg=
\ No newline at end of file
+R3sdB3d7hhz6VEoAGNzdX0vIKgss4Xe1aEU62cTQKIA7Inw2zHkaBK0wRVxZqMYH5Of/iiyMiG+NlKFAWutSrOOthoyVT83RNtDpR4F+vDTZMpW2qopiiK6XbxX5PuJq/E3UWNsnElZasAIpJk9rKqlNEJ+tkycWyDkIYIHxE6M2yrqH+dWx/V3AaDMURtnzuZStzpxPMuEzezNdCI9Kbs1fCwSz18SRSkAtNINiMJbgBV573wwKEUUgKLzRHn1ijRk65OHRVLFDlRgXz/ArN0/nkW/FkQ9pYJW5MosD4TJfptO8QZ104jYPM960maMxObLWa4LZyzEVNZ2uIE9xIWHh9SCZ3zv37DfSU6hM9n4gOKlIVGIO5hrctjZLzAwRcgsBFcXLXxtlrHQERjh7Zgr5mevjXz0yO+76pUbdgEWVwlT8G5SG4yq7083drwfNgMv5uht8GyRqes+FD952ECjv+hVeoLRItg+mxaUnILHHJOyw8A47Ex0PikHzpbT/SxzQA+CkxEMRPSD6GDPBYiKBAYm+b0Yazo5Yzo85S2GRubPaEVp6UQ6AVgWEtsfhx5yeU+tJx6AD1+MYEpB04Re6XjMeSV5zdDsHkS/HQ7kafbxS0RxU78e0LEltbW06zGNGvk/cZlIr1SE93Ztvyi1R4wZNdDRaM6vLKOD3RGo=
\ No newline at end of file