|
72 | 72 | MAGICASK = ('UNLIKELYVALUEMAGICASPICONSTANTS'
|
73 | 73 | '3141592926ISUSEDTONOTIFYTHEVALUEMUSTBEASKED')
|
74 | 74 |
|
| 75 | +MAGIC_INTERNAL_SERVICE = 'INTERNAL' |
75 | 76 | KEEPALIVE_INTERVAL = 30
|
76 | 77 | KEEPALIVE_GRACEDELAY = 30
|
77 | 78 | KEEPALIVE_TIMEOUT = KEEPALIVE_INTERVAL + KEEPALIVE_GRACEDELAY
|
@@ -1085,7 +1086,9 @@ def get_service(self) -> Tuple[Union[None, bool], str]:
|
1085 | 1086 | 'target_service': self.target_service_name,
|
1086 | 1087 | }
|
1087 | 1088 | if not self.internal_target:
|
1088 |
| - self.internal_target = (self.target_service_name == 'INTERNAL') |
| 1089 | + self.internal_target = ( |
| 1090 | + self.target_service_name == MAGIC_INTERNAL_SERVICE |
| 1091 | + ) |
1089 | 1092 | self.send_data(data_to_send)
|
1090 | 1093 | _status = True
|
1091 | 1094 | elif self.shared.get('selector') == MAGICASK:
|
@@ -1242,7 +1245,9 @@ def get_service(self) -> Tuple[Union[None, bool], str]:
|
1242 | 1245 | data_to_send['target_service'] = service_name
|
1243 | 1246 | self._full_user_device_account = f"{target_login}@{device_name}:{wab_login}"
|
1244 | 1247 | if not self.internal_target:
|
1245 |
| - self.internal_target = (s[2] == 'INTERNAL') |
| 1248 | + self.internal_target = ( |
| 1249 | + service_name == MAGIC_INTERNAL_SERVICE |
| 1250 | + ) |
1246 | 1251 | self.send_data(data_to_send)
|
1247 | 1252 | self.target_service_name = service_name
|
1248 | 1253 | self.target_group = s[0]
|
@@ -1391,10 +1396,7 @@ def select_target(self) -> Tuple[Any, bool, str]:
|
1391 | 1396 | selected_target = None
|
1392 | 1397 | target_device = self.shared.get('target_device')
|
1393 | 1398 | target_login = self.shared.get('target_login')
|
1394 |
| - target_service = ( |
1395 |
| - self.target_service_name if self.target_service_name != 'INTERNAL' |
1396 |
| - else 'RDP' |
1397 |
| - ) |
| 1399 | + target_service = self.target_service_name |
1398 | 1400 | target_group = self.target_group
|
1399 | 1401 |
|
1400 | 1402 | Logger().info(f"selected target ==> {target_login} {target_device} {target_service}")
|
@@ -1837,7 +1839,7 @@ def connect_to_target(self, selected_target) -> Tuple[Union[None, bool], str]:
|
1837 | 1839 |
|
1838 | 1840 | if _status:
|
1839 | 1841 | module = kv.get('proto_dest')
|
1840 |
| - if module not in {'RDP', 'VNC', 'INTERNAL'}: |
| 1842 | + if module not in {'RDP', 'VNC'}: |
1841 | 1843 | module = 'RDP'
|
1842 | 1844 | if self.internal_target:
|
1843 | 1845 | module = 'INTERNAL'
|
|
0 commit comments