shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-25 23:21:41 +03:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v3.0'

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-03-03 12:27:39 +01:00
commit 5d52061041
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/services/PhysicalMachines/service_multi.py
View File

@ -137,10 +137,10 @@ class IPMachinesService(IPServiceBase):
d = self.storage.readData('ips') d = self.storage.readData('ips')
old_ips = pickle.loads(d) if d and isinstance(d, bytes) else [] old_ips = pickle.loads(d) if d and isinstance(d, bytes) else []
# dissapeared ones # dissapeared ones
dissapeared = set(old_ips) - set(self._ips) dissapeared = set(i.split('~')[0] for i in old_ips) - set(i.split('~')[0] for i in self._ips)
with transaction.atomic(): with transaction.atomic():
for removable in dissapeared: for removable in dissapeared:
self.storage.remove(removable.split('~')[0]) self.storage.remove(removable)
self._token = self.token.value.strip() self._token = self.token.value.strip()
self._port = self.port.value self._port = self.port.value

2
server/src/uds/web/util/configjs.py
View File

@ -94,7 +94,7 @@ def udsJs(request: 'HttpRequest') -> str:
# logger.debug('Authenticators PRE: %s', authenticators) # logger.debug('Authenticators PRE: %s', authenticators)
if tag and authenticators: # Refilter authenticators, visible and with this tag if required if tag and authenticators: # Refilter authenticators, visible and with this tag if required
authenticators = [x for x in authenticators if x.small_name == tag] authenticators = [x for x in authenticators if x.small_name == tag or (tag == 'disabled' and x.getType().isCustom() is False)]
if not authenticators: if not authenticators:
try: try: