updating user interface manager

* Upgraded typing information on models
* Removed unused DBFile
* renamed osmanager.png wrong name

.gitignore

@@ -32,9 +32,6 @@
 /client/administration/installer/UDSAdminInstaller/MSChart.exe
 /client/administration/installer/UDSAdminInstaller/UDSAdminSetup.exe
 
-# /guacamole-tunnel/
-/guacamole-tunnel/target
-
 # /linuxActor/
 /linuxActor/udsactor_*
 
@@ -67,8 +64,6 @@
 
 # /server/
 *_enterprise
-/server/openuds.sublime-project
-/server/openuds.sublime-workspace
 
 # /server/src/
 /server/src/taskmanager.pid
@@ -91,7 +86,6 @@
 # /server/src/uds/
 /server/src/uds/*_enterprise.py
 /server/src/uds/fixtures
-/server/src/uds/tests
 
 # /server/src/uds/auths/
 /server/src/uds/auths/*-enterprise
@@ -168,3 +162,4 @@
 
 .vscode
 .mypy_cache
+.pytest_cache

LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2022, Virtual Cable S.L.U.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -10,7 +10,6 @@ OpenUDS (Universal Desktop Services) is a multiplatform connection broker for:
 
 This is an Open Source Source project, initiated by Spanish Company ​Virtualcable and released Open Source with the help of several Spanish Universities.
 
-Any help provided will be welcome.
+Please fell free to contribute to this project.
 
-**Note: Master version is always under heavy development and it is not recommended for use, it will probably have unfixed bugs.
-      For use, please use the latest stable branch.**
+**Note: Master version is always under heavy development and it is not recommended for use, it will probably have unfixed bugs.  Please use the latest stable branch.**

VERSION

@@ -1 +1 @@
-3.0.0
+4.0.0

actor/.env

@@ -0,0 +1,2 @@
+PYTHONPATH=./src:${PYTHONPATH}
+

actor/deps.txt

@@ -1,4 +0,0 @@
-Linux:
-python3-prctl (recommended, but not required in fact)
-python3-pyqt5
-

actor/linux/build-packages.sh

@@ -11,6 +11,9 @@ dpkg-buildpackage -b
 cat udsactor-template.spec | 
   sed -e s/"version 0.0.0"/"version ${VERSION}"/g |
   sed -e s/"release 1"/"release ${RELEASE}"/g > udsactor-$VERSION.spec
+cat udsactor-unmanaged-template.spec | 
+  sed -e s/"version 0.0.0"/"version ${VERSION}"/g |
+  sed -e s/"release 1"/"release ${RELEASE}"/g > udsactor-unmanaged-$VERSION.spec
   
 # Now fix dependencies for opensuse
 # Note that, although on opensuse the library is "libXss1" on newer,
@@ -22,7 +25,7 @@ cat udsactor-template.spec |
 #   sed -e s/"libXScrnSaver"/"libXss1"/g > udsactor-opensuse-$VERSION.spec
 
 #for pkg in udsactor-$VERSION.spec udsactor-opensuse-$VERSION.spec; do
-for pkg in udsactor-$VERSION.spec; do
+for pkg in udsactor-*$VERSION.spec; do
     
     rm -rf rpm
     for folder in SOURCES BUILD RPMS SPECS SRPMS; do

actor/linux/debian/changelog

@@ -1,3 +1,21 @@
+udsactor (4.0.0) stable; urgency=medium
+
+  * Upgraded to 4.0.0 release
+
+ -- Adolfo Gómez García <agomez@virtualcable.es>  Fri, 1 Jul 2022 15:00:00 +0200
+
+udsactor (3.6.0) stable; urgency=medium
+
+  * Upgraded to 3.6.0 release
+
+ -- Adolfo Gómez García <agomez@virtualcable.es>  Fri, 1 Jul 2022 14:00:00 +0200
+
+udsactor (3.5.0) stable; urgency=medium
+
+  * Upgraded to 3.5.0 release
+
+ -- Adolfo Gómez García <agomez@virtualcable.es>  Fri, 23 Oct 2020 8:00:00 +0200
+
 udsactor (3.0.0) stable; urgency=medium
 
   * Upgraded to 3.0.0 release

actor/linux/debian/control

@@ -10,7 +10,7 @@ Package: udsactor
 Section: admin
 Priority: optional
 Architecture: all
-Depends: policykit-1(>=0.100), python3-requests (>=0.8.2), python3-pyqt5 (>=4.9), python3-six(>=1.1), python3 (>=3.4), libxss1, xscreensaver, ${misc:Depends}
+Depends: policykit-1(>=0.100), python3-requests (>=0.8.2), python3-pyqt5 (>=4.9), python3-six(>=1.1), python3 (>=3.6), libxss1, xscreensaver, ${misc:Depends}
 Recommends: python3-prctl(>=1.1.1)
 Description: Actor for Universal Desktop Services (UDS) Broker
  This package provides the required components to allow managed machines to work on an environment managed by UDS Broker.
@@ -19,7 +19,7 @@ Package: udsactor-unmanaged
 Section: admin
 Priority: optional
 Architecture: all
-Depends: policykit-1(>=0.100), python3-requests (>=0.8.2), python3-pyqt5 (>=4.9), python3-six(>=1.1), python3 (>=3.4), libxss1, xscreensaver, ${misc:Depends}
+Depends: policykit-1(>=0.100), python3-requests (>=0.8.2), python3-pyqt5 (>=4.9), python3-six(>=1.1), python3 (>=3.6), libxss1, xscreensaver, ${misc:Depends}
 Recommends: python3-prctl(>=1.1.1)
 Description: Actor for Universal Desktop Services (UDS) Broker Static Unmanaged machines
  This package provides the required components to allow unmanaged machines (static, independent machines) to work on an environment managed by UDS Broker.

actor/linux/debian/files

@@ -1,3 +1,3 @@
-udsactor-unmanaged_3.0.0_all.deb admin optional
-udsactor_3.0.0_all.deb admin optional
-udsactor_3.0.0_amd64.buildinfo admin optional
+udsactor-unmanaged_3.6.0_all.deb admin optional
+udsactor_3.6.0_all.deb admin optional
+udsactor_3.6.0_amd64.buildinfo admin optional

actor/linux/scripts/UDSActorConfig

@@ -3,4 +3,4 @@
 FOLDER=/usr/share/UDSActor
 
 cd $FOLDER
-exec python3 actor_config.py $@
+exec python3 actor_config.py -platform xcb $@

actor/linux/scripts/UDSActorConfig-unmanaged

@@ -3,4 +3,4 @@
 FOLDER=/usr/share/UDSActor
 
 cd $FOLDER
-exec python3 actor_config_unmanaged.py $@
+exec python3 actor_config_unmanaged.py -platform xcb $@

actor/linux/scripts/UDSActorTool

@@ -3,4 +3,4 @@
 FOLDER=/usr/share/UDSActor
 
 cd $FOLDER
-exec python3 actor_client.py $@
+exec python3 -s actor_client.py -platform xcb $@

actor/linux/udsactor-unmanaged-template.spec

@@ -1,5 +1,5 @@
 %define _topdir %(echo $PWD)/rpm
-%define name udsactor
+%define name udsactor-unmanaged
 %define version 0.0.0
 %define release 1
 %define buildroot %{_topdir}/%{name}-%{version}-%{release}-root
@@ -11,7 +11,7 @@ Release: %{release}
 Summary: Actor for Universal Desktop Services (UDS) Broker
 License: BSD3
 Group: Admin
-Requires: python-six python-requests PyQt4 libXScrnSaver
+Requires: python3-six python3-requests python3-qt5 libXScrnSaver
 Vendor: Virtual Cable S.L.U.
 URL: http://www.udsenterprise.com
 Provides: udsactor
@@ -23,7 +23,7 @@ Provides: udsactor
 %install
 curdir=`pwd`
 cd ../..
-make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh install-udsactor
+make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh install-udsactor-unmanaged
 cd $curdir
 
 %clean
@@ -51,13 +51,13 @@ fi
 rm -rf /usr/share/UDSActor > /dev/null 2>&1
 
 %description
-This package provides the required components to allow this machine to work on an environment managed by UDS Broker.
+This package provides the required components to allow this unmanaged machine to work on an environment managed by UDS Broker.
 
 %files
 %defattr(-,root,root)
 /etc/udsactor
 /etc/xdg/autostart/UDSActorTool.desktop
-/etc/init.d/udsactor
+/etc/systemd/system/udsactor.service
 /usr/bin/UDSActorTool-startup
 /usr/bin/udsactor
 /usr/bin/udsvapp

actor/macos/net.virtualcable.udsactor.server.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>net.virtualcable.udsactor.server</string>
+
+  <key>KeepAlive</key>
+  <dict>
+    <key>SuccessfulExit</key>
+    <false/>
+  </dict>
+
+  <key>ProgramArguments</key>
+  <array>
+    <string>/Applications/UDSActor.app/Contents/MacOS/udsactor</string>
+    <string>start</string>
+  </array>
+
+  <key>RunAtLoad</key>
+  <true/>
+
+  <key>StandardErrorPath</key>
+  <string>/var/log/udsactor.log</string>
+
+  <key>StandardOutPath</key>
+  <string>/var/log/nxserver.log</string>
+
+  <key>WorkingDirectory</key>
+  <string>/Applications/UDSActor.app/Contents/Resources/</string>
+
+</dict>
+</plist>

actor/macos/notes.txt

@@ -0,0 +1 @@
+service file (net.virtualcable.udsactor.server.plist) goes in /Library/LaunchDaemons

actor/src/actor_client.py

@@ -29,33 +29,32 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-# pylint: disable=invalid-name
 import sys
 import os
 
-import PyQt5  # pylint: disable=unused-import
+import PyQt5  # noqa
 from PyQt5.QtCore import QTimer
 from PyQt5.QtWidgets import QMainWindow
 
 from udsactor.log import logger, INFO
 from udsactor.client import UDSClientQApp
-from udsactor.platform import operations
+from udsactor import platform
 
 if __name__ == "__main__":
     logger.setLevel(INFO)
 
     # Ensure idle operations is initialized on start
-    operations.initIdleDuration(0)
+    platform.operations.initIdleDuration(0)
 
-    if 'linux' in sys.platform:
+    if platform.is_linux:
         os.environ['QT_X11_NO_MITSHM'] = '1'
 
     UDSClientQApp.setQuitOnLastWindowClosed(False)
 
     qApp = UDSClientQApp(sys.argv)
 
-    if 'linux' not in sys.platform:
-        # The "hidden window" is only needed to process events on Windows
+    if platform.is_windows or platform.is_mac:
+        # The "hidden window" is not needed on linux
         # Not needed on Linux
         mw = QMainWindow()
         mw.showMinimized()  # Start minimized, will be hidden (not destroyed) as soon as qApp.init is invoked
@@ -67,9 +66,9 @@ if __name__ == "__main__":
     # Note: Signals are only checked on python code execution, so we create a timer to force call back to python
     timer = QTimer(qApp)
     timer.start(1000)
-    timer.timeout.connect(lambda *a: None)
+    timer.timeout.connect(lambda *a: None)  # type: ignore  # timeout can be connected to a callable
 
-    qApp.exec_()
+    qApp.exec()
 
     # On windows, if no window is created, this point will never be reached.
     qApp.end()

actor/src/actor_config.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2020 Virtual Cable S.L.
+# Copyright (c) 2020-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -35,7 +35,7 @@ import os
 import logging
 import typing
 
-import PyQt5  # pylint: disable=unused-import
+import PyQt5  # Ensures PyQt is included in the package
 from PyQt5.QtWidgets import QApplication, QDialog, QFileDialog, QMessageBox
 
 import udsactor
@@ -187,9 +187,9 @@ if __name__ == "__main__":
     app = QApplication(sys.argv)
 
     if udsactor.platform.operations.checkPermissions() is False:
-        QMessageBox.critical(None, 'UDS Actor', 'This Program must be executed as administrator', QMessageBox.Ok)
+        QMessageBox.critical(None, 'UDS Actor', 'This Program must be executed as administrator', QMessageBox.Ok)  # type: ignore
         sys.exit(1)
 
     myapp = UDSConfigDialog()
     myapp.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

actor/src/actor_config_unmanaged.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2020 Virtual Cable S.L.
+# Copyright (c) 2020-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -12,7 +12,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -32,7 +32,7 @@
 # pylint: disable=invalid-name
 import sys
 import os
-import pickle
+import pickle  # nosec: B403
 import logging
 import typing
 
@@ -40,6 +40,7 @@ import PyQt5  # pylint: disable=unused-import
 from PyQt5.QtWidgets import QApplication, QDialog, QMessageBox
 
 import udsactor
+import udsactor.tools
 
 from ui.setup_dialog_unmanaged_ui import Ui_UdsActorSetupDialog
 
@@ -49,6 +50,7 @@ if typing.TYPE_CHECKING:
 
 logger = logging.getLogger('actor')
 
+
 class UDSConfigDialog(QDialog):
     _host: str = ''
     _config: udsactor.types.ActorConfigurationType
@@ -60,91 +62,130 @@ class UDSConfigDialog(QDialog):
         self.ui = Ui_UdsActorSetupDialog()
         self.ui.setupUi(self)
         self.ui.host.setText(self._config.host)
-        self.ui.validateCertificate.setCurrentIndex(1 if self._config.validateCertificate else 0)
+        self.ui.validateCertificate.setCurrentIndex(
+            1 if self._config.validateCertificate else 0
+        )
         self.ui.logLevelComboBox.setCurrentIndex(self._config.log_level)
-        self.ui.serviceToken.setText(self._config.master_token)
+        self.ui.serviceToken.setText(self._config.master_token or '')
+        self.ui.restrictNet.setText(self._config.restrict_net or '')
 
-        self.ui.testButton.setEnabled(bool(self._config.master_token and self._config.host))
+        self.ui.testButton.setEnabled(
+            bool(self._config.master_token and self._config.host)
+        )
 
     @property
     def api(self) -> udsactor.rest.UDSServerApi:
-        return udsactor.rest.UDSServerApi(self.ui.host.text(), self.ui.validateCertificate.currentIndex() == 1)
+        return udsactor.rest.UDSServerApi(
+            self.ui.host.text(), self.ui.validateCertificate.currentIndex() == 1
+        )
 
     def finish(self) -> None:
         self.close()
 
     def configChanged(self, text: str) -> None:
-        self.ui.testButton.setEnabled(self.ui.host.text() == self._config.host and self.ui.serviceToken.text() == self._config.master_token)
+        self.ui.testButton.setEnabled(
+            self.ui.host.text() == self._config.host
+            and self.ui.serviceToken.text() == self._config.master_token
+            and self.ui.restrictNet.text() == self._config.restrict_net
+        )
 
     def testUDSServer(self) -> None:
         if not self._config.master_token or not self._config.host:
             self.ui.testButton.setEnabled(False)
             return
         try:
-            api = udsactor.rest.UDSServerApi(self._config.host, self._config.validateCertificate)
+            api = udsactor.rest.UDSServerApi(
+                self._config.host, self._config.validateCertificate
+            )
             if not api.test(self._config.master_token, udsactor.types.UNMANAGED):
                 QMessageBox.information(
                     self,
                     'UDS Test',
                     'Service token seems to be invalid . Please, check token validity.',
-                    QMessageBox.Ok
+                    QMessageBox.Ok,  # type: ignore
                 )
             else:
                 QMessageBox.information(
                     self,
                     'UDS Test',
-                    'Configuration for {} seems to be correct.'.format(self._config.host),
-                    QMessageBox.Ok
+                    'Configuration for {} seems to be correct.'.format(
+                        self._config.host
+                    ),
+                    QMessageBox.Ok,  # type: ignore
                 )
         except Exception:
             QMessageBox.information(
                 self,
                 'UDS Test',
                 'Configured host {} seems to be inaccesible.'.format(self._config.host),
-                QMessageBox.Ok
+                QMessageBox.Ok,  # type: ignore
             )
 
     def saveConfig(self) -> None:
+        # Ensure restrict_net is empty or a valid subnet
+        restrictNet = self.ui.restrictNet.text().strip()
+        if restrictNet:
+            try:
+                subnet = udsactor.tools.strToNoIPV4Network(restrictNet)
+                if not subnet:
+                    raise Exception('Invalid subnet')
+            except Exception:
+                QMessageBox.information(
+                    self,
+                    'Invalid subnet',
+                    'Invalid subnet {}. Please, check it.'.format(restrictNet),
+                    QMessageBox.Ok,  # type: ignore
+                )
+                return
+
         # Store parameters on register for later use, notify user of registration
         self._config = udsactor.types.ActorConfigurationType(
             actorType=udsactor.types.UNMANAGED,
             host=self.ui.host.text(),
             validateCertificate=self.ui.validateCertificate.currentIndex() == 1,
-            master_token=self.ui.serviceToken.text(),
-            log_level=self.ui.logLevelComboBox.currentIndex()
+            master_token=self.ui.serviceToken.text().strip(),
+            restrict_net=restrictNet,
+            log_level=self.ui.logLevelComboBox.currentIndex(),
         )
 
         udsactor.platform.store.writeConfig(self._config)
         # Enables test button
         self.ui.testButton.setEnabled(True)
         # Informs the user
-        QMessageBox.information(self, 'UDS Configuration', 'Configuration saved.', QMessageBox.Ok)
+        QMessageBox.information(
+            self,
+            'UDS Configuration',
+            'Configuration saved.',
+            QMessageBox.Ok,  # type: ignore
+        )
 
 
 if __name__ == "__main__":
-    # If to be run as "sudo" on linux, we will need this to avoid problems
+    # If run as "sudo" on linux, we will need this to avoid problems
     if 'linux' in sys.platform:
         os.environ['QT_X11_NO_MITSHM'] = '1'
 
     app = QApplication(sys.argv)
-    
+
     if udsactor.platform.operations.checkPermissions() is False:
-        QMessageBox.critical(None, 'UDS Actor', 'This Program must be executed as administrator', QMessageBox.Ok)
+        QMessageBox.critical(None, 'UDS Actor', 'This Program must be executed as administrator', QMessageBox.Ok)  # type: ignore
         sys.exit(1)
 
     if len(sys.argv) > 2:
         if sys.argv[1] == 'export':
             try:
-                with open(sys.argv[2], 'wb') as f:
-                    pickle.dump(udsactor.platform.store.readConfig(), f, protocol=3)
+                with open(sys.argv[2], 'wb') as export_:
+                    pickle.dump(
+                        udsactor.platform.store.readConfig(), export_, protocol=3
+                    )
             except Exception as e:
                 print('Error exporting configuration file: {}'.format(e))
                 sys.exit(1)
             sys.exit(0)
-        if sys.argv[1] == 'import':
+        elif sys.argv[1] == 'import':
             try:
-                with open(sys.argv[2], 'rb') as f:
-                    config = pickle.load(f)
+                with open(sys.argv[2], 'rb') as import_:
+                    config = pickle.load(import_)  # nosec: B301: the file is provided by user, so it's not a security issue
                 udsactor.platform.store.writeConfig(config)
             except Exception as e:
                 print('Error importing configuration file: {}'.format(e))
@@ -153,4 +194,4 @@ if __name__ == "__main__":
 
     myapp = UDSConfigDialog()
     myapp.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

actor/src/actor_service.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2020 Virtual Cable S.L.
+# Copyright (c) 2020-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -12,7 +12,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -29,12 +29,8 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-import sys
+from udsactor import platform
 
-if sys.platform == 'win32':
-    from udsactor.windows import runner
-else:
-    from udsactor.linux import runner
 
 if __name__ == "__main__":
-    runner.run()
+    platform.runner.run()

actor/src/designer/setup-dialog-unmanaged.ui

@@ -10,8 +10,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>595</width>
-    <height>220</height>
+    <width>601</width>
+    <height>243</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -55,7 +55,7 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>180</y>
+     <y>210</y>
      <width>181</width>
      <height>23</height>
     </rect>
@@ -83,7 +83,7 @@
    <property name="geometry">
     <rect>
      <x>410</x>
-     <y>180</y>
+     <y>210</y>
      <width>171</width>
      <height>23</height>
     </rect>
@@ -117,7 +117,7 @@
    <property name="geometry">
     <rect>
      <x>210</x>
-     <y>180</y>
+     <y>210</y>
      <width>181</width>
      <height>23</height>
     </rect>
@@ -144,7 +144,7 @@
      <x>10</x>
      <y>10</y>
      <width>571</width>
-     <height>161</height>
+     <height>191</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
@@ -214,21 +214,21 @@
     <item row="2" column="1">
      <widget class="QLineEdit" name="serviceToken">
       <property name="toolTip">
-       <string>UDS user with administration rights (Will not be stored on template)</string>
+       <string>UDS Service Token</string>
       </property>
       <property name="whatsThis">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Administrator user on UDS Server.&lt;/p&gt;&lt;p&gt;Note: This credential will not be stored on client. Will be used to obtain an unique token for this image.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Token of the service on UDS platform&lt;/p&gt;&lt;p&gt;This token can be obtainend from the service configuration on UDS.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
+    <item row="4" column="0">
      <widget class="QLabel" name="label_loglevel">
       <property name="text">
        <string>Log Level</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
+    <item row="4" column="1">
      <widget class="QComboBox" name="logLevelComboBox">
       <property name="currentIndex">
        <number>1</number>
@@ -258,6 +258,23 @@
       </item>
      </widget>
     </item>
+    <item row="3" column="0">
+     <widget class="QLabel" name="label_restrictNet">
+      <property name="text">
+       <string>Restrict Net</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1">
+     <widget class="QLineEdit" name="restrictNet">
+      <property name="toolTip">
+       <string>Restrict valid detection of network interfaces to this network.</string>
+      </property>
+      <property name="whatsThis">
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Restrics valid detection of network interfaces.&lt;/p&gt;&lt;p&gt;Note: Use this field only in case of several network interfaces, so UDS knows which one is the interface where the user will be connected..&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+     </widget>
+    </item>
    </layout>
    <zorder>label_host</zorder>
    <zorder>host</zorder>
@@ -267,6 +284,8 @@
    <zorder>label_security</zorder>
    <zorder>label_loglevel</zorder>
    <zorder>logLevelComboBox</zorder>
+   <zorder>label_restrictNet</zorder>
+   <zorder>restrictNet</zorder>
   </widget>
  </widget>
  <resources>
@@ -353,6 +372,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>restrictNet</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>UdsActorSetupDialog</receiver>
+   <slot>configChanged()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>341</x>
+     <y>139</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>295</x>
+     <y>121</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>finish()</slot>

actor/src/udsactor/__init__.py

@@ -35,4 +35,4 @@ from . import platform
 __title__ = 'udsactor'
 __author__ = 'Adolfo Gómez <dkmaster@dkmon.com>'
 __license__ = "BSD 3-clause"
-__copyright__ = "Copyright 2014-2020 VirtualCable S.L.U."
+__copyright__ = "Copyright 2014-2022 VirtualCable S.L.U."

actor/src/udsactor/client.py

@@ -65,9 +65,9 @@ class UDSClientQApp(QApplication):
         self._initialized = False
 
         # This will be invoked on session close
-        self.commitDataRequest.connect(self.end)  # Will be invoked on session close, to gracely close app
+        self.commitDataRequest.connect(self.end)  # type: ignore  # Will be invoked on session close, to gracely close app
         # self.aboutToQuit.connect(self.end)
-        self.message.connect(self.showMessage)
+        self.message.connect(self.showMessage)  # type: ignore  # there are problems with Pylance and connects on PyQt5... :)
 
         # Execute backgroup thread for actions
         self._app = UDSActorClient(self)
@@ -94,7 +94,7 @@ class UDSClientQApp(QApplication):
         self._app.join()
 
     def showMessage(self, message: str) -> None:
-        QMessageBox.information(None, 'Message', message)
+        QMessageBox.information(None, 'Message', message)  # type: ignore
 
     def setMainWindow(self, mw: 'QMainWindow'):
         self._mainWindow = mw
@@ -108,6 +108,7 @@ class UDSActorClient(threading.Thread):  # pylint: disable=too-many-instance-att
     _listener: client.HTTPServerThread
     _loginInfo: typing.Optional['types.LoginResultInfoType']
     _notified: bool
+    _notifiedDeadline: bool
     _sessionStartTime: datetime.datetime
     api: rest.UDSClientApi
 
@@ -115,13 +116,14 @@ class UDSActorClient(threading.Thread):  # pylint: disable=too-many-instance-att
         super().__init__()
 
         self.api = rest.UDSClientApi()  # Self initialized
-        self._qApp = qApp
+        self._qApp = typing.cast(UDSClientQApp, qApp)
         self._running = False
         self._forceLogoff = False
         self._extraLogoff = ''
         self._listener = client.HTTPServerThread(self)
         self._loginInfo = None
         self._notified = False
+        self._notifiedDeadline = False
 
         # Capture stop signals..
         logger.debug('Setting signals...')
@@ -139,8 +141,8 @@ class UDSActorClient(threading.Thread):  # pylint: disable=too-many-instance-att
         remainingTime = self._loginInfo.dead_line - (datetime.datetime.now() - self._sessionStartTime).total_seconds()
         logger.debug('Remaining time: {}'.format(remainingTime))
 
-        if not self._notified and remainingTime < 300:  # With five minutes, show a warning message
-            self._notified = True
+        if not self._notifiedDeadline and remainingTime < 300:  # With five minutes, show a warning message
+            self._notifiedDeadline = True
             self._showMessage('Your session will expire in less that 5 minutes. Please, save your work and disconnect.')
             return
 
@@ -183,7 +185,8 @@ class UDSActorClient(threading.Thread):  # pylint: disable=too-many-instance-att
 
         try:
             # Notify loging and mark it
-            self._loginInfo = self.api.login(platform.operations.getCurrentUser(), platform.operations.getSessionType())
+            user, sessionType = platform.operations.getCurrentUser(), platform.operations.getSessionType()
+            self._loginInfo = self.api.login(user, sessionType)
 
             if self._loginInfo.max_idle:
                 platform.operations.initIdleDuration(self._loginInfo.max_idle)
@@ -193,10 +196,13 @@ class UDSActorClient(threading.Thread):  # pylint: disable=too-many-instance-att
                 self.checkIdle()
                 self.checkDeadLine()
 
-                time.sleep(1.3)  # Sleeps between loop iterations
+                time.sleep(1.22)  # Sleeps between loop iterations
 
+            self.api.logout(user + self._extraLogoff, sessionType)
+            logger.info('Notified logout for %s (%s)', user, sessionType)  # Log logout
+
+            # Clean up login info
             self._loginInfo = None
-            self.api.logout(platform.operations.getCurrentUser() + self._extraLogoff)
         except Exception as e:
             logger.error('Error on client loop: %s', e)
 
@@ -210,7 +216,7 @@ class UDSActorClient(threading.Thread):  # pylint: disable=too-many-instance-att
             platform.operations.loggoff()
 
     def _showMessage(self, message: str) -> None:
-        self._qApp.message.emit(message)
+        self._qApp.message.emit(message)   # type: ignore  # there are problems with Pylance and connects on PyQt5... :)
 
     def stop(self) -> None:
         logger.debug('Stopping client Service')
@@ -230,13 +236,13 @@ class UDSActorClient(threading.Thread):  # pylint: disable=too-many-instance-att
         On windows, an RDP session with minimized screen will render "black screen"
         So only when user is using RDP connection will return an "actual" screenshot
         '''
-        pixmap: 'QPixmap' = self._qApp.primaryScreen().grabWindow(0)
+        pixmap: 'QPixmap' = self._qApp.primaryScreen().grabWindow(0)  # type: ignore
         ba = QByteArray()
         buffer = QBuffer(ba)
-        buffer.open(QIODevice.WriteOnly)
+        buffer.open(QIODevice.WriteOnly)  # type: ignore
         pixmap.save(buffer, 'PNG')
         buffer.close()
-        scrBase64 = bytes(ba.toBase64()).decode()
+        scrBase64 = bytes(ba.toBase64()).decode()    # type: ignore  # there are problems with Pylance and connects on PyQt5... :)
         logger.debug('Screenshot length: %s', len(scrBase64))
         return scrBase64  # 'result' of JSON will contain base64 of screen
 

actor/src/udsactor/http/client.py

@@ -132,7 +132,7 @@ class HTTPServerThread(threading.Thread):
         self._app = app
 
         self.port = -1
-        self.id = secrets.token_urlsafe(16)
+        self.id = secrets.token_urlsafe(24)
 
     @property
     def url(self) -> str:

actor/src/udsactor/http/clients_pool.py

@@ -33,8 +33,8 @@ import json
 import typing
 
 import requests
-
-from ..log import logger
+from udsactor import tools, types
+from udsactor.log import logger
 
 # For avoid proxy on localhost connections
 NO_PROXY = {
@@ -42,55 +42,108 @@ NO_PROXY = {
     'https': None,
 }
 
-class UDSActorClientPool:
-    _clientUrl: typing.List[str]
+
+class UDSActorClientPool(metaclass=tools.Singleton):
+    _clients: typing.List[types.ClientInfo]
 
     def __init__(self) -> None:
-        self._clientUrl = []
+        self._clients = []
 
-    def _post(self, method: str, data: typing.MutableMapping[str, str], timeout=2) -> typing.List[requests.Response]:
-        removables: typing.List[str] = []
-        result: typing.List[typing.Any] = []
-        for clientUrl in self._clientUrl:
+    def _post(
+        self,
+        session_id: typing.Optional[str],
+        method: str,
+        data: typing.MutableMapping[str, str],
+        timeout: int = 2,
+    ) -> typing.List[
+        typing.Tuple[types.ClientInfo, typing.Optional[requests.Response]]
+    ]:
+        result: typing.List[
+            typing.Tuple[types.ClientInfo, typing.Optional[requests.Response]]
+        ] = []
+        for client in self._clients:
+            # Skip if session id is provided but does not match
+            if session_id and client.session_id != session_id:
+                continue
+            clientUrl = client.url
             try:
-                result.append(requests.post(clientUrl + '/' + method, data=json.dumps(data), verify=False, timeout=timeout, proxies=NO_PROXY))
+                result.append(
+                    (
+                        client,
+                        requests.post(
+                            clientUrl + '/' + method,
+                            data=json.dumps(data),
+                            verify=False,
+                            timeout=timeout,
+                            proxies=NO_PROXY,  # type: ignore
+                        ),
+                    )
+                )
             except Exception as e:
-                # If cannot request to a clientUrl, remove it from list
-                logger.info('Could not connect with client %s: %s. Removed from registry.', e, clientUrl)
-                removables.append(clientUrl)
-
-        # Remove failed connections
-        for clientUrl in removables:
-            self.unregister(clientUrl)
+                logger.info(
+                    'Could not connect with client %s: %s. ',
+                    e,
+                    clientUrl,
+                )
+                result.append((client, None))
 
         return result
 
-    def register(self, clientUrl: str) -> None:
+    @property
+    def clients(self) -> typing.List[types.ClientInfo]:
+        return self._clients
+
+    def register(self, client_url: str) -> None:
         # Remove first if exists, to avoid duplicates
-        self.unregister(clientUrl)
+        self.unregister(client_url)
         # And add it again
-        self._clientUrl.append(clientUrl)
+        self._clients.append(types.ClientInfo(client_url, ''))
 
-    def unregister(self, clientUrl: str) -> None:
-        self._clientUrl = list((i for i in self._clientUrl if i != clientUrl))
+    def set_session_id(self, client_url: str, session_id: typing.Optional[str]) -> None:
+        """Set the session id for a client
 
-    def executeScript(self, script: str) -> None:
-        self._post('script', {'script': script}, timeout=30)
+        Args:
+            clientUrl (str): _description_
+            session_id (str): _description_
+        """
+        for client in self._clients:
+            if client.url == client_url:
+                # remove existing client from list, create a new one and insert it
+                self._clients.remove(client)
+                self._clients.append(types.ClientInfo(client_url, session_id or ''))
+                break
 
-    def logout(self) -> None:
-        self._post('logout', {})
+    def unregister(self, client_url: str) -> None:
+        # remove client url from array if found
+        for i, client in enumerate(self._clients):
+            if client.url == client_url:
+                self._clients.pop(i)
+                return
 
-    def message(self, message: str) -> None:
-        self._post('message', {'message': message})
+    def executeScript(self, session_id: typing.Optional[str], script: str) -> None:
+        self._post(session_id, 'script', {'script': script}, timeout=30)
 
-    def ping(self) -> bool:
-        if not self._clientUrl:
-            return True                  # No clients, ping ok
-        self._post('ping', {}, timeout=1)
-        return bool(self._clientUrl)     # There was clients, but they are now lost!!!
+    def logout(self, session_id: typing.Optional[str]) -> None:
+        self._post(session_id, 'logout', {})
 
-    def screenshot(self) -> typing.Optional[str]:  # Screenshot are returned as base64
-        for r in self._post('screenshot', {}, timeout=3):
+    def message(self, session_id: typing.Optional[str], message: str) -> None:
+        self._post(session_id, 'message', {'message': message})
+
+    def lost_clients(
+        self,
+        session_id: typing.Optional[str] = None,
+    ) -> typing.Iterable[types.ClientInfo]:  # returns the list of "lost" clients
+        # Port ping to every client
+        for i in self._post(session_id, 'ping', {}, timeout=1):
+            if i[1] is None:
+                yield i[0]
+
+    def screenshot(
+        self, session_id: typing.Optional[str]
+    ) -> typing.Optional[str]:  # Screenshot are returned as base64
+        for client, r in self._post(session_id, 'screenshot', {}, timeout=3):
+            if not r:
+                continue  # Missing client, so we ignore it
             try:
                 return r.json()['result']
             except Exception:

actor/src/udsactor/http/local.py

@@ -30,19 +30,23 @@
 '''
 import typing
 
-from . import handler
+from udsactor.http import handler, clients_pool
 
 if typing.TYPE_CHECKING:
-    from ..service import CommonService
+    from udsactor.service import CommonService
 
 class LocalProvider(handler.Handler):
 
     def post_login(self) -> typing.Any:
         result = self._service.login(self._params['username'], self._params['session_type'])
+        # if callback_url is provided, record it in the clients pool
+        if 'callback_url' in self._params and result.session_id:
+            # If no session id is returned, then no login is acounted for
+            clients_pool.UDSActorClientPool().set_session_id(self._params['callback_url'], result.session_id)
         return result._asdict()
 
     def post_logout(self) -> typing.Any:
-        self._service.logout(self._params['username'])
+        self._service.logout(self._params['username'], self._params['session_type'], self._params['session_id'])
         return 'ok'
 
     def post_ping(self) -> typing.Any:

actor/src/udsactor/http/public.py

@@ -38,6 +38,7 @@ from ..log import logger
 if typing.TYPE_CHECKING:
     from ..service import CommonService
 
+
 class PublicProvider(handler.Handler):
     def post_logout(self) -> typing.Any:
         logger.debug('Sending LOGOFF to clients')
@@ -51,7 +52,9 @@ class PublicProvider(handler.Handler):
         logger.debug('Sending MESSAGE to clients')
         if 'message' not in self._params:
             raise Exception('Invalid message parameters')
-        self._service._clientsPool.message(self._params['message'])  # pylint: disable=protected-access
+        self._service._clientsPool.message(
+            self._params['message']
+        )  # pylint: disable=protected-access
         return 'ok'
 
     def post_script(self) -> typing.Any:
@@ -60,7 +63,9 @@ class PublicProvider(handler.Handler):
             raise Exception('Invalid script parameters')
         if self._params.get('user', False):
             logger.debug('Sending SCRIPT to client')
-            self._service._clientsPool.executeScript(self._params['script'])  # pylint: disable=protected-access
+            self._service._clientsPool.executeScript(
+                self._params['script']
+            )  # pylint: disable=protected-access
         else:
             # Execute script at server space, that is, here
             # as a parallel thread
@@ -72,14 +77,22 @@ class PublicProvider(handler.Handler):
         logger.debug('Received Pre connection')
         if 'user' not in self._params or 'protocol' not in self._params:
             raise Exception('Invalid preConnect parameters')
-        return self._service.preConnect(self._params['user'], self._params['protocol'], self._params.get('ip', 'unknown'), self._params.get('hostname', 'unknown'))
+        return self._service.preConnect(
+            self._params['user'],
+            self._params['protocol'],
+            self._params.get('ip', 'unknown'),
+            self._params.get('hostname', 'unknown'),
+            self._params.get('udsuser', 'unknown'),
+        )
 
     def get_information(self) -> typing.Any:
         # Return something useful? :)
         return 'UDS Actor Secure Server'
 
     def get_screenshot(self) -> typing.Any:
-        return self._service._clientsPool.screenshot()  # pylint: disable=protected-access
+        return (
+            self._service._clientsPool.screenshot()
+        )  # pylint: disable=protected-access
 
     def get_uuid(self) -> typing.Any:
         if self._service.isManaged():

actor/src/udsactor/http/server.py

@@ -71,7 +71,7 @@ class HTTPServerHandler(http.server.BaseHTTPRequestHandler):
         # Very simple path & params splitter
         path = self.path.split('?')[0][1:].split('/')
 
-        logger.debug('Path: %s, params: %s', path, params)
+        logger.debug('Path: %s, ip: %s, params: %s', path, self.client_address, params)
 
         handlerType: typing.Optional[typing.Type['Handler']] = None
 
@@ -159,7 +159,7 @@ class HTTPServerThread(threading.Thread):
         # self._server.socket = ssl.wrap_socket(self._server.socket, certfile=self.certFile, server_side=True)
 
         context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-        context.options = ssl.CERT_NONE
+        # context.options = ssl.CERT_NONE
         context.load_cert_chain(certfile=self._certFile, password=password)
         self._server.socket = context.wrap_socket(self._server.socket, server_side=True)
 

actor/src/udsactor/info.py

@@ -1 +0,0 @@
-VERSION = '3.0.0'

actor/src/udsactor/linux/daemon.py

@@ -101,7 +101,7 @@ class Daemon:
     def removePidFile(self) -> None:
         try:
             os.remove(self.pidfile)
-        except Exception:
+        except Exception:  # nosec: Not interested in exception
             # Not found/not permissions or whatever, ignore it
             pass
 

actor/src/udsactor/linux/log.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014-2019 Virtual Cable S.L.
+# Copyright (c) 2014-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -35,8 +35,9 @@ import logging
 import typing
 
 class LocalLogger:  # pylint: disable=too-few-public-methods
-    linux = False
-    windows = True
+    linux = True
+    windows = False
+    serviceLogger = False
 
     logger: typing.Optional[logging.Logger]
 
@@ -58,7 +59,8 @@ class LocalLogger:  # pylint: disable=too-few-public-methods
                 self.logger = logging.getLogger('udsactor')
                 os.chmod(fname, 0o0600)
                 return
-            except Exception:
+            except Exception:  # nosec: B110: we don't care about exceptions here
+                # Ignore and try next
                 pass
 
         # Logger can't be set

actor/src/udsactor/linux/operations.py

@@ -34,7 +34,7 @@ import platform
 import socket
 import fcntl  # Only available on Linux. Expect complains if edited from windows
 import os
-import subprocess
+import subprocess  # nosec
 import struct
 import array
 import typing
@@ -53,7 +53,9 @@ def _getMacAddr(ifname: str) -> typing.Optional[str]:
     ifnameBytes = ifname.encode('utf-8')
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        info = bytearray(fcntl.ioctl(s.fileno(), 0x8927, struct.pack(str('256s'), ifnameBytes[:15])))
+        info = bytearray(
+            fcntl.ioctl(s.fileno(), 0x8927, struct.pack(str('256s'), ifnameBytes[:15]))
+        )
         return str(''.join(['%02x:' % char for char in info[18:24]])[:-1]).upper()
     except Exception:
         return None
@@ -67,11 +69,15 @@ def _getIpAddr(ifname: str) -> typing.Optional[str]:
     ifnameBytes = ifname.encode('utf-8')
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        return str(socket.inet_ntoa(fcntl.ioctl(
-            s.fileno(),
-            0x8915,  # SIOCGIFADDR
-            struct.pack(str('256s'), ifnameBytes[:15])
-        )[20:24]))
+        return str(
+            socket.inet_ntoa(
+                fcntl.ioctl(
+                    s.fileno(),
+                    0x8915,  # SIOCGIFADDR
+                    struct.pack(str('256s'), ifnameBytes[:15]),
+                )[20:24]
+            )
+        )
     except Exception:
         return None
 
@@ -91,22 +97,32 @@ def _getInterfaces() -> typing.List[str]:
 
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     names = array.array(str('B'), b'\0' * space)
-    outbytes = struct.unpack(str('iL'), fcntl.ioctl(
-        s.fileno(),
-        0x8912,  # SIOCGIFCONF
-        struct.pack(str('iL'), space, names.buffer_info()[0])
-    ))[0]
+    outbytes = struct.unpack(
+        'iL',
+        fcntl.ioctl(
+            s.fileno(),
+            0x8912,  # SIOCGIFCONF
+            struct.pack('iL', space, names.buffer_info()[0]),
+        ),
+    )[0]
     namestr = names.tobytes()
     # return namestr, outbytes
-    return [namestr[i:i + offset].split(b'\0', 1)[0].decode('utf-8') for i in range(0, outbytes, length)]
+    return [
+        namestr[i : i + offset].split(b'\0', 1)[0].decode('utf-8')
+        for i in range(0, outbytes, length)
+    ]
 
 
-def _getIpAndMac(ifname: str) -> typing.Tuple[typing.Optional[str], typing.Optional[str]]:
+def _getIpAndMac(
+    ifname: str,
+) -> typing.Tuple[typing.Optional[str], typing.Optional[str]]:
     ip, mac = _getIpAddr(ifname), _getMacAddr(ifname)
     return (ip, mac)
 
+
 def checkPermissions() -> bool:
-    return os.getuid() == 0  # getuid only available on linux. Expect "complaioins" if edited from Windows
+    return os.getuid() == 0
+
 
 def getComputerName() -> str:
     '''
@@ -114,15 +130,23 @@ def getComputerName() -> str:
     '''
     return socket.gethostname().split('.')[0]
 
+
 def getNetworkInfo() -> typing.Iterator[types.InterfaceInfoType]:
     for ifname in _getInterfaces():
         ip, mac = _getIpAndMac(ifname)
-        if mac != '00:00:00:00:00:00' and mac and ip and ip.startswith('169.254') is False:  # Skips local interfaces & interfaces with no dhcp IPs
+        if (
+            mac != '00:00:00:00:00:00'
+            and mac
+            and ip
+            and ip.startswith('169.254') is False
+        ):  # Skips local interfaces & interfaces with no dhcp IPs
             yield types.InterfaceInfoType(name=ifname, mac=mac, ip=ip)
 
+
 def getDomainName() -> str:
     return ''
 
+
 def getLinuxOs() -> str:
     try:
         with open('/etc/os-release', 'r') as f:
@@ -133,18 +157,22 @@ def getLinuxOs() -> str:
     except Exception:
         return 'unknown'
 
+
+def getVersion() -> str:
+    return 'Linux ' + getLinuxOs()
+
 def reboot(flags: int = 0):
     '''
     Simple reboot using os command
     '''
-    subprocess.call(['/sbin/shutdown', 'now', '-r'])
+    subprocess.call(['/sbin/shutdown', 'now', '-r']) # nosec: Fine, all under control
 
 
 def loggoff() -> None:
     '''
     Right now restarts the machine...
     '''
-    subprocess.call(['/usr/bin/pkill', '-u', os.environ['USER']])
+    subprocess.call(['/usr/bin/pkill', '-u', os.environ['USER']]) # nosec: Fine, all under control
     # subprocess.call(['/sbin/shutdown', 'now', '-r'])
     # subprocess.call(['/usr/bin/systemctl', 'reboot', '-i'])
 
@@ -155,10 +183,12 @@ def renameComputer(newName: str) -> bool:
     Returns True if reboot needed
     '''
     rename(newName)
-    return True  # Always reboot right now. Not much slower but much more better
+    return True  # Always reboot right now. Not much slower but much more convenient
 
 
-def joinDomain(domain: str, ou: str, account: str, password: str, executeInOneStep: bool = False):
+def joinDomain(
+    domain: str, ou: str, account: str, password: str, executeInOneStep: bool = False
+):
     pass
 
 
@@ -166,7 +196,11 @@ def changeUserPassword(user: str, oldPassword: str, newPassword: str) -> None:
     '''
     Simple password change for user using command line
     '''
-    os.system('echo "{1}\n{1}" | /usr/bin/passwd {0} 2> /dev/null'.format(user, newPassword))
+
+    subprocess.run(  # nosec: Fine, all under control
+        'echo "{1}\n{1}" | /usr/bin/passwd {0} 2> /dev/null'.format(user, newPassword),
+        shell=True,
+    )  
 
 
 def initIdleDuration(atLeastSeconds: int) -> None:
@@ -181,16 +215,22 @@ def getCurrentUser() -> str:
     '''
     Returns current logged in user
     '''
-    return os.environ['USER']
+    return os.getlogin()
+
 
 def getSessionType() -> str:
     '''
-      Known values:
-        * Unknown -> No SESSIONNAME environment variable
-        * Console -> Local session
-        *  RDP-Tcp#[0-9]+ -> RDP Session
+    Known values:
+      * Unknown -> No XDG_SESSION_TYPE environment variable
+      * xrdp --> xrdp session
+      * other types
     '''
-    return 'xrdp' if 'XRDP_SESSION' in os.environ else os.environ.get('XDG_SESSION_TYPE', 'unknown')
+    return (
+        'xrdp'
+        if 'XRDP_SESSION' in os.environ
+        else os.environ.get('XDG_SESSION_TYPE', 'unknown')
+    )
+
 
 def forceTimeSync() -> None:
     return

actor/src/udsactor/linux/renamer/alt.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014-2019 Virtual Cable S.L.
+# Copyright (c) 2014-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -28,7 +28,7 @@
 '''
 @author: Alexey Shabalin, shaba at altlinux dot org
 '''
-import os
+import subprocess  # nosec
 
 from .common import renamers
 from ...log import logger
@@ -46,8 +46,8 @@ def rename(newName: str) -> bool:
         hostname.write(newName)
 
     # Force system new name
-    os.system('/bin/hostname {}'.format(newName))
-    os.system('/usr/bin/hostnamectl set-hostname {}'.format(newName))
+    subprocess.run(['hostnamectl', 'set-hostname', newName])  # nosec: subprocess
+    subprocess.run(['/bin/hostname', newName])  # nosec: subprocess
 
     # add name to "hosts"
     with open('/etc/hosts', 'r') as hosts:

actor/src/udsactor/linux/renamer/common.py

@@ -29,9 +29,6 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-import os
-import sys
-import pkgutil
 import typing
 
 from .. import operations

actor/src/udsactor/linux/renamer/debian.py

@@ -29,7 +29,7 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-import os
+import subprocess  # nosec
 
 from .common import renamers
 from ...log import logger
@@ -45,8 +45,8 @@ def rename(newName: str) -> bool:
         hostname.write(newName)
 
     # Force system new name
-    os.system('/bin/hostname {}'.format(newName))
-    os.system('/usr/bin/hostnamectl set-hostname {}'.format(newName))
+    subprocess.run(['hostnamectl', 'set-hostname', newName])  # nosec: ok, we are root
+    subprocess.run(['/bin/hostname', newName])  # nosec: ok, we are root
 
     # add name to "hosts"
     with open('/etc/hosts', 'r') as hosts:

actor/src/udsactor/linux/renamer/opensuse.py

@@ -28,7 +28,7 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-import os
+import subprocess  # nosec
 
 from .common import renamers
 from ...log import logger
@@ -46,8 +46,8 @@ def rename(newName: str) -> bool:
         hostname.write(newName)
 
     # Force system new name
-    os.system('/bin/hostname {}'.format(newName))
-    os.system('/usr/bin/hostnamectl set-hostname {}'.format(newName))
+    subprocess.run(['hostnamectl', 'set-hostname', newName])  # nosec: ok, we are root
+    subprocess.run(['/bin/hostname', newName])  # nosec: ok, we are root
 
     # add name to "hosts"
     with open('/etc/hosts', 'r') as hosts:

actor/src/udsactor/linux/renamer/redhat.py

@@ -28,7 +28,7 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-import os
+import subprocess  # nosec
 
 from .common import renamers
 from ...log import logger
@@ -46,8 +46,8 @@ def rename(newName: str) -> bool:
         hostname.write(newName)
 
     # Force system new name
-    os.system('/bin/hostname {}'.format(newName))
-    os.system('/usr/bin/hostnamectl set-hostname {}'.format(newName))
+    subprocess.run(['hostnamectl', 'set-hostname', newName])  # nosec: ok, we are root
+    subprocess.run(['/bin/hostname', newName])  # nosec: ok, we are root
 
     # add name to "hosts"
     with open('/etc/hosts', 'r') as hosts:

actor/src/udsactor/linux/runner.py

@@ -50,7 +50,7 @@ def run() -> None:
                 r = client.login(sys.argv[2], platform.operations.getSessionType())
                 print('{},{},{},{}\n'.format(r.ip, r.hostname, r.max_idle, r.dead_line or ''))
             elif sys.argv[1] == 'logout':
-                client.logout(sys.argv[2])
+                client.logout(sys.argv[2], platform.operations.getSessionType())
         except Exception as e:
             logger.exception()
             logger.error('Got exception while processing command: %s', e)

actor/src/udsactor/linux/service.py

@@ -37,7 +37,7 @@ from ..log import logger
 from ..service import CommonService
 
 try:
-    from prctl import set_proctitle  # @UnresolvedImport
+    from prctl import set_proctitle  # type: ignore
 except ImportError:  # Platform may not include prctl, so in case it's not available, we let the "name" as is
     def set_proctitle(_):
         pass

actor/src/udsactor/linux/store.py

@@ -32,12 +32,13 @@
 import os
 import configparser
 import base64
-import pickle
+import pickle  # nosec
 
 from .. import types
 
 CONFIGFILE = '/etc/udsactor/udsactor.cfg'
 
+
 def readConfig() -> types.ActorConfigurationType:
     try:
         cfg = configparser.ConfigParser()
@@ -45,10 +46,22 @@ def readConfig() -> types.ActorConfigurationType:
         uds: configparser.SectionProxy = cfg['uds']
         # Extract data:
         base64Config = uds.get('config', None)
-        config = pickle.loads(base64.b64decode(base64Config.encode())) if base64Config else None
+        config = (
+            pickle.loads(  # nosec: file is restricted
+                base64.b64decode(base64Config.encode())
+            )
+            if base64Config
+            else None
+        )
 
         base64Data = uds.get('data', None)
-        data = pickle.loads(base64.b64decode(base64Data.encode())) if base64Data else None
+        data = (
+            pickle.loads(  # nosec: file is restricted
+                base64.b64decode(base64Data.encode())
+            )
+            if base64Data
+            else None
+        )
 
         return types.ActorConfigurationType(
             actorType=uds.get('type', types.MANAGED),
@@ -56,28 +69,33 @@ def readConfig() -> types.ActorConfigurationType:
             validateCertificate=uds.getboolean('validate', fallback=False),
             master_token=uds.get('master_token', None),
             own_token=uds.get('own_token', None),
+            restrict_net=uds.get('restrict_net', None),
             pre_command=uds.get('pre_command', None),
             runonce_command=uds.get('runonce_command', None),
             post_command=uds.get('post_command', None),
             log_level=int(uds.get('log_level', '2')),
             config=config,
-            data=data
+            data=data,
         )
     except Exception:
         return types.ActorConfigurationType('', False)
 
+
 def writeConfig(config: types.ActorConfigurationType) -> None:
     cfg = configparser.ConfigParser()
     cfg.add_section('uds')
     uds: configparser.SectionProxy = cfg['uds']
     uds['host'] = config.host
     uds['validate'] = 'yes' if config.validateCertificate else 'no'
+
     def writeIfValue(val, name):
         if val:
             uds[name] = val
+
     writeIfValue(config.actorType, 'type')
     writeIfValue(config.master_token, 'master_token')
     writeIfValue(config.own_token, 'own_token')
+    writeIfValue(config.restrict_net, 'restrict_net')
     writeIfValue(config.pre_command, 'pre_command')
     writeIfValue(config.post_command, 'post_command')
     writeIfValue(config.runonce_command, 'runonce_command')
@@ -91,12 +109,19 @@ def writeConfig(config: types.ActorConfigurationType) -> None:
     # Ensures exists destination folder
     dirname = os.path.dirname(CONFIGFILE)
     if not os.path.exists(dirname):
-        os.mkdir(dirname, mode=0o700)  # Will create only if route to path already exists, for example, /etc (that must... :-))
+        os.mkdir(
+            dirname, mode=0o700
+        )  # Will create only if route to path already exists, for example, /etc (that must... :-))
 
     with open(CONFIGFILE, 'w') as f:
         cfg.write(f)
 
     os.chmod(CONFIGFILE, 0o0600)  # Ensure only readable by root
 
+
 def useOldJoinSystem() -> bool:
     return False
+
+
+def invokeScriptOnLogin() -> str:
+    return ''

actor/src/udsactor/linux/xss.py

@@ -31,7 +31,7 @@
 # pylint: disable=invalid-name
 import ctypes
 import ctypes.util
-import subprocess
+import subprocess  # nosec
 
 xlib = None
 xss = None
@@ -39,17 +39,22 @@ display = None
 xssInfo = None
 initialized = False
 
+
 class XScreenSaverInfo(ctypes.Structure):  # pylint: disable=too-few-public-methods
-    _fields_ = [('window', ctypes.c_long),
-                ('state', ctypes.c_int),
-                ('kind', ctypes.c_int),
-                ('til_or_since', ctypes.c_ulong),
-                ('idle', ctypes.c_ulong),
-                ('eventMask', ctypes.c_ulong)]
+    _fields_ = [
+        ('window', ctypes.c_long),
+        ('state', ctypes.c_int),
+        ('kind', ctypes.c_int),
+        ('til_or_since', ctypes.c_ulong),
+        ('idle', ctypes.c_ulong),
+        ('eventMask', ctypes.c_ulong),
+    ]
+
 
 class c_ptr(ctypes.c_void_p):
     pass
 
+
 def _ensureInitialized():
     global xlib, xss, xssInfo, display, initialized  # pylint: disable=global-statement
 
@@ -73,13 +78,15 @@ def _ensureInitialized():
         xss.XScreenSaverQueryExtension.argtypes = [
             ctypes.c_void_p,
             ctypes.POINTER(ctypes.c_int),
-            ctypes.POINTER(ctypes.c_int)
+            ctypes.POINTER(ctypes.c_int),
         ]
-        xss.XScreenSaverAllocInfo.restype = ctypes.POINTER(XScreenSaverInfo)  # Result in a XScreenSaverInfo structure
+        xss.XScreenSaverAllocInfo.restype = ctypes.POINTER(
+            XScreenSaverInfo
+        )  # Result in a XScreenSaverInfo structure
         xss.XScreenSaverQueryInfo.argtypes = [
             ctypes.c_void_p,
             ctypes.c_void_p,
-            ctypes.POINTER(XScreenSaverInfo)
+            ctypes.POINTER(XScreenSaverInfo),
         ]
         xlib.XOpenDisplay.argtypes = [ctypes.c_char_p]
         xlib.XOpenDisplay.restype = c_ptr
@@ -95,7 +102,9 @@ def _ensureInitialized():
         event_base = ctypes.c_int()
         error_base = ctypes.c_int()
 
-        available = xss.XScreenSaverQueryExtension(display, ctypes.byref(event_base), ctypes.byref(error_base))
+        available = xss.XScreenSaverQueryExtension(
+            display, ctypes.byref(event_base), ctypes.byref(error_base)
+        )
 
         if available != 1:
             raise Exception('ScreenSaver not available')
@@ -107,9 +116,11 @@ def _ensureInitialized():
 def initIdleDuration(atLeastSeconds: int) -> None:
     _ensureInitialized()
     if atLeastSeconds:
-        subprocess.call(['/usr/bin/xset', 's', '{}'.format(atLeastSeconds + 30)])
+        subprocess.call(  # nosec, controlled params
+            ['/usr/bin/xset', 's', '{}'.format(atLeastSeconds + 30)]
+        )
         # And now reset it
-        subprocess.call(['/usr/bin/xset', 's', 'reset'])
+        subprocess.call(['/usr/bin/xset', 's', 'reset'])  # nosec: fixed command
 
 
 def getIdleDuration() -> float:
@@ -122,7 +133,11 @@ def getIdleDuration() -> float:
     xss.XScreenSaverQueryInfo(display, xlib.XDefaultRootWindow(display), xssInfo)
 
     # States: 0 = off, 1 = On, 2 = Cycle, 3 = Disabled, ...?
-    if xssInfo.contents.state == 1:  # state = 1 means "active", so idle is not a valid state
-        return 3600 * 100 * 1000  # If screen saver is active, return a high enough value
+    if (
+        xssInfo.contents.state == 1
+    ):  # state = 1 means "active", so idle is not a valid state
+        return (
+            3600 * 100 * 1000
+        )  # If screen saver is active, return a high enough value
 
     return xssInfo.contents.idle / 1000.0

actor/src/udsactor/log.py

@@ -35,6 +35,8 @@ import typing
 
 if sys.platform == 'win32':
     from .windows.log import LocalLogger
+elif sys.platform == 'darwin':
+    from .macos.log import LocalLogger
 else:
     from .linux.log import LocalLogger
 
@@ -55,7 +57,7 @@ class Logger:
         self.logLevel = INFO
         self.localLogger = LocalLogger()
         self.remoteLogger = None
-        self.own_token = ''
+        self.own_token = ''  # nosec: This is no password at all
 
     def setLevel(self, level: typing.Union[str, int]) -> None:
         '''

actor/src/udsactor/macos/__init__.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2022 Virtual Cable S.L.U.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright notice,
+#      this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice,
+#      this list of conditions and the following disclaimer in the documentation
+#      and/or other materials provided with the distribution.
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
+#      may be used to endorse or promote products derived from this software
+#      without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+'''
+Author: Adolfo Gómez, dkmaster at dkmon dot com
+'''

actor/src/udsactor/macos/log.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014 Virtual Cable S.L.
+# Copyright (c) 2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -25,29 +25,27 @@
 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 '''
-@author: Adolfo Gómez, dkmaster at dkmon dot com
+Author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
-
-import logging
+# pylint: disable=invalid-name
 import os
 import tempfile
-import six
+import logging
+import typing
 
-# Valid logging levels, from UDS Broker (uds.core.utils.log)
-OTHER, DEBUG, INFO, WARN, ERROR, FATAL = (10000 * (x + 1) for x in six.moves.xrange(6))  # @UndefinedVariable
+# Basically, same logger as in linux, 
+class LocalLogger:  
+    linux = False
+    windows = False
+    serviceLogger = False
 
+    logger: typing.Optional[logging.Logger]
 
-class LocalLogger(object):
-    def __init__(self):
-        # tempdir is different for "user application" and "service"
-        # service wil get c:\windows\temp, while user will get c:\users\XXX\temp
+    def __init__(self) -> None:
         # Try to open logger at /var/log path
         # If it fails (access denied normally), will try to open one at user's home folder, and if
         # agaim it fails, open it at the tmpPath
-
         for logDir in ('/var/log', os.path.expanduser('~'), tempfile.gettempdir()):
             try:
                 fname = os.path.join(logDir, 'udsactor.log')
@@ -60,21 +58,17 @@ class LocalLogger(object):
                 self.logger = logging.getLogger('udsactor')
                 os.chmod(fname, 0o0600)
                 return
-            except Exception:
+            except Exception:  # nosec: B110: we don't care about exceptions here
+                # ignore and try next one
                 pass
 
         # Logger can't be set
         self.logger = None
 
-    def log(self, level, message):
+    def log(self, level: int, message: str) -> None:
         # Debug messages are logged to a file
-        # our loglevels are 10000 (other), 20000 (debug), ....
+        # our loglevels are 0 (other), 10000 (debug), ....
         # logging levels are 10 (debug), 20 (info)
         # OTHER = logging.NOTSET
-        self.logger.log(int(level / 1000) - 10, message)
-
-    def isWindows(self):
-        return False
-
-    def isLinux(self):
-        return True
+        if self.logger:
+            self.logger.log(int(level / 1000), message)

actor/src/udsactor/macos/operations.py

@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2022 Virtual Cable S.L.U.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright notice,
+#      this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice,
+#      this list of conditions and the following disclaimer in the documentation
+#      and/or other materials provided with the distribution.
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
+#      may be used to endorse or promote products derived from this software
+#      without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+'''
+Author: Adolfo Gómez, dkmaster at dkmon dot com
+'''
+
+# Note. most methods are not implemented, as they are not needed for this platform (macos)
+# that only supports unmanaged machines
+
+import socket
+import os
+import re
+import subprocess  # nosec
+import typing
+
+import psutil
+
+from udsactor import types, tools
+
+MACVER_RE = re.compile(
+    r"<key>ProductVersion</key>\s*<string>(.*)</string>", re.MULTILINE
+)
+MACVER_FILE = '/System/Library/CoreServices/SystemVersion.plist'
+
+
+def checkPermissions() -> bool:
+    return os.getuid() == 0
+
+
+def getComputerName() -> str:
+    '''
+    Returns computer name, with no domain
+    '''
+    return socket.gethostname().split('.')[0]
+
+
+def getNetworkInfo() -> typing.Iterator[types.InterfaceInfoType]:
+    ifdata: typing.List['psutil._common.snicaddr']
+    for ifname, ifdata in psutil.net_if_addrs().items():
+        name, ip, mac = '', '', ''
+        # Get IP address, interface name and MAC address whenever possible
+        for row in ifdata:
+            if row.family == socket.AF_INET:
+                ip = row.address
+                name = ifname
+            elif row.family == socket.AF_LINK:
+                mac = row.address
+
+            # if all data is available, stop iterating
+            if ip and name and mac:
+                if (
+                    mac != '00:00:00:00:00:00'
+                    and mac
+                    and ip
+                    and ip.startswith('169.254') is False
+                ):  # Skips local interfaces & interfaces with no dhcp IPs
+                    yield types.InterfaceInfoType(name=name, ip=ip, mac=mac)
+                    break
+
+
+def getDomainName() -> str:
+    return ''
+
+
+def getMacOs() -> str:
+    try:
+        with open(MACVER_FILE, 'r') as f:
+            data = f.read()
+        m = MACVER_RE.search(data)
+        if m:
+            return m.group(1)
+    except Exception:  # nosec: B110: ignore exception because we are not interested in it
+        pass
+
+    return 'unknown'
+
+
+def getVersion() -> str:
+    return 'MacOS ' + getMacOs()
+
+
+def reboot(flags: int = 0) -> None:
+    '''
+    Simple reboot using os command
+    '''
+    subprocess.call(['/sbin/shutdown', '-r', 'now'])  # nosec: Command line is fixed
+
+
+def loggoff() -> None:
+    '''
+    Right now restarts the machine...
+    '''
+    subprocess.run(
+        "/bin/launchctl bootout gui/$(id -u $USER)", shell=True
+    )  # nosec: Command line is fixed
+    # Ignores output, as it may fail if user is not logged in
+
+
+def renameComputer(newName: str) -> bool:
+    '''
+    Changes the computer name
+    Returns True if reboot needed
+    Note: For macOS, no configuration is supported, only "unmanaged" actor
+    '''
+    return False
+
+
+def joinDomain(
+    domain: str, ou: str, account: str, password: str, executeInOneStep: bool = False
+):
+    pass
+
+
+def changeUserPassword(user: str, oldPassword: str, newPassword: str) -> None:
+    pass
+
+
+def initIdleDuration(atLeastSeconds: int) -> None:
+    pass
+
+
+# se we cache for 20 seconds the result, that is enough for our needs
+# and we avoid calling a system command every time we need it
+@tools.cache(20)
+def getIdleDuration() -> float:
+    # Execute:
+    try:
+        return (
+            int(
+                next(
+                    filter(
+                        lambda x: b"HIDIdleTime" in x,
+                        subprocess.check_output(
+                            ["/usr/sbin/ioreg", "-c", "IOHIDSystem"]
+                        ).split(b"\n"),
+                    )
+                ).split(b"=")[1]
+            )
+            / 1000000000
+        )  # nosec: Command line is fixed
+    except Exception:  # nosec: B110: ignore exception because we are not interested in it
+        return 0
+
+
+def getCurrentUser() -> str:
+    '''
+    Returns current logged in user
+    '''
+    return os.getlogin()
+
+
+def getSessionType() -> str:
+    '''
+    Returns the session type. Currently, only "macos" (console) is supported
+    '''
+    return 'macos'
+
+
+def forceTimeSync() -> None:
+    return

actor/src/udsactor/macos/runner.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014 Virtual Cable S.L.
+# Copyright (c) 2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -25,48 +25,47 @@
 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 '''
-@author: Adolfo Gómez, dkmaster at dkmon dot com
+Author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
-
 import sys
-import six
+import typing
 
-if sys.platform == 'win32':
-    _fromEncoding = 'windows-1250'
-else:
-    _fromEncoding = 'utf-8'
+from .. import rest
+from .. import platform
+from ..log import logger
+from .service import UDSActorSvc
 
+def usage() -> typing.NoReturn:
+    sys.stderr.write('usage: udsactor start|login "username"|logout "username"\n')
+    sys.exit(2)
 
-def toUnicode(msg):
-    try:
-        if not isinstance(msg, six.text_type):
-            if isinstance(msg, six.binary_type):
-                return msg.decode(_fromEncoding, 'ignore')
-            return six.text_type(msg)
-        else:
-            return msg
-    except Exception:
+def run() -> None:
+    logger.setLevel(20000)
+
+    if len(sys.argv) == 3 and sys.argv[1] in ('login', 'logout'):
+        logger.debug('Running client udsactor')
         try:
-            return six.text_type(msg)
-        except Exception:
-            return ''
+            client: rest.UDSClientApi = rest.UDSClientApi()
+            if sys.argv[1] == 'login':
+                r = client.login(sys.argv[2], platform.operations.getSessionType())
+                print('{},{},{},{}\n'.format(r.ip, r.hostname, r.max_idle, r.dead_line or ''))
+            elif sys.argv[1] == 'logout':
+                client.logout(sys.argv[2], platform.operations.getSessionType())
+        except Exception as e:
+            logger.exception()
+            logger.error('Got exception while processing command: %s', e)
+        sys.exit(0)
+    elif len(sys.argv) != 2:
+        usage()
 
-
-def exceptionToMessage(e):
-    msg = ''
-    for arg in e.args:
-        if isinstance(arg, Exception):
-            msg = msg + exceptionToMessage(arg)
+    daemonSvr = UDSActorSvc()
+    if len(sys.argv) == 2:
+        # Daemon mode...
+        if sys.argv[1] in ('start', 'start-foreground'):
+            daemonSvr.run()  # execute in foreground
         else:
-            msg = msg + toUnicode(arg) + '. '
-    return msg
-
-
-class Bunch(dict):
-    def __init__(self, **kw):
-        dict.__init__(self, kw)
-        self.__dict__ = self
-
+            usage()
+        sys.exit(0)
+    else:
+        usage()

actor/src/udsactor/macos/service.py

@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2022 Virtual Cable S.L.U.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright notice,
+#      this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice,
+#      this list of conditions and the following disclaimer in the documentation
+#      and/or other materials provided with the distribution.
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
+#      may be used to endorse or promote products derived from this software
+#      without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+'''
+Author: Adolfo Gómez, dkmaster at dkmon dot com
+'''
+import typing
+import signal
+
+from ..log import logger
+from ..service import CommonService
+
+
+class UDSActorSvc(CommonService):
+    def __init__(self) -> None:
+        CommonService.__init__(self)
+
+        # Captures signals so we can stop gracefully
+        signal.signal(signal.SIGINT, self.markForExit)
+        signal.signal(signal.SIGTERM, self.markForExit)
+
+    def markForExit(self, signum, frame) -> None:  # pylint: disable=unused-argument
+        self._isAlive = False
+
+    def joinDomain(  # pylint: disable=unused-argument, too-many-arguments
+            self,
+            name: str,
+            domain: str,
+            ou: str,
+            account: str,
+            password: str
+        ) -> None:
+        pass  # Not implemented for unmanaged machines
+
+    def rename(
+        self,
+        name: str,
+        userName: typing.Optional[str] = None,
+        oldPassword: typing.Optional[str] = None,
+        newPassword: typing.Optional[str] = None,
+    ) -> None:
+        pass  # Not implemented for unmanaged machines
+
+    def run(self) -> None:
+        logger.debug('Running Daemon: {}'.format(self._isAlive))
+
+        # Linux daemon will continue running unless something is requested to
+        # Unmanaged services does not initializes "on start", but rather when user logs in (because userservice does not exists "as such" before that)
+        if self.isManaged():  # Currently, managed is not implemented for UDS on M
+            logger.error('Managed machines not supported on MacOS')
+            # Wait a bit, this is mac os and will be run by launchd
+            # If the daemon shuts down too quickly, launchd may think it is a crash.
+            self.doWait(10000)
+
+            self.finish()
+            return # Stop daemon if initializes told to do so
+        if not self.initializeUnmanaged():
+            # Wait a bit, this is mac os and will be run by launchd
+            # If the daemon shuts down too quickly, launchd may think it is a crash.
+            self.doWait(10000)
+            self.finish()
+            return
+
+        # Start listening for petitions
+        self.startHttpServer()
+
+        # *********************
+        # * Main Service loop *
+        # *********************
+        # Counter used to check ip changes only once every 10 seconds, for
+        # example
+        counter = 0
+        while self._isAlive:
+            counter += 1
+            try:
+                if counter % 5 == 0:
+                    self.loop()
+            except Exception as e:
+                logger.error('Got exception on main loop: %s', e)
+            # In milliseconds, will break
+            self.doWait(1000)
+
+        self.finish()

actor/src/udsactor/macos/store.py

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2022 Virtual Cable S.L.U.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright notice,
+#      this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice,
+#      this list of conditions and the following disclaimer in the documentation
+#      and/or other materials provided with the distribution.
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
+#      may be used to endorse or promote products derived from this software
+#      without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+'''
+Author: Adolfo Gómez, dkmaster at dkmon dot com
+'''
+import os
+import configparser
+import base64
+import pickle  # nosec
+
+from .. import types
+
+CONFIGFILE = '/etc/udsactor/udsactor.cfg'
+
+def readConfig() -> types.ActorConfigurationType:
+    try:
+        cfg = configparser.ConfigParser()
+        cfg.read(CONFIGFILE)
+        uds: configparser.SectionProxy = cfg['uds']
+        # Extract data:
+        base64Config = uds.get('config', None)
+        config = pickle.loads(base64.b64decode(base64Config.encode())) if base64Config else None  # nosec: Read from root controled file, secure
+
+        base64Data = uds.get('data', None)
+        data = pickle.loads(base64.b64decode(base64Data.encode())) if base64Data else None  # nosec: Read from root controled file, secure
+
+        return types.ActorConfigurationType(
+            actorType=uds.get('type', types.MANAGED),
+            host=uds.get('host', ''),
+            validateCertificate=uds.getboolean('validate', fallback=False),
+            master_token=uds.get('master_token', None),
+            own_token=uds.get('own_token', None),
+            restrict_net=uds.get('restrict_net', None),
+            pre_command=uds.get('pre_command', None),
+            runonce_command=uds.get('runonce_command', None),
+            post_command=uds.get('post_command', None),
+            log_level=int(uds.get('log_level', '2')),
+            config=config,
+            data=data
+        )
+    except Exception:
+        return types.ActorConfigurationType('', False)
+
+def writeConfig(config: types.ActorConfigurationType) -> None:
+    cfg = configparser.ConfigParser()
+    cfg.add_section('uds')
+    uds: configparser.SectionProxy = cfg['uds']
+    uds['host'] = config.host
+    uds['validate'] = 'yes' if config.validateCertificate else 'no'
+    def writeIfValue(val, name):
+        if val:
+            uds[name] = val
+    writeIfValue(config.actorType, 'type')
+    writeIfValue(config.master_token, 'master_token')
+    writeIfValue(config.own_token, 'own_token')
+    writeIfValue(config.restrict_net, 'restrict_net')
+    writeIfValue(config.pre_command, 'pre_command')
+    writeIfValue(config.post_command, 'post_command')
+    writeIfValue(config.runonce_command, 'runonce_command')
+    uds['log_level'] = str(config.log_level)
+    if config.config:  # Special case, encoded & dumped
+        uds['config'] = base64.b64encode(pickle.dumps(config.config)).decode()
+
+    if config.data:  # Special case, encoded & dumped
+        uds['data'] = base64.b64encode(pickle.dumps(config.data)).decode()
+
+    # Ensures exists destination folder
+    dirname = os.path.dirname(CONFIGFILE)
+    if not os.path.exists(dirname):
+        os.mkdir(dirname, mode=0o700)  # Will create only if route to path already exists, for example, /etc (that must... :-))
+
+    with open(CONFIGFILE, 'w') as f:
+        cfg.write(f)
+
+    os.chmod(CONFIGFILE, 0o0600)  # Ensure only readable by root
+
+def useOldJoinSystem() -> bool:
+    return False
+
+def invokeScriptOnLogin() -> str:
+    return ''

actor/src/udsactor/platform.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014 Virtual Cable S.L.
+# Copyright (c) 2014-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -31,7 +31,15 @@
 import sys
 
 name = sys.platform
+is_windows = is_linux = is_mac = False
 if sys.platform == 'win32':
-    from .windows import operations, store  # pylint: disable=unused-import
+    from .windows import operations, store, runner
+    is_windows = True
+elif sys.platform == 'darwin':
+    from .macos import operations, store, runner
+    is_mac = True
+elif sys.platform == 'linux':
+    from .linux import operations, store, runner
+    is_linux = True
 else:
-    from .linux import operations, store  # pylint: disable=unused-import
+    raise Exception('Unsupported platform: {0}'.format(sys.platform))

actor/src/udsactor/rest.py

@@ -36,42 +36,52 @@ import typing
 
 import requests
 
-from . import types
-from .info import VERSION
+from udsactor import types, tools
+from udsactor.version import VERSION, BUILD
 
 # Default public listen port
 LISTEN_PORT = 43910
 
 # Default timeout
-TIMEOUT = 5   # 5 seconds is more than enought
+TIMEOUT = 5  # 5 seconds is more than enought
 
 # Constants
 UNKNOWN = 'unknown'
 
+
 class RESTError(Exception):
     ERRCODE = 0
 
+
 class RESTConnectionError(RESTError):
     ERRCODE = -1
 
+
 # Errors ""raised"" from broker
 class RESTInvalidKeyError(RESTError):
     ERRCODE = 1
 
+
 class RESTUnmanagedHostError(RESTError):
     ERRCODE = 2
 
+
 class RESTUserServiceNotFoundError(RESTError):
     ERRCODE = 3
 
+
 class RESTOsManagerError(RESTError):
     ERRCODE = 4
 
+
 # For avoid proxy on localhost connections
 NO_PROXY = {
     'http': None,
     'https': None,
 }
+
+UDS_BASE_URL = 'https://{}/uds/rest/'
+
 #
 # Basic UDS Api
 #
@@ -79,48 +89,51 @@ class UDSApi:  # pylint: disable=too-few-public-methods
     """
     Base for remote api accesses
     """
-    _host: str
-    _validateCert: bool
-    _url: str
+
+    _host: str = ''
+    _validateCert: bool = True
+    _url: str = ''
 
     def __init__(self, host: str, validateCert: bool) -> None:
         self._host = host
         self._validateCert = validateCert
-        self._url = "https://{}/uds/rest/".format(self._host)
+        self._url = UDS_BASE_URL.format(self._host)
         # Disable logging requests messages except for errors, ...
-        logging.getLogger("requests").setLevel(logging.CRITICAL)
-        logging.getLogger("urllib3").setLevel(logging.ERROR)
+        logging.getLogger('request').setLevel(logging.CRITICAL)
+        logging.getLogger('urllib3').setLevel(logging.ERROR)
         try:
-            warnings.simplefilter("ignore")  # Disables all warnings
-        except Exception:
+            warnings.simplefilter('ignore')  # Disables all warnings
+        except Exception:  # nosec: not interested in exceptions
             pass
 
     @property
     def _headers(self) -> typing.MutableMapping[str, str]:
         return {
             'Content-Type': 'application/json',
-            'User-Agent': 'UDS Actor v{}'.format(VERSION)
+            'User-Agent': 'UDS Actor v{}/{}'.format(VERSION, BUILD),
         }
 
-    def _apiURL(self, method: str) -> str:
+    def _api_url(self, method: str) -> str:
         raise NotImplementedError
 
     def _doPost(
-            self,
-            method: str,  # i.e. 'initialize', 'ready', ....
-            payLoad: typing.MutableMapping[str, typing.Any],
-            headers: typing.Optional[typing.MutableMapping[str, str]] = None,
-            disableProxy: bool = False
-        ) -> typing.Any:
+        self,
+        method: str,  # i.e. 'initialize', 'ready', ....
+        payLoad: typing.MutableMapping[str, typing.Any],
+        headers: typing.Optional[typing.MutableMapping[str, str]] = None,
+        disableProxy: bool = False,
+    ) -> typing.Any:
         headers = headers or self._headers
         try:
             result = requests.post(
-                self._apiURL(method),
+                self._api_url(method),
                 data=json.dumps(payLoad),
                 headers=headers,
                 verify=self._validateCert,
                 timeout=TIMEOUT,
-                proxies=NO_PROXY if disableProxy else None  # if not proxies wanted, enforce it
+                proxies=NO_PROXY  # type: ignore
+                if disableProxy
+                else None,  # if not proxies wanted, enforce it
             )
 
             if result.ok:
@@ -139,16 +152,22 @@ class UDSApi:  # pylint: disable=too-few-public-methods
 
         raise RESTError(data)
 
+
 #
 # UDS Broker API access
 #
 class UDSServerApi(UDSApi):
-    def _apiURL(self, method: str) -> str:
+    def _api_url(self, method: str) -> str:
         return self._url + 'actor/v3/' + method
 
     def enumerateAuthenticators(self) -> typing.Iterable[types.AuthenticatorType]:
         try:
-            result = requests.get(self._url + 'auth/auths', headers=self._headers, verify=self._validateCert, timeout=4)
+            result = requests.get(
+                self._url + 'auth/auths',
+                headers=self._headers,
+                verify=self._validateCert,
+                timeout=4,
+            )
             if result.ok:
                 for v in sorted(result.json(), key=lambda x: x['priority']):
                     yield types.AuthenticatorType(
@@ -157,24 +176,24 @@ class UDSServerApi(UDSApi):
                         auth=v['auth'],
                         type=v['type'],
                         priority=v['priority'],
-                        isCustom=v['isCustom']
+                        isCustom=v['isCustom'],
                     )
-        except Exception:
+        except Exception:  # nosec: not interested in exceptions
             pass
 
-    def register(  #pylint: disable=too-many-arguments, too-many-locals
-            self,
-            auth: str,
-            username: str,
-            password: str,
-            hostname: str,
-            ip: str,
-            mac: str,
-            preCommand: str,
-            runOnceCommand: str,
-            postCommand: str,
-            logLevel: int
-        ) -> str:
+    def register(
+        self,
+        auth: str,
+        username: str,
+        password: str,
+        hostname: str,
+        ip: str,
+        mac: str,
+        preCommand: str,
+        runOnceCommand: str,
+        postCommand: str,
+        logLevel: int,
+    ) -> str:
         """
         Raises an exception if could not register, or registers and returns the "authorization token"
         """
@@ -186,7 +205,7 @@ class UDSServerApi(UDSApi):
             'pre_command': preCommand,
             'run_once_command': runOnceCommand,
             'post_command': postCommand,
-            'log_level': logLevel
+            'log_level': logLevel,
         }
 
         # First, try to login to REST api
@@ -194,13 +213,23 @@ class UDSServerApi(UDSApi):
             # First, try to login
             authInfo = {'auth': auth, 'username': username, 'password': password}
             headers = self._headers
-            result = requests.post(self._url + 'auth/login', data=json.dumps(authInfo), headers=headers, verify=self._validateCert)
+            result = requests.post(
+                self._url + 'auth/login',
+                data=json.dumps(authInfo),
+                headers=headers,
+                verify=self._validateCert,
+            )
             if not result.ok or result.json()['result'] == 'error':
                 raise Exception()  # Invalid credentials
 
             headers['X-Auth-Token'] = result.json()['token']
 
-            result = requests.post(self._apiURL('register'), data=json.dumps(data), headers=headers, verify=self._validateCert)
+            result = requests.post(
+                self._api_url('register'),
+                data=json.dumps(data),
+                headers=headers,
+                verify=self._validateCert,
+            )
             if result.ok:
                 return result.json()['result']
         except requests.ConnectionError as e:
@@ -212,13 +241,19 @@ class UDSServerApi(UDSApi):
 
         raise RESTError(result.content.decode())
 
-    def initialize(self, token: str, interfaces: typing.Iterable[types.InterfaceInfoType], actorType: typing.Optional[str]) -> types.InitializationResultType:
+    def initialize(
+        self,
+        token: str,
+        interfaces: typing.Iterable[types.InterfaceInfoType],
+        actor_type: typing.Optional[str],
+    ) -> types.InitializationResultType:
         # Generate id list from netork cards
         payload = {
-            'type': actorType or types.MANAGED,
+            'type': actor_type or types.MANAGED,
             'token': token,
             'version': VERSION,
-            'id': [{'mac': i.mac, 'ip': i.ip} for i in interfaces]
+            'build': BUILD,
+            'id': [{'mac': i.mac, 'ip': i.ip} for i in interfaces],
         }
         r = self._doPost('initialize', payload)
         os = r['os']
@@ -232,95 +267,115 @@ class UDSServerApi(UDSApi):
                 password=os.get('password'),
                 new_password=os.get('new_password'),
                 ad=os.get('ad'),
-                ou=os.get('ou')
-            ) if r['os'] else None
+                ou=os.get('ou'),
+            )
+            if r['os']
+            else None,
+            alias_token=r.get('alias_token'),  # Possible alias for unmanaged
         )
 
-    def ready(self, own_token: str, secret: str, ip: str, port: int) -> types.CertificateInfoType:
-        payload = {
-            'token': own_token,
-            'secret': secret,
-            'ip': ip,
-            'port': port
-        }
+    def ready(
+        self, own_token: str, secret: str, ip: str, port: int
+    ) -> types.CertificateInfoType:
+        payload = {'token': own_token, 'secret': secret, 'ip': ip, 'port': port}
         result = self._doPost('ready', payload)
 
         return types.CertificateInfoType(
             private_key=result['private_key'],
             server_certificate=result['server_certificate'],
-            password=result['password']
+            password=result['password'],
         )
 
-    def notifyIpChange(self, own_token: str, secret: str, ip: str, port: int) -> types.CertificateInfoType:
-        payload = {
-            'token': own_token,
-            'secret': secret,
-            'ip': ip,
-            'port': port
-        }
+    def notifyIpChange(
+        self, own_token: str, secret: str, ip: str, port: int
+    ) -> types.CertificateInfoType:
+        payload = {'token': own_token, 'secret': secret, 'ip': ip, 'port': port}
         result = self._doPost('ipchange', payload)
 
         return types.CertificateInfoType(
             private_key=result['private_key'],
             server_certificate=result['server_certificate'],
-            password=result['password']
+            password=result['password'],
         )
 
-    def notifyUnmanagedCallback(self, master_token: str, secret: str, interfaces: typing.Iterable[types.InterfaceInfoType], port: int) -> types.CertificateInfoType:
+    def notifyUnmanagedCallback(
+        self,
+        master_token: str,
+        secret: str,
+        interfaces: typing.Iterable[types.InterfaceInfoType],
+        port: int,
+    ) -> types.CertificateInfoType:
         payload = {
             'id': [{'mac': i.mac, 'ip': i.ip} for i in interfaces],
             'token': master_token,
             'secret': secret,
-            'port': port
+            'port': port,
         }
         result = self._doPost('unmanaged', payload)
 
         return types.CertificateInfoType(
             private_key=result['private_key'],
             server_certificate=result['server_certificate'],
-            password=result['password']
+            password=result['password'],
         )
 
-
-    def login(self, own_token: str, username: str, sessionType: typing.Optional[str] = None) -> types.LoginResultInfoType:
-        if not own_token:
+    def login(
+        self,
+        actor_type: typing.Optional[str],
+        token: str,
+        username: str,
+        session_type: str,
+        interfaces: typing.Iterable[types.InterfaceInfoType],
+        secret: typing.Optional[str],
+    ) -> types.LoginResultInfoType:
+        if not token:
             return types.LoginResultInfoType(
-                ip='0.0.0.0',
-                hostname=UNKNOWN,
-                dead_line=None,
-                max_idle=None
+                ip='0.0.0.0', hostname=UNKNOWN, dead_line=None, max_idle=None, session_id=None
             )
         payload = {
-            'token': own_token,
+            'type': actor_type or types.MANAGED,
+            'id': [{'mac': i.mac, 'ip': i.ip} for i in interfaces],
+            'token': token,
             'username': username,
-            'session_type': sessionType or UNKNOWN
+            'session_type': session_type,
+            'secret': secret or '',
         }
         result = self._doPost('login', payload)
         return types.LoginResultInfoType(
             ip=result['ip'],
             hostname=result['hostname'],
             dead_line=result['dead_line'],
-            max_idle=result['max_idle']
+            max_idle=result['max_idle'],
+            session_id=result.get('session_id', ''),
         )
 
-    def logout(self, own_token: str, username: str) -> None:
-        if not own_token:
-            return
+    def logout(
+        self,
+        actor_type: typing.Optional[str],
+        token: str,
+        username: str,
+        session_id: str,
+        session_type: str,
+        interfaces: typing.Iterable[types.InterfaceInfoType],
+        secret: typing.Optional[str],
+    ) -> typing.Optional[str]:
+        if not token:
+            return None
         payload = {
-            'token': own_token,
-            'username': username
+            'type': actor_type or types.MANAGED,
+            'id': [{'mac': i.mac, 'ip': i.ip} for i in interfaces],
+            'token': token,
+            'username': username,
+            'session_type': session_type,
+            'session_id': session_id,
+            'secret': secret or '',
         }
-        self._doPost('logout', payload)
-
+        return self._doPost('logout', payload)  # Can be 'ok' or 'notified'
 
     def log(self, own_token: str, level: int, message: str) -> None:
         if not own_token:
             return
-        payLoad = {
-            'token': own_token,
-            'level': level,
-            'message': message
-        }
+        payLoad = {'token': own_token, 'level': level, 'message': message}
         self._doPost('log', payLoad)  # Ignores result...
 
     def test(self, master_token: str, actorType: typing.Optional[str]) -> bool:
@@ -331,50 +386,62 @@ class UDSServerApi(UDSApi):
         return self._doPost('test', payLoad) == 'ok'
 
 
-class UDSClientApi(UDSApi):
+class UDSClientApi(UDSApi, metaclass=tools.Singleton):
+    _session_id: str = ''
+    _callback_url: str = ''
+
     def __init__(self) -> None:
         super().__init__('127.0.0.1:{}'.format(LISTEN_PORT), False)
-        # Override base url
+
+        # Replace base url
         self._url = "https://{}/ui/".format(self._host)
 
-    def _apiURL(self, method: str) -> str:
+    def _api_url(self, method: str) -> str:
         return self._url + method
 
     def post(
-            self,
-            method: str,  # i.e. 'initialize', 'ready', ....
-            payLoad: typing.MutableMapping[str, typing.Any]
-        ) -> typing.Any:
+        self,
+        method: str,  # i.e. 'initialize', 'ready', ....
+        payLoad: typing.MutableMapping[str, typing.Any],
+    ) -> typing.Any:
         return self._doPost(method=method, payLoad=payLoad, disableProxy=True)
 
-    def register(self, callbackUrl: str) -> None:
-        payLoad = {
-            'callback_url': callbackUrl
-        }
+    def register(self, callback_url: str) -> None:
+        self._callback_url = callback_url
+        payLoad = {'callback_url': callback_url}
         self.post('register', payLoad)
 
-    def unregister(self, callbackUrl: str) -> None:
-        payLoad = {
-            'callback_url': callbackUrl
-        }
+    def unregister(self, callback_url: str) -> None:
+        payLoad = {'callback_url': callback_url}
         self.post('unregister', payLoad)
+        self._callback_url = ''
 
-    def login(self, username: str, sessionType: typing.Optional[str] = None) -> types.LoginResultInfoType:
+    def login(
+        self, username: str, sessionType: typing.Optional[str] = None
+    ) -> types.LoginResultInfoType:
         payLoad = {
             'username': username,
             'session_type': sessionType or UNKNOWN,
+            'callback_url': self._callback_url,  # So we identify ourselves
         }
         result = self.post('login', payLoad)
-        return types.LoginResultInfoType(
+        res = types.LoginResultInfoType(
             ip=result['ip'],
             hostname=result['hostname'],
             dead_line=result['dead_line'],
-            max_idle=result['max_idle']
+            max_idle=result['max_idle'],
+            session_id=result['session_id'],
         )
+        # Store session id for future use
+        self._session_id = res.session_id or ''
+        return res
 
-    def logout(self, username: str) -> None:
+    def logout(self, username: str, sessionType: typing.Optional[str]) -> None:
         payLoad = {
-            'username': username
+            'username': username,
+            'session_type': sessionType or UNKNOWN,
+            'callback_url': self._callback_url,  # So we identify ourselves
+            'session_id': self._session_id,  # We now know the session id, provided on login
         }
         self.post('logout', payLoad)
 

actor/src/udsactor/service.py

@@ -36,12 +36,13 @@ import secrets
 import subprocess
 import typing
 
-from . import platform
-from . import rest
-from . import types
+from udsactor import platform
+from udsactor import rest
+from udsactor import types
+from udsactor import tools
 
-from .log import logger, DEBUG, INFO, ERROR, FATAL
-from .http import clients_pool, server, cert
+from udsactor.log import logger, DEBUG, INFO, ERROR, FATAL
+from udsactor.http import clients_pool, server, cert
 
 # def setup() -> None:
 #     cfg = platform.store.readConfig()
@@ -55,18 +56,16 @@ from .http import clients_pool, server, cert
 #     else:
 #         logger.setLevel(20000)
 
+
 class CommonService:  # pylint: disable=too-many-instance-attributes
     _isAlive: bool = True
     _rebootRequested: bool = False
-    _loggedIn: bool = False
     _initialized: bool = False
-
     _cfg: types.ActorConfigurationType
     _api: rest.UDSServerApi
     _interfaces: typing.List[types.InterfaceInfoType]
     _secret: str
     _certificate: types.CertificateInfoType
-    _clientsPool: clients_pool.UDSActorClientPool
     _http: typing.Optional[server.HTTPServerThread]
 
     @staticmethod
@@ -75,7 +74,9 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
             logger.debug('Executing command on {}: {}'.format(section, cmdLine))
             res = subprocess.check_call(cmdLine, shell=True)
         except Exception as e:
-            logger.error('Got exception executing: {} - {} - {}'.format(section, cmdLine, e))
+            logger.error(
+                'Got exception executing: {} - {} - {}'.format(section, cmdLine, e)
+            )
             return False
         logger.debug('Result of executing cmd for {} was {}'.format(section, res))
         return True
@@ -86,7 +87,9 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
         self._api = rest.UDSServerApi(self._cfg.host, self._cfg.validateCertificate)
         self._secret = secrets.token_urlsafe(33)
         self._clientsPool = clients_pool.UDSActorClientPool()
-        self._certificate = cert.defaultCertificate  # For being used on "unmanaged" hosts only
+        self._certificate = (
+            cert.defaultCertificate
+        )  # For being used on "unmanaged" hosts only
         self._http = None
 
         # Initialzies loglevel and serviceLogger
@@ -95,7 +98,7 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
         # 0 = OTHER, 10000 = DEBUG, 20000 = WARN, 30000 = INFO, 40000 = ERROR, 50000 = FATAL
         # So this comes:
         logger.setLevel([DEBUG, INFO, ERROR, FATAL][self._cfg.log_level])
-        # If windows, enable service logger
+        # If windows, enable service logger FOR SERVICE only
         logger.enableServiceLogger()
 
         socket.setdefaulttimeout(20)
@@ -112,16 +115,24 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
         self._http.start()
 
     def isManaged(self) -> bool:
-        return self._cfg.actorType != types.UNMANAGED  # Only "unmanaged" hosts are unmanaged, the rest are "managed"
+        return (
+            self._cfg.actorType != types.UNMANAGED
+        )  # Only "unmanaged" hosts are unmanaged, the rest are "managed"
 
-    def serviceInterfaceInfo(self, interfaces: typing.Optional[typing.List[types.InterfaceInfoType]] = None) -> typing.Optional[types.InterfaceInfoType]:
+    def serviceInterfaceInfo(
+        self, interfaces: typing.Optional[typing.List[types.InterfaceInfoType]] = None
+    ) -> typing.Optional[types.InterfaceInfoType]:
         """
         returns the inteface with unique_id mac or first interface or None if no interfaces...
         """
-        interfaces = interfaces or self._interfaces  # Emty interfaces is like "no ip change" because cannot be notified
+        interfaces = (
+            interfaces or self._interfaces
+        )  # Emty interfaces is like "no ip change" because cannot be notified
         if self._cfg.config and interfaces:
             try:
-                return next(x for x in interfaces if x.mac.lower() == self._cfg.config.unique_id)
+                return next(
+                    x for x in interfaces if x.mac.lower() == self._cfg.config.unique_id
+                )
             except StopIteration:
                 return interfaces[0]
 
@@ -152,7 +163,12 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
                 while self._isAlive:
                     counter -= 1
                     try:
-                        self._certificate = self._api.ready(self._cfg.own_token, self._secret, srvInterface.ip, rest.LISTEN_PORT)
+                        self._certificate = self._api.ready(
+                            self._cfg.own_token,
+                            self._secret,
+                            srvInterface.ip,
+                            rest.LISTEN_PORT,
+                        )
                     except rest.RESTConnectionError as e:
                         if not logged:  # Only log connection problems ONCE
                             logged = True
@@ -168,7 +184,9 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
                     # Success or any error that is not recoverable (retunerd by UDS). if Error, service will be cleaned in a while.
                     break
             else:
-                logger.error('Could not locate IP address!!!. (Not registered with UDS)')
+                logger.error(
+                    'Could not locate IP address!!!. (Not registered with UDS)'
+                )
 
         # Do not continue if not alive...
         if not self._isAlive:
@@ -176,7 +194,9 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
 
         # Cleans sensible data
         if self._cfg.config:
-            self._cfg = self._cfg._replace(config=self._cfg.config._replace(os=None), data=None)
+            self._cfg = self._cfg._replace(
+                config=self._cfg.config._replace(os=None), data=None
+            )
             platform.store.writeConfig(self._cfg)
 
         logger.info('Service ready')
@@ -195,10 +215,10 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
             self._cfg = self._cfg._replace(runonce_command=None)
             platform.store.writeConfig(self._cfg)
             if self.execute(runOnce, "runOnce"):
-            # If runonce is present, will not do anythin more
-            # So we have to ensure that, when runonce command is finished, reboots the machine.
-            # That is, the COMMAND itself has to restart the machine!
-                return False   # If the command fails, continue with the rest of the operations...
+                # If runonce is present, will not do anythin more
+                # So we have to ensure that, when runonce command is finished, reboots the machine.
+                # That is, the COMMAND itself has to restart the machine!
+                return False  # If the command fails, continue with the rest of the operations...
 
         # Retry configuration while not stop service, config in case of error 10 times, reboot vm
         counter = 10
@@ -208,9 +228,20 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
                 if self._cfg.config and self._cfg.config.os:
                     osData = self._cfg.config.os
                     if osData.action == 'rename':
-                        self.rename(osData.name, osData.username, osData.password, osData.new_password)
+                        self.rename(
+                            osData.name,
+                            osData.username,
+                            osData.password,
+                            osData.new_password,
+                        )
                     elif osData.action == 'rename_ad':
-                        self.joinDomain(osData.name, osData.ad or '', osData.ou or '', osData.username or '', osData.password or '')
+                        self.joinDomain(
+                            osData.name,
+                            osData.ad or '',
+                            osData.ou or '',
+                            osData.username or '',
+                            osData.password or '',
+                        )
 
                     if self._rebootRequested:
                         try:
@@ -234,7 +265,12 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
         self.getInterfaces()  # Ensure we have interfaces
         if self._cfg.master_token:
             try:
-                self._certificate = self._api.notifyUnmanagedCallback(self._cfg.master_token, self._secret, self._interfaces, rest.LISTEN_PORT)
+                self._certificate = self._api.notifyUnmanagedCallback(
+                    self._cfg.master_token,
+                    self._secret,
+                    self._interfaces,
+                    rest.LISTEN_PORT,
+                )
             except Exception as e:
                 logger.error('Couuld not notify unmanaged callback: %s', e)
 
@@ -245,13 +281,17 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
             return
 
         while self._isAlive:
-            self._interfaces = list(platform.operations.getNetworkInfo())
+            self._interfaces = tools.validNetworkCards(
+                self._cfg.restrict_net, platform.operations.getNetworkInfo()
+            )
             if self._interfaces:
                 break
             self.doWait(5000)
 
     def initialize(self) -> bool:
-        if self._initialized or not self._cfg.host or not self._isAlive:  # Not configured or not running
+        if (
+            self._initialized or not self._cfg.host or not self._isAlive
+        ):  # Not configured or not running
             return False
 
         self._initialized = True
@@ -268,25 +308,37 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
             try:
                 # If master token is present, initialize and get configuration data
                 if self._cfg.master_token:
-                    initResult: types.InitializationResultType = self._api.initialize(self._cfg.master_token, self._interfaces, self._cfg.actorType)
+                    initResult: types.InitializationResultType = self._api.initialize(
+                        self._cfg.master_token, self._interfaces, self._cfg.actorType
+                    )
                     if not initResult.own_token:  # Not managed
-                        logger.debug('This host is not managed by UDS Broker (ids: {})'.format(self._interfaces))
+                        logger.debug(
+                            'This host is not managed by UDS Broker (ids: {})'.format(
+                                self._interfaces
+                            )
+                        )
                         return False
 
-                    # Only removes token for managed machines
-                    master_token = None if self.isManaged() else self._cfg.master_token
+                    # Only removes master token for managed machines (will need it on next client execution)
+                    # For unmanaged, if alias is present, replace master token with it
+                    master_token = (
+                        None
+                        if self.isManaged()
+                        else (initResult.alias_token or self._cfg.master_token)
+                    )
+                    # Replace master token with alias token if present
                     self._cfg = self._cfg._replace(
                         master_token=master_token,
                         own_token=initResult.own_token,
                         config=types.ActorDataConfigurationType(
-                            unique_id=initResult.unique_id,
-                            os=initResult.os
-                        )
+                            unique_id=initResult.unique_id, os=initResult.os
+                        ),
                     )
 
-                # On first successfull initialization request, master token will dissapear for managed hosts so it will be no more available (not needed anyway)
-                if self.isManaged():
-                    platform.store.writeConfig(self._cfg)
+                # On first successfull initialization request, master token will dissapear for managed hosts
+                # so it will be no more available (not needed anyway). For unmanaged, the master token will
+                # be replaced with an alias token.
+                platform.store.writeConfig(self._cfg)
 
                 # Setup logger now
                 if self._cfg.own_token:
@@ -294,29 +346,51 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
 
                 break  # Initial configuration done..
             except rest.RESTConnectionError as e:
-                logger.info('Trying to inititialize connection with broker (last error: {})'.format(e))
+                logger.info(
+                    'Trying to inititialize connection with broker (last error: {})'.format(
+                        e
+                    )
+                )
                 self.doWait(5000)  # Wait a bit and retry
-            except rest.RESTError as e: # Invalid key?
-                logger.error('Error validating with broker. (Invalid token?): {}'.format(e))
+            except rest.RESTError as e:  # Invalid key?
+                logger.error(
+                    'Error validating with broker. (Invalid token?): {}'.format(e)
+                )
                 return False
+            except Exception:
+                logger.exception()
+                self.doWait(5000)  # Wait a bit and retry...
 
         return self.configureMachine()
 
     def uninitialize(self):
         self._initialized = False
-        self._cfg = self._cfg._replace(own_token=None)  # Ensures assigned token is cleared
+        self._cfg = self._cfg._replace(
+            own_token=None
+        )  # Ensures assigned token is cleared
 
     def finish(self) -> None:
         if self._http:
             self._http.stop()
 
         # If logged in, notify UDS of logout (daemon stoped = no control = logout)
-        if self._loggedIn and self._cfg.own_token:
-            self._loggedIn = False
-            try:
-                self._api.logout(self._cfg.own_token, '')
-            except Exception as e:
-                logger.error('Error notifying final logout to UDS: %s', e)
+        # For every connected client...
+        if self._cfg.own_token:
+            for client in clients_pool.UDSActorClientPool().clients:
+                if client.session_id:
+                    try:
+                        self._api.logout(
+                            self._cfg.actorType,
+                            self._cfg.own_token,
+                            '',
+                            client.session_id
+                            or 'stop',  # If no session id, pass "stop"
+                            '',
+                            self._interfaces,
+                            self._secret,
+                        )
+                    except Exception as e:
+                        logger.error('Error notifying final logout to UDS: %s', e)
 
         self.notifyStop()
 
@@ -325,19 +399,33 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
             return  # Unamanaged hosts does not changes ips. (The full initialize-login-logout process is done in a row, so at login the IP is correct)
 
         try:
-            if not self._cfg.own_token or not self._cfg.config or not self._cfg.config.unique_id:
+            if (
+                not self._cfg.own_token
+                or not self._cfg.config
+                or not self._cfg.config.unique_id
+            ):
                 # Not enouth data do check
                 return
-            currentInterfaces = list(platform.operations.getNetworkInfo())
+            currentInterfaces = tools.validNetworkCards(
+                self._cfg.restrict_net, platform.operations.getNetworkInfo()
+            )
             old = self.serviceInterfaceInfo()
             new = self.serviceInterfaceInfo(currentInterfaces)
             if not new or not old:
-                raise Exception('No ip currently available for {}'.format(self._cfg.config.unique_id))
+                raise Exception(
+                    'No ip currently available for {}'.format(
+                        self._cfg.config.unique_id
+                    )
+                )
             if old.ip != new.ip:
-                self._certificate = self._api.notifyIpChange(self._cfg.own_token, self._secret, new.ip, rest.LISTEN_PORT)
+                self._certificate = self._api.notifyIpChange(
+                    self._cfg.own_token, self._secret, new.ip, rest.LISTEN_PORT
+                )
                 # Now store new addresses & interfaces...
                 self._interfaces = currentInterfaces
-                logger.info('Ip changed from {} to {}. Notified to UDS'.format(old.ip, new.ip))
+                logger.info(
+                    'Ip changed from {} to {}. Notified to UDS'.format(old.ip, new.ip)
+                )
                 # Stop the running HTTP Thread and start a new one, with new generated cert
                 self.startHttpServer()
         except Exception as e:
@@ -345,29 +433,34 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
             logger.warn('Checking ips failed: {}'.format(e))
 
     def rename(
-            self,
-            name: str,
-            userName: typing.Optional[str] = None,
-            oldPassword: typing.Optional[str] = None,
-            newPassword: typing.Optional[str] = None
-        ) -> None:
+        self,
+        name: str,
+        userName: typing.Optional[str] = None,
+        oldPassword: typing.Optional[str] = None,
+        newPassword: typing.Optional[str] = None,
+    ) -> None:
         '''
         Invoked when broker requests a rename action
         default does nothing
         '''
         hostName = platform.operations.getComputerName()
 
-        if hostName.lower() == name.lower():
-            logger.info('Computer name is already {}'.format(hostName))
-            return
-
         # Check for password change request for an user
         if userName and newPassword:
             logger.info('Setting password for configured user')
             try:
-                platform.operations.changeUserPassword(userName, oldPassword or '', newPassword)
+                platform.operations.changeUserPassword(
+                    userName, oldPassword or '', newPassword
+                )
             except Exception as e:
-                raise Exception('Could not change password for user {} (maybe invalid current password is configured at broker): {} '.format(userName, str(e)))
+                # Logs error, but continue renaming computer
+                logger.error(
+                    'Could not change password for user {}: {}'.format(userName, e)
+                )
+
+        if hostName.lower() == name.lower():
+            logger.info('Computer name is already {}'.format(hostName))
+            return
 
         if platform.operations.renameComputer(name):
             self.reboot()
@@ -379,8 +472,9 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
             self.checkIpsChanged()
 
             # Now check if every registered client is already there (if logged in OFC)
-            if self._loggedIn and not self._clientsPool.ping():
-                self.logout('client_unavailable')
+            for lost_client in clients_pool.UDSActorClientPool().lost_clients():
+                logger.info('Lost client: {}'.format(lost_client))
+                self.logout('client_unavailable', '', lost_client.session_id or '')  # '' means "all clients"
         except Exception as e:
             logger.error('Exception on main service loop: %s', e)
 
@@ -388,13 +482,8 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
     # Methods that can be overriden by linux & windows Actor
     # ******************************************************
     def joinDomain(  # pylint: disable=unused-argument, too-many-arguments
-            self,
-            name: str,
-            domain: str,
-            ou: str,
-            account: str,
-            password: str
-        ) -> None:
+        self, name: str, domain: str, ou: str, account: str, password: str
+    ) -> None:
         '''
         Invoked when broker requests a "domain" action
         default does nothing
@@ -402,30 +491,86 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
         logger.debug('Base join invoked: {} on {}, {}'.format(name, domain, ou))
 
     # Client notifications
-    def login(self, username: str, sessionType: typing.Optional[str] = None) -> types.LoginResultInfoType:
-        result = types.LoginResultInfoType(ip='', hostname='', dead_line=None, max_idle=None)
-        self._loggedIn = True
+    def login(
+        self, username: str, sessionType: typing.Optional[str] = None
+    ) -> types.LoginResultInfoType:
+        result = types.LoginResultInfoType(
+            ip='', hostname='', dead_line=None, max_idle=None, session_id=None
+        )
+        master_token = None
+        secret = None
+        # If unmanaged, do initialization now, because we don't know before this
+        # Also, even if not initialized, get a "login" notification token
         if not self.isManaged():
-            self.initialize()
+            self._initialized = (
+                self.initialize()
+            )  # Maybe it's a local login by an unmanaged host.... On real login, will execute initilize again
+            # Unamanaged, need the master token
+            master_token = self._cfg.master_token
+            secret = self._secret
 
-        if self._cfg.own_token:
-            result = self._api.login(self._cfg.own_token, username, sessionType)
+        # Own token will not be set if UDS did not assigned the initialized VM to an user
+        # In that case, take master token (if machine is Unamanaged version)
+        token = self._cfg.own_token or master_token
+        if token:
+            result = self._api.login(
+                self._cfg.actorType,
+                token,
+                username,
+                sessionType or '',
+                self._interfaces,
+                secret,
+            )
+
+        if (
+            result.session_id
+        ):  # If logged in, process it. client_pool will take account of login response to client and session
+            script = platform.store.invokeScriptOnLogin()
+            if script:
+                logger.info('Executing script on login: {}'.format(script))
+                script += f'{username} {sessionType or "unknown"} {self._cfg.actorType}'
+                self.execute(script, 'Logon')
 
         return result
 
-    def logout(self, username: str) -> None:
-        self._loggedIn = False
-        if self._cfg.own_token:
-            self._api.logout(self._cfg.own_token, username)
+    def logout(
+        self,
+        username: str,
+        session_type: typing.Optional[str],
+        session_id: typing.Optional[str],
+    ) -> None:
+        master_token = self._cfg.master_token
 
-        self.onLogout(username)
+        # Own token will not be set if UDS did not assigned the initialized VM to an user
+        # In that case, take master token (if machine is Unamanaged version)
+        token = self._cfg.own_token or master_token
+        if token:
+            # If logout is not processed (that is, not ok result), the logout has not been processed
+            if (
+                self._api.logout(
+                    self._cfg.actorType,
+                    token,
+                    username,
+                    session_id or '',
+                    session_type or '',
+                    self._interfaces,
+                    self._secret,
+                )
+                != 'ok'  # Can return also "notified", that means the logout has not been processed by UDS
+            ):
+                logger.info(
+                    'Logout from %s ignored as required by uds broker', username
+                )
+                return
+
+        self.onLogout(username, session_id or '')
 
         if not self.isManaged():
             self.uninitialize()
 
-    # ****************************************
-    # Methods that CAN BE overriden by actors
-    # ****************************************
+    # ******************************************************
+    # Methods that CAN BE overriden by specific OS Actor
+    # ******************************************************
     def doWait(self, miliseconds: int) -> None:
         '''
         Invoked to wait a bit
@@ -444,15 +589,27 @@ class CommonService:  # pylint: disable=too-many-instance-attributes
         '''
         logger.info('Service stopped')
 
-    def preConnect(self, userName: str, protocol: str, ip: str, hostname: str) -> str:  # pylint: disable=unused-argument
+    def preConnect(
+        self, userName: str, protocol: str, ip: str, hostname: str, udsUserName: str
+    ) -> str:
         '''
         Invoked when received a PRE Connection request via REST
         Base preconnect executes the preconnect command
         '''
         if self._cfg.pre_command:
-            self.execute(self._cfg.pre_command + ' {} {} {} {}'.format(userName.replace('"', '%22'), protocol, ip, hostname), 'preConnect')
+            self.execute(
+                self._cfg.pre_command
+                + ' {} {} {} {} {}'.format(
+                    userName.replace('"', '%22'),
+                    protocol,
+                    ip,
+                    hostname,
+                    udsUserName.replace('"', '%22'),
+                ),
+                'preConnect',
+            )
 
         return 'ok'
 
-    def onLogout(self, userName: str) -> None:
+    def onLogout(self, userName: str, session_id: str) -> None:
         logger.debug('On logout invoked for {}'.format(userName))

actor/src/udsactor/tools.py

@@ -28,20 +28,113 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-# pylint: disable=invalid-name
 import threading
+import ipaddress
+import time
+import typing
+import functools
 
-from udsactor.log import logger
+if typing.TYPE_CHECKING:
+    from udsactor.types import InterfaceInfoType
 
+# Simple cache for n seconds (default = 30) decorator
+def cache(seconds: int = 30) -> typing.Callable:
+    '''
+    Simple cache for n seconds (default = 30) decorator
+    '''
+    def decorator(func) -> typing.Callable:
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs) -> typing.Any:
+            if not hasattr(wrapper, 'cache'):
+                wrapper.cache = {}  # type: ignore
+            cache = wrapper.cache  # type: ignore
+
+            # Compose a key for the cache
+            key = '{}:{}'.format(args, kwargs)
+            if key in cache:
+                if time.time() - cache[key][0] < seconds:
+                    return cache[key][1]
+            
+            # Call the function
+            result = func(*args, **kwargs)
+            cache[key] = (time.time(), result)
+            return result
+
+        return wrapper
+
+    return decorator
+
+
+# Simple sub-script exectution thread
 class ScriptExecutorThread(threading.Thread):
     def __init__(self, script: str) -> None:
         super(ScriptExecutorThread, self).__init__()
         self.script = script
 
     def run(self) -> None:
+        from udsactor.log import logger
+
         try:
             logger.debug('Executing script: {}'.format(self.script))
-            exec(self.script, globals(), None)  # pylint: disable=exec-used
+            exec(
+                self.script, globals(), None
+            )  # nosec: exec is fine, it's a "trusted" script
         except Exception as e:
             logger.error('Error executing script: {}'.format(e))
             logger.exception()
+
+
+class Singleton(type):
+    '''
+    Metaclass for singleton pattern
+    Usage:
+
+    class MyClass(metaclass=Singleton):
+        ...
+    '''
+
+    _instance: typing.Optional[typing.Any]
+
+    # We use __init__ so we customise the created class from this metaclass
+    def __init__(self, *args, **kwargs) -> None:
+        self._instance = None
+        super().__init__(*args, **kwargs)
+
+    def __call__(self, *args, **kwargs) -> typing.Any:
+        if self._instance is None:
+            self._instance = super().__call__(*args, **kwargs)
+        return self._instance
+
+
+# Convert "X.X.X.X/X" to ipaddress.IPv4Network
+def strToNoIPV4Network(
+    net: typing.Optional[str],
+) -> typing.Optional[ipaddress.IPv4Network]:
+    if not net:  # Empty or None
+        return None
+    try:
+        return ipaddress.IPv4Interface(net).network
+    except Exception:
+        return None
+
+
+def validNetworkCards(
+    net: typing.Optional[str], cards: typing.Iterable['InterfaceInfoType']
+) -> typing.List['InterfaceInfoType']:
+    try:
+        subnet = strToNoIPV4Network(net)
+    except Exception as e:
+        subnet = None
+
+    if subnet is None:
+        return list(cards)
+
+    def isValid(ip: str, subnet: ipaddress.IPv4Network) -> bool:
+        if not ip:
+            return False
+        try:
+            return ipaddress.IPv4Address(ip) in subnet
+        except Exception:
+            return False
+
+    return [c for c in cards if isValid(c.ip, subnet)]

actor/src/udsactor/types.py

@@ -35,6 +35,7 @@ class ActorConfigurationType(typing.NamedTuple):
     actorType: typing.Optional[str] = None
     master_token: typing.Optional[str] = None
     own_token: typing.Optional[str] = None
+    restrict_net: typing.Optional[str] = None
 
     pre_command: typing.Optional[str] = None
     runonce_command: typing.Optional[str] = None
@@ -50,12 +51,22 @@ class InitializationResultType(typing.NamedTuple):
     own_token: typing.Optional[str] = None
     unique_id: typing.Optional[str] = None
     os: typing.Optional[ActorOsConfigurationType] = None
+    alias_token: typing.Optional[str] = None
 
 class LoginResultInfoType(typing.NamedTuple):
     ip: str
     hostname: str
     dead_line: typing.Optional[int]
-    max_idle: typing.Optional[int]  # Not provided by broker
+    max_idle: typing.Optional[int]
+    session_id: typing.Optional[str]
+
+    @property
+    def logged_in(self) -> bool:
+        return bool(self.session_id)
+
+class ClientInfo(typing.NamedTuple):
+    url: str
+    session_id: str
 
 class CertificateInfoType(typing.NamedTuple):
     private_key: str

actor/src/udsactor/version.py

@@ -0,0 +1,2 @@
+VERSION = '4.0.0'
+BUILD = '20220901'

actor/src/udsactor/windows/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014-2019 Virtual Cable S.L.
+# Copyright (c) 2014-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #

actor/src/udsactor/windows/log.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014 Virtual Cable S.L.
+# Copyright (c) 2014-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -34,7 +34,7 @@ import os
 import tempfile
 import typing
 
-import servicemanager  # pylint: disable=import-error
+import servicemanager
 
 # Valid logging levels, from UDS Broker (uds.core.utils.log).
 from .. import loglevel
@@ -42,6 +42,7 @@ from .. import loglevel
 class LocalLogger:  # pylint: disable=too-few-public-methods
     linux = False
     windows = True
+    serviceLogger = False
 
     logger: typing.Optional[logging.Logger]
 

actor/src/udsactor/windows/operations.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014-2019 Virtual Cable S.L.
+# Copyright (c) 2014-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -45,32 +45,46 @@ import win32con
 from .. import types
 from ..log import logger
 
+
 def checkPermissions() -> bool:
     return shell.IsUserAnAdmin()
 
+
 def getErrorMessage(resultCode: int = 0) -> str:
     # sys_fs_enc = sys.getfilesystemencoding() or 'mbcs'
     msg = win32api.FormatMessage(resultCode)
     return msg
 
+
 def getComputerName() -> str:
     return win32api.GetComputerNameEx(win32con.ComputerNamePhysicalDnsHostname)
 
+
 def getNetworkInfo() -> typing.Iterator[types.InterfaceInfoType]:
     obj = win32com.client.Dispatch("WbemScripting.SWbemLocator")
     wmobj = obj.ConnectServer("localhost", "root\\cimv2")
-    adapters = wmobj.ExecQuery("Select * from Win32_NetworkAdapterConfiguration where IpEnabled=True")
+    adapters = wmobj.ExecQuery(
+        "Select * from Win32_NetworkAdapterConfiguration where IpEnabled=True"
+    )
     try:
         for obj in adapters:
             for ip in obj.IPAddress:
                 if ':' in ip:  # Is IPV6, skip this
                     continue
-                if ip is None or ip == '' or ip.startswith('169.254') or ip.startswith('0.'):  # If single link ip, or no ip
+                if (
+                    ip is None
+                    or ip == ''
+                    or ip.startswith('169.254')
+                    or ip.startswith('0.')
+                ):  # If single link ip, or no ip
                     continue
-                yield types.InterfaceInfoType(name=obj.Caption, mac=obj.MACAddress, ip=ip)
+                yield types.InterfaceInfoType(
+                    name=obj.Caption, mac=obj.MACAddress, ip=ip
+                )
     except Exception:
         return
 
+
 def getDomainName() -> str:
     '''
     Will return the domain name if we belong a domain, else None
@@ -87,9 +101,19 @@ def getDomainName() -> str:
 
     return domain
 
+
 def getWindowsVersion() -> typing.Tuple[int, int, int, int, str]:
     return win32api.GetVersionEx()
 
+
+def getVersion() -> str:
+    verinfo = getWindowsVersion()
+    # Remove platform id i
+    return 'Windows-{}.{} Build {} ({})'.format(
+        verinfo[0], verinfo[1], verinfo[2], verinfo[4]
+    )
+
+
 EWX_LOGOFF = 0x00000000
 EWX_SHUTDOWN = 0x00000001
 EWX_REBOOT = 0x00000002
@@ -97,31 +121,53 @@ EWX_FORCE = 0x00000004
 EWX_POWEROFF = 0x00000008
 EWX_FORCEIFHUNG = 0x00000010
 
+
 def reboot(flags: int = EWX_FORCEIFHUNG | EWX_REBOOT) -> None:
     hproc = win32api.GetCurrentProcess()
-    htok = win32security.OpenProcessToken(hproc, win32security.TOKEN_ADJUST_PRIVILEGES | win32security.TOKEN_QUERY)
-    privs = ((win32security.LookupPrivilegeValue(None, win32security.SE_SHUTDOWN_NAME), win32security.SE_PRIVILEGE_ENABLED),)
+    htok = win32security.OpenProcessToken(
+        hproc, win32security.TOKEN_ADJUST_PRIVILEGES | win32security.TOKEN_QUERY
+    )
+    privs = (
+        (
+            win32security.LookupPrivilegeValue(None, win32security.SE_SHUTDOWN_NAME),
+            win32security.SE_PRIVILEGE_ENABLED,
+        ),
+    )
     win32security.AdjustTokenPrivileges(htok, 0, privs)
     win32api.ExitWindowsEx(flags, 0)
 
+
 def loggoff() -> None:
     win32api.ExitWindowsEx(EWX_LOGOFF)
 
+
 def renameComputer(newName: str) -> bool:
     '''
     Changes the computer name
     Returns True if reboot needed
     '''
     # Needs admin privileges to work
-    if ctypes.windll.kernel32.SetComputerNameExW(DWORD(win32con.ComputerNamePhysicalDnsHostname), LPCWSTR(newName)) == 0:  # @UndefinedVariable
+    if (
+        ctypes.windll.kernel32.SetComputerNameExW(
+            DWORD(win32con.ComputerNamePhysicalDnsHostname), LPCWSTR(newName)
+        )
+        == 0
+    ):  # @UndefinedVariable
         # win32api.FormatMessage -> returns error string
         # win32api.GetLastError -> returns error code
         # (just put this comment here to remember to log this when logger is available)
         error = getErrorMessage()
-        computerName = win32api.GetComputerNameEx(win32con.ComputerNamePhysicalDnsHostname)
-        raise Exception('Error renaming computer from {} to {}: {}'.format(computerName, newName, error))
+        computerName = win32api.GetComputerNameEx(
+            win32con.ComputerNamePhysicalDnsHostname
+        )
+        raise Exception(
+            'Error renaming computer from {} to {}: {}'.format(
+                computerName, newName, error
+            )
+        )
     return True
 
+
 NETSETUP_JOIN_DOMAIN = 0x00000001
 NETSETUP_ACCT_CREATE = 0x00000002
 NETSETUP_ACCT_DELETE = 0x00000004
@@ -132,7 +178,10 @@ NETSETUP_MACHINE_PWD_PASSED = 0x00000080
 NETSETUP_JOIN_WITH_NEW_NAME = 0x00000400
 NETSETUP_DEFER_SPN_SET = 0x1000000
 
-def joinDomain(domain: str, ou: str, account: str, password: str, executeInOneStep: bool = False) -> None:
+
+def joinDomain(
+    domain: str, ou: str, account: str, password: str, executeInOneStep: bool = False
+) -> None:
     '''
     Joins machine to a windows domain
     :param domain: Domain to join to
@@ -149,7 +198,9 @@ def joinDomain(domain: str, ou: str, account: str, password: str, executeInOneSt
             account = domain + '\\' + account
 
     # Do log
-    flags: typing.Any = NETSETUP_ACCT_CREATE | NETSETUP_DOMAIN_JOIN_IF_JOINED | NETSETUP_JOIN_DOMAIN
+    flags: typing.Any = (
+        NETSETUP_ACCT_CREATE | NETSETUP_DOMAIN_JOIN_IF_JOINED | NETSETUP_JOIN_DOMAIN
+    )
 
     if executeInOneStep:
         flags |= NETSETUP_JOIN_WITH_NEW_NAME
@@ -163,18 +214,31 @@ def joinDomain(domain: str, ou: str, account: str, password: str, executeInOneSt
     lpAccount = LPCWSTR(account)
     lpPassword = LPCWSTR(password)
 
-    res = ctypes.windll.netapi32.NetJoinDomain(None, lpDomain, lpOu, lpAccount, lpPassword, flags)
+    res = ctypes.windll.netapi32.NetJoinDomain(
+        None, lpDomain, lpOu, lpAccount, lpPassword, flags
+    )
     # Machine found in another ou, use it and warn this on log
     if res == 2224:
         flags = DWORD(NETSETUP_DOMAIN_JOIN_IF_JOINED | NETSETUP_JOIN_DOMAIN)
-        res = ctypes.windll.netapi32.NetJoinDomain(None, lpDomain, None, lpAccount, lpPassword, flags)
+        res = ctypes.windll.netapi32.NetJoinDomain(
+            None, lpDomain, None, lpAccount, lpPassword, flags
+        )
     if res:
         # Log the error
         error = getErrorMessage(res)
         if res == 1355:
             error = "DC Is not reachable"
         logger.error('Error joining domain: {}, {}'.format(error, res))
-        raise Exception('Error joining domain {}, with credentials {}/*****{}: {}, {}'.format(domain, account, ', under OU {}'.format(ou) if ou is not None else '', res, error))
+        raise Exception(
+            'Error joining domain {}, with credentials {}/*****{}: {}, {}'.format(
+                domain,
+                account,
+                ', under OU {}'.format(ou) if ou is not None else '',
+                res,
+                error,
+            )
+        )
+
 
 def changeUserPassword(user: str, oldPassword: str, newPassword: str) -> None:
     # lpUser = LPCWSTR(user)
@@ -188,7 +252,10 @@ def changeUserPassword(user: str, oldPassword: str, newPassword: str) -> None:
     if res:
         # Log the error, and raise exception to parent
         error = getErrorMessage(res)
-        raise Exception('Error changing password for user {}: {} {}'.format(user, res, error))
+        raise Exception(
+            'Error changing password for user {}: {} {}'.format(user, res, error)
+        )
+
 
 class LASTINPUTINFO(ctypes.Structure):  # pylint: disable=too-few-public-methods
     _fields_ = [
@@ -196,16 +263,20 @@ class LASTINPUTINFO(ctypes.Structure):  # pylint: disable=too-few-public-methods
         ('dwTime', ctypes.c_uint),
     ]
 
+
 def initIdleDuration(atLeastSeconds: int):  # pylint: disable=unused-argument
     '''
     In windows, there is no need to set screensaver
     '''
     return
 
+
 def getIdleDuration() -> float:
     try:
         lastInputInfo = LASTINPUTINFO()
-        lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo)  # pylint: disable=attribute-defined-outside-init
+        lastInputInfo.cbSize = ctypes.sizeof(
+            lastInputInfo
+        )  # pylint: disable=attribute-defined-outside-init
         if ctypes.windll.user32.GetLastInputInfo(ctypes.byref(lastInputInfo)) == 0:
             return 0
         current = ctypes.c_uint(ctypes.windll.kernel32.GetTickCount()).value
@@ -217,22 +288,27 @@ def getIdleDuration() -> float:
         logger.error('Getting idle duration: {}'.format(e))
         return 0
 
+
 def getCurrentUser() -> str:
     '''
     Returns current logged in username
     '''
     return os.environ['USERNAME']
 
+
 def getSessionType() -> str:
     '''
-      Known values:
-        * Unknown -> No SESSIONNAME environment variable
-        * Console -> Local session
-        *  RDP-Tcp#[0-9]+ -> RDP Session
+    Known values:
+      * Unknown -> No SESSIONNAME environment variable
+      * Console -> Local session
+      *  RDP-Tcp#[0-9]+ -> RDP Session
     '''
     return os.environ.get('SESSIONNAME', 'unknown')
 
-def writeToPipe(pipeName: str, bytesPayload: bytes, waitForResponse: bool) -> typing.Optional[bytes]:
+
+def writeToPipe(
+    pipeName: str, bytesPayload: bytes, waitForResponse: bool
+) -> typing.Optional[bytes]:
     # (str, bytes, bool) -> Optional[bytes]
     try:
         with open(pipeName, 'r+b', 0) as f:
@@ -244,8 +320,11 @@ def writeToPipe(pipeName: str, bytesPayload: bytes, waitForResponse: bool) -> ty
     except Exception:
         return None
 
+
 def forceTimeSync() -> None:
     try:
-        subprocess.call([r'c:\WINDOWS\System32\w32tm.exe', ' /resync'])  # , '/rediscover'])
+        subprocess.call(
+            [r'c:\WINDOWS\System32\w32tm.exe', ' /resync']
+        )  # , '/rediscover'])
     except Exception as e:
         logger.error('Error invoking time sync command: %s', e)

actor/src/udsactor/windows/runner.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2019 Virtual Cable S.L.
+# Copyright (c) 2019-2022 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -41,6 +41,8 @@ from .service import UDSActorSvc
 def setupRecoverService():
     svc_name = UDSActorSvc._svc_name_  # pylint: disable=protected-access
 
+    hs = None
+    hscm = None
     try:
         hscm = win32service.OpenSCManager(None, None, win32service.SC_MANAGER_ALL_ACCESS)
 
@@ -57,9 +59,11 @@ def setupRecoverService():
             }
             win32service.ChangeServiceConfig2(hs, win32service.SERVICE_CONFIG_FAILURE_ACTIONS, service_failure_actions)
         finally:
-            win32service.CloseServiceHandle(hs)
+            if hs:
+                win32service.CloseServiceHandle(hs)
     finally:
-        win32service.CloseServiceHandle(hscm)
+        if hscm:
+            win32service.CloseServiceHandle(hscm)
 
 
 def run() -> None:

actor/src/udsactor/windows/service.py

@@ -39,6 +39,7 @@ import win32net
 import win32event
 import pythoncom
 import servicemanager
+import winreg as wreg
 
 from . import operations
 from . import store
@@ -138,7 +139,7 @@ class UDSActorSvc(win32serviceutil.ServiceFramework, CommonService):
             logger.info('Using multiple step join because configuration requests to do so')
             self.multiStepJoin(name, domain, ou, account, password)
 
-    def preConnect(self, userName: str, protocol: str, ip: str, hostname: str) -> str:
+    def preConnect(self, userName: str, protocol: str, ip: str, hostname: str, udsUserName: str) -> str:    
         logger.debug('Pre connect invoked')
 
         if protocol == 'rdp':  # If connection is not using rdp, skip adding user
@@ -167,7 +168,7 @@ class UDSActorSvc(win32serviceutil.ServiceFramework, CommonService):
                 self._user = None
                 logger.debug('User {} already in group'.format(userName))
 
-        return super().preConnect(userName, protocol, ip, hostname)
+        return super().preConnect(userName, protocol, ip, hostname, udsUserName)
 
     def ovLogon(self, username: str, password: str) -> str:
         """
@@ -182,7 +183,7 @@ class UDSActorSvc(win32serviceutil.ServiceFramework, CommonService):
         operations.writeToPipe("\\\\.\\pipe\\VDSMDPipe", packet, True)
         return 'done'
 
-    def onLogout(self, userName) -> None:
+    def onLogout(self, userName: str, session_id: str) -> None:
         logger.debug('Windows onLogout invoked: {}, {}'.format(userName, self._user))
         try:
             p = win32security.GetBinarySid(REMOTE_USERS_SID)
@@ -197,6 +198,18 @@ class UDSActorSvc(win32serviceutil.ServiceFramework, CommonService):
             except Exception as e:
                 logger.error('Exception removing user from Remote Desktop Users: {}'.format(e))
 
+    def isInstallationRunning(self):
+        '''
+        Detect if windows is installing anything, so we can delay the execution of Service
+        '''
+        try:
+            key = wreg.OpenKey(wreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Setup\State')
+            data, _ = wreg.QueryValueEx(key, 'ImageState')
+            logger.debug('State: %s', data)
+            return data != 'IMAGE_STATE_COMPLETE'  # If ImageState is different of ImageStateComplete, there is something running on installation
+        except Exception:  # If not found, means that no installation is running 
+            return False
+
     def SvcDoRun(self) -> None:  # pylint: disable=too-many-statements, too-many-branches
         '''
         Main service loop
@@ -209,6 +222,17 @@ class UDSActorSvc(win32serviceutil.ServiceFramework, CommonService):
 
         pythoncom.CoInitialize()  # pylint: disable=no-member
 
+        # Check if some install is running on windows before proceeding
+        while self._isAlive:
+            if self.isInstallationRunning():
+                win32event.WaitForSingleObject(self._hWaitStop, 1000)  # Wait a bit, and check again
+                continue
+            break
+
+        if not self._isAlive:  # Has been stopped while waiting windows installations
+            self.finish()
+            return
+
         # Unmanaged services does not initializes "on start", but rather when user logs in (because userservice does not exists "as such" before that)
         if self.isManaged():
             if not self.initialize():

actor/src/udsactor/windows/store.py

@@ -76,9 +76,9 @@ def writeConfig(config: types.ActorConfigurationType) -> None:
     except Exception:
         key = wreg.CreateKeyEx(BASEKEY, PATH, 0, wreg.KEY_ALL_ACCESS)
 
-    fixRegistryPermissions(key.handle)
+    fixRegistryPermissions(key.handle)  # type: ignore
 
-    wreg.SetValueEx(key, "", 0, wreg.REG_BINARY, pickle.dumps(config))
+    wreg.SetValueEx(key, "", 0, wreg.REG_BINARY, pickle.dumps(config)) # type: ignore
     wreg.CloseKey(key)
 
 
@@ -94,3 +94,16 @@ def useOldJoinSystem() -> bool:
         data = ''
 
     return data == 'old'
+
+def invokeScriptOnLogin() -> str:
+    try:
+        key = wreg.OpenKey(BASEKEY, PATH, 0, wreg.KEY_QUERY_VALUE)
+        try:
+            data, _ = wreg.QueryValueEx(key, 'logonScript')
+        except Exception:
+            data = ''
+        wreg.CloseKey(key)
+    except Exception:
+        data = ''
+
+    return data

actor/src/ui/setup_dialog_ui.py

@@ -2,9 +2,10 @@
 
 # Form implementation generated from reading ui file 'setup-dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.13.2
+# Created by: PyQt5 UI code generator 5.15.2
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets

actor/src/ui/setup_dialog_unmanaged_ui.py

@@ -2,9 +2,10 @@
 
 # Form implementation generated from reading ui file 'setup-dialog-unmanaged.ui'
 #
-# Created by: PyQt5 UI code generator 5.13.2
+# Created by: PyQt5 UI code generator 5.15.2
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -14,7 +15,7 @@ class Ui_UdsActorSetupDialog(object):
     def setupUi(self, UdsActorSetupDialog):
         UdsActorSetupDialog.setObjectName("UdsActorSetupDialog")
         UdsActorSetupDialog.setWindowModality(QtCore.Qt.WindowModal)
-        UdsActorSetupDialog.resize(595, 220)
+        UdsActorSetupDialog.resize(601, 243)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -34,12 +35,12 @@ class Ui_UdsActorSetupDialog(object):
         UdsActorSetupDialog.setModal(True)
         self.saveButton = QtWidgets.QPushButton(UdsActorSetupDialog)
         self.saveButton.setEnabled(True)
-        self.saveButton.setGeometry(QtCore.QRect(10, 180, 181, 23))
+        self.saveButton.setGeometry(QtCore.QRect(10, 210, 181, 23))
         self.saveButton.setMinimumSize(QtCore.QSize(181, 0))
         self.saveButton.setContextMenuPolicy(QtCore.Qt.DefaultContextMenu)
         self.saveButton.setObjectName("saveButton")
         self.closeButton = QtWidgets.QPushButton(UdsActorSetupDialog)
-        self.closeButton.setGeometry(QtCore.QRect(410, 180, 171, 23))
+        self.closeButton.setGeometry(QtCore.QRect(410, 210, 171, 23))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -49,11 +50,11 @@ class Ui_UdsActorSetupDialog(object):
         self.closeButton.setObjectName("closeButton")
         self.testButton = QtWidgets.QPushButton(UdsActorSetupDialog)
         self.testButton.setEnabled(False)
-        self.testButton.setGeometry(QtCore.QRect(210, 180, 181, 23))
+        self.testButton.setGeometry(QtCore.QRect(210, 210, 181, 23))
         self.testButton.setMinimumSize(QtCore.QSize(181, 0))
         self.testButton.setObjectName("testButton")
         self.layoutWidget = QtWidgets.QWidget(UdsActorSetupDialog)
-        self.layoutWidget.setGeometry(QtCore.QRect(10, 10, 571, 161))
+        self.layoutWidget.setGeometry(QtCore.QRect(10, 10, 571, 191))
         self.layoutWidget.setObjectName("layoutWidget")
         self.formLayout = QtWidgets.QFormLayout(self.layoutWidget)
         self.formLayout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
@@ -84,7 +85,7 @@ class Ui_UdsActorSetupDialog(object):
         self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.serviceToken)
         self.label_loglevel = QtWidgets.QLabel(self.layoutWidget)
         self.label_loglevel.setObjectName("label_loglevel")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_loglevel)
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_loglevel)
         self.logLevelComboBox = QtWidgets.QComboBox(self.layoutWidget)
         self.logLevelComboBox.setFrame(True)
         self.logLevelComboBox.setObjectName("logLevelComboBox")
@@ -96,7 +97,13 @@ class Ui_UdsActorSetupDialog(object):
         self.logLevelComboBox.setItemText(2, "ERROR")
         self.logLevelComboBox.addItem("")
         self.logLevelComboBox.setItemText(3, "FATAL")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.logLevelComboBox)
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.logLevelComboBox)
+        self.label_restrictNet = QtWidgets.QLabel(self.layoutWidget)
+        self.label_restrictNet.setObjectName("label_restrictNet")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_restrictNet)
+        self.restrictNet = QtWidgets.QLineEdit(self.layoutWidget)
+        self.restrictNet.setObjectName("restrictNet")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.restrictNet)
         self.label_host.raise_()
         self.host.raise_()
         self.label_serviceToken.raise_()
@@ -105,6 +112,8 @@ class Ui_UdsActorSetupDialog(object):
         self.label_security.raise_()
         self.label_loglevel.raise_()
         self.logLevelComboBox.raise_()
+        self.label_restrictNet.raise_()
+        self.restrictNet.raise_()
 
         self.retranslateUi(UdsActorSetupDialog)
         self.logLevelComboBox.setCurrentIndex(1)
@@ -113,6 +122,7 @@ class Ui_UdsActorSetupDialog(object):
         self.saveButton.clicked.connect(UdsActorSetupDialog.saveConfig)
         self.host.textChanged['QString'].connect(UdsActorSetupDialog.configChanged)
         self.serviceToken.textChanged['QString'].connect(UdsActorSetupDialog.configChanged)
+        self.restrictNet.textChanged['QString'].connect(UdsActorSetupDialog.configChanged)
         QtCore.QMetaObject.connectSlotsByName(UdsActorSetupDialog)
 
     def retranslateUi(self, UdsActorSetupDialog):
@@ -136,7 +146,10 @@ class Ui_UdsActorSetupDialog(object):
         self.host.setToolTip(_translate("UdsActorSetupDialog", "Uds Broker Server Addres. Use IP or FQDN"))
         self.host.setWhatsThis(_translate("UdsActorSetupDialog", "Enter here the UDS Broker Addres using either its IP address or its FQDN address"))
         self.label_serviceToken.setText(_translate("UdsActorSetupDialog", "Service Token"))
-        self.serviceToken.setToolTip(_translate("UdsActorSetupDialog", "UDS user with administration rights (Will not be stored on template)"))
+        self.serviceToken.setToolTip(_translate("UdsActorSetupDialog", "UDS Service Token"))
         self.serviceToken.setWhatsThis(_translate("UdsActorSetupDialog", "<html><head/><body><p>Administrator user on UDS Server.</p><p>Note: This credential will not be stored on client. Will be used to obtain an unique token for this image.</p></body></html>"))
         self.label_loglevel.setText(_translate("UdsActorSetupDialog", "Log Level"))
+        self.label_restrictNet.setText(_translate("UdsActorSetupDialog", "Restrict Net"))
+        self.restrictNet.setToolTip(_translate("UdsActorSetupDialog", "UDS user with administration rights (Will not be stored on template)"))
+        self.restrictNet.setWhatsThis(_translate("UdsActorSetupDialog", "<html><head/><body><p>Administrator user on UDS Server.</p><p>Note: This credential will not be stored on client. Will be used to obtain an unique token for this image.</p></body></html>"))
 from ui import uds_rc

actor/src/ui/uds_rc.py

@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created by: The Resource Compiler for PyQt5 (Qt v5.13.2)
+# Created by: The Resource Compiler for PyQt5 (Qt v5.15.2)
 #
 # WARNING! All changes made in this file will be lost!
 

client-py3/full/.env

@@ -0,0 +1,2 @@
+PYTHONPATH=./src:${PYTHONPATH}
+

client-py3/full/linux/.gitignore

@@ -2,3 +2,7 @@
 /udsclient-[0-9]*.spec
 /debian/udsclient
 /targz
+/UDSClientDir
+/UDSClient*.AppImage
+/appimage*
+/UDSClient.desktop

client-py3/full/linux/Makefile

@@ -14,6 +14,8 @@ APPSDIR := $(DESTDIR)/usr/share/applications
 PYC := $(shell find $(SOURCEDIR) -name '*.py[co]')
 CACHES := $(shell find $(SOURCEDIR) -name '__pycache__')
 
+
+
 clean:
 	rm -rf $(PYC) $(CACHES) $(DESTDIR)
 install:
@@ -46,8 +48,60 @@ endif
 ifeq ($(DISTRO),rh)
 endif
 
-	# chmod 0755 $(BINDIR)/udsclient
 uninstall:
 	rm -rf $(LIBDIR)
 	# rm -f $(BINDIR)/udsclient
 	#  rm -rf $(CFGDIR)
+
+build-appimage:
+ifeq ($(DISTRO),x86_64)
+	cat udsclient-appimage-x86_64.recipe | sed -e s/"version: 0.0.0"/"version: $(VERSION)"/g > appimage.recipe
+endif
+ifeq ($(DISTRO),armhf)
+	cat udsclient-appimage-x86_64.recipe | sed -e s/"version: 0.0.0"/"version: $(VERSION)"/g | sed -e s/amd64/armhf/g | sed -e s/x86_64/armhf/g > appimage.recipe
+endif
+ifeq ($(DISTRO),i686)
+	cat udsclient-appimage-x86_64.recipe | sed -e s/"version: 0.0.0"/"version: $(VERSION)"/g | sed -e s/amd64/i386/g | sed -e s/x86_64/i686/g > appimage.recipe
+endif
+# Ensure all working folders are "clean"
+	-rm -rf appimage appimage-builder-cache /tmp/UDSClientDir
+
+	appimage-builder --recipe appimage.recipe
+# Now create dist and move appimage
+	rm -rf $(DESTDIR)
+	mkdir -p $(DESTDIR)
+	cp UDSClient-$(VERSION)-$(DISTRO).AppImage $(DESTDIR)
+# Generate the .desktop fixed for new path
+	cat desktop/UDSClient.desktop | sed -e s/".usr.lib.UDSClient.UDSClient.py"/"\/usr\/bin\/UDSClient-$(VERSION)-$(DISTRO).AppImage"/g > $(DESTDIR)/UDSClient.desktop
+# And also, generater installer
+	cat installer-appimage-template.sh | sed -e s/"0.0.0"/"$(VERSION)"/g | sed -e s/x86_64/$(DISTRO)/g > $(DESTDIR)/installer.sh
+	chmod 755 $(DESTDIR)/installer.sh
+	tar czvf ../udsclient3-$(DISTRO)-$(VERSION).tar.gz -C $(DESTDIR) .
+
+# cleanup
+	-rm -rf appimage appimage-builder-cache /tmp/UDSClientDir
+
+build-igel:
+	rm -rf $(DESTDIR)
+	mkdir -p $(DESTDIR)
+# Calculate the size of the custom partition (15 megas more than the appimage size)
+	@$(eval APPIMAGE_SIZE=$(shell du -sm UDSClient-$(VERSION)-x86_64.AppImage | cut -f1))
+	@$(eval APPIMAGE_SIZE=$(shell expr $(APPIMAGE_SIZE) + 15))
+	cat igel/UDSClient-Profile-template.xml | sed -e s/"_SIZE_"/"$(APPIMAGE_SIZE)M"/g > $(DESTDIR)/UDSClient-Profile.xml
+	cat igel/UDSClient-template.inf | sed -e s/"_SIZE_"/"$(APPIMAGE_SIZE)M"/g > $(DESTDIR)/UDSClient.inf
+	cp UDSClient-$(VERSION)-x86_64.AppImage $(DESTDIR)/UDSClient
+	cp igel/UDSClient.desktop $(DESTDIR)/UDSClient.desktop
+	cp igel/init.sh $(DESTDIR)/init.sh
+	tar cjvf $(DESTDIR)/UDSClient.tar.bz2 -C $(DESTDIR) UDSClient UDSClient.desktop init.sh
+	zip -j ../udsclient3-$(VERSION)-igel.zip $(DESTDIR)/UDSClient-Profile.xml $(DESTDIR)/UDSClient.inf $(DESTDIR)/UDSClient.tar.bz2
+	cd ..
+	rm -rf $(DESTDIR)
+
+build-thinpro:
+	rm -rf $(DESTDIR)
+	mkdir -p $(DESTDIR)
+	cp -r thinpro/* $(DESTDIR)
+	cp UDSClient-$(VERSION)-x86_64.AppImage $(DESTDIR)/UDSClient
+	tar czvf ../udsclient3-$(VERSION)-thinpro.tar.gz -C $(DESTDIR) .
+	rm -rf $(DESTDIR)
+

client-py3/full/linux/build-packages.sh

@@ -12,6 +12,9 @@ cat udsclient-template.spec |
   sed -e s/"version 0.0.0"/"version ${VERSION}"/g |
   sed -e s/"release 1"/"release ${RELEASE}"/g > udsclient-$VERSION.spec
   
+cat appimage-udsclient.recipe |
+  sed -e s/"version: 0.0.0"/"version: ${VERSION}"/g > appimage.recipe
+
 # Now fix dependencies for opensuse
 # Note: Right now, opensuse & rh seems to have same dependencies, only 1 package needed
 # cat udsclient-template.spec | 
@@ -32,6 +35,19 @@ done
 
 #rm udsclient-$VERSION
 
+# Make .tar.gz with source
 make DESTDIR=targz DISTRO=targz VERSION=${VERSION} install
 
+# And make FULL CLIENT .tar.gz for x86 and raspberry
+make DESTDIR=appimage DISTRO=x86_64 VERSION=${VERSION} build-appimage
+make DESTDIR=appimage DISTRO=armhf VERSION=${VERSION} build-appimage
+make DESTDIR=appimage DISTRO=i686 VERSION=${VERSION} build-appimage
+
+# Now create igel version
+# we need first to create the Appimage for x86_64
+make DESTDIR=igelimage DISTRO=x86_64 VERSION=${VERSION} build-igel
+
+# Create the thinpro version
+make DESTDIR=thinproimage DISTRO=x86_64 VERSION=${VERSION} build-thinpro
+
 rpm --addsign ../*rpm

client-py3/full/linux/debian/changelog

@@ -1,3 +1,21 @@
+udsclient3 (4.0.0) stable; urgency=medium
+
+  * Upgraded to 4.0.0 release
+
+ -- Adolfo Gómez García <agomez@virtualcable.es>  Fri, 1 Jul 2022 15:12:10 +0200
+
+udsclient3 (4.0.0) stable; urgency=medium
+
+  * Upgraded to 3.6.0 release
+
+ -- Adolfo Gómez García <agomez@virtualcable.es>  Fri, 1 Jul 2022 14:12:10 +0200
+
+udsclient3 (3.5.0) stable; urgency=medium
+
+  * Upgraded to 3.5.0 release
+
+ -- Adolfo Gómez García <agomez@virtualcable.es>  Fri, 23 Oct 2020 08:12:10 +0200
+
 udsclient3 (3.0.0) stable; urgency=medium
 
   * Upgraded to 3.0.0 release

client-py3/full/linux/debian/compat

@@ -1 +1 @@
-9
+10

client-py3/full/linux/debian/control

@@ -10,6 +10,6 @@ Package: udsclient3
 Section: admin
 Priority: optional
 Architecture: all
-Depends: python3-paramiko (>=2.0.0), python3-crypto, python3-pyqt5 (>=5.0), python3-six(>=1.1), python3 (>=3.6), freerdp2-x11 | freerdp-x11, desktop-file-utils, ${misc:Depends}
+Depends: python3-paramiko (>=2.0.0), python3-certifi, python3-cryptography, python3-psutil, python3-pyqt5 (>=5.0), python3 (>=3.6), freerdp2-x11 | freerdp-x11 | freerdp-nightly, desktop-file-utils, ${misc:Depends}
 Description: Client connector for Universal Desktop Services (UDS) Broker
  This package provides the required components to allow this machine to connect to services provided by UDS Broker.

client-py3/full/linux/debian/copyright

@@ -1,26 +1,38 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
 Name: udsclient3
 Maintainer: Adolfo Gómez García
-Source: http://www.udsenterprise.com/
+Source: http://github.com/dkmstr/openuds/client-py3
 
-Copyright: 2014 Virtual Cable S.L.U.
-License: BSD-3-clause
+Files: *
+Copyright: (c) 2014-2022, Virtual Cable S.L.U.
+License: 3-BSD
 
-License: GPL-2+
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version. 
-.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-.
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-.
-On Debian systems, the full text of the GNU General Public
-License version 2 can be found in the file
-`/usr/share/common-licenses/GPL-2'.
+License: 3-BSD
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ * Neither the name of pg_query nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ 

client-py3/full/linux/debian/files

@@ -1,2 +1,2 @@
-udsclient3_3.0.0_all.deb admin optional
-udsclient3_3.0.0_amd64.buildinfo admin optional
+udsclient3_4.0.0_all.deb admin optional
+udsclient3_4.0.0_amd64.buildinfo admin optional

client-py3/full/linux/desktop/UDSClient.desktop

@@ -2,7 +2,7 @@
 Name=UDSClient
 Comment=UDS Helper
 Keywords=uds;client;vdi;
-Exec=/usr/lib/UDSClient/UDSClient.py %u
+Exec=/usr/lib/UDSClient/UDSClient.py %u -platform xcb
 Icon=help-browser
 StartupNotify=true
 Terminal=false

client-py3/full/linux/igel/UDSClient-Profile-template.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<profile>
+    <profile_id>1126</profile_id>
+    <profilename>UDSClient</profilename>
+    <firmware>
+        <model>IGEL OS 11</model>
+        <version>11.05.120.01</version>
+    </firmware>
+    <description></description>
+    <overwritesessions>false</overwritesessions>
+    <is_master_profile>false</is_master_profile>
+    <is_igel_os>true</is_igel_os>
+    <settings>
+        <pclass name="custom_partition.enabled">
+            <pvalue instancenr="-1" variableExpression="" variableSubstitutionActive="false">true</pvalue>
+            <variableSubstitutionActive>false</variableSubstitutionActive>
+        </pclass>
+        <pclass name="system.security.apparmor">
+            <pvalue instancenr="-1" variableExpression="" variableSubstitutionActive="false">false</pvalue>
+            <variableSubstitutionActive>false</variableSubstitutionActive>
+        </pclass>
+        <pclass name="custom_partition.mountpoint">
+            <pvalue instancenr="-1" variableExpression="" variableSubstitutionActive="false">/UDSClient</pvalue>
+            <variableSubstitutionActive>false</variableSubstitutionActive>
+        </pclass>
+        <pclass name="custom_partition.size">
+            <pvalue instancenr="-1" variableExpression="" variableSubstitutionActive="false">_SIZE_</pvalue>
+            <variableSubstitutionActive>false</variableSubstitutionActive>
+        </pclass>
+    </settings>
+    <instancesettings>
+        <instance classprefix="custom_partition.source%" serialnumber="-719cadfe:17ca470644a:-7fff127.0.1.1">
+            <ivalue classname="custom_partition.source%.autoupdate" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="custom_partition.source%.crypt_password" variableExpression="" variableSubstitutionActive="false">000d4317311f2c0031133c4d3e4c3d</ivalue>
+            <ivalue classname="custom_partition.source%.final_action" variableExpression="" variableSubstitutionActive="false"></ivalue>
+            <ivalue classname="custom_partition.source%.init_action" variableExpression="" variableSubstitutionActive="false">/UDSClient/init.sh</ivalue>
+            <ivalue classname="custom_partition.source%.password" variableExpression="" variableSubstitutionActive="false"></ivalue>
+            <ivalue classname="custom_partition.source%.url" variableExpression="" variableSubstitutionActive="false">https://[UMS_SERVER]:8443/ums_filetransfer/UDSClient-igel.inf</ivalue>
+            <ivalue classname="custom_partition.source%.username" variableExpression="" variableSubstitutionActive="false">[UMS_USERNAME]</ivalue>
+        </instance>
+        <instance classprefix="sessions.chromium%" serialnumber="-6b5264e9:17ca6f65505:-8000127.0.1.1">
+            <ivalue classname="sessions.chromium%.app.browser_startup_page" variableExpression="" variableSubstitutionActive="false">1</ivalue>
+            <ivalue classname="sessions.chromium%.app.homepage" variableExpression="" variableSubstitutionActive="false">https://demo.udsenterprise.com</ivalue>
+            <ivalue classname="sessions.chromium%.applaunch" variableExpression="" variableSubstitutionActive="false">true</ivalue>
+            <ivalue classname="sessions.chromium%.applaunch_path" variableExpression="" variableSubstitutionActive="false"></ivalue>
+            <ivalue classname="sessions.chromium%.applaunch_system" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.autostart" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.autostartnotify" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.desktop" variableExpression="" variableSubstitutionActive="false">true</ivalue>
+            <ivalue classname="sessions.chromium%.desktop_path" variableExpression="" variableSubstitutionActive="false"></ivalue>
+            <ivalue classname="sessions.chromium%.hotkey" variableExpression="" variableSubstitutionActive="false"></ivalue>
+            <ivalue classname="sessions.chromium%.hotkeymodifier" variableExpression="" variableSubstitutionActive="false">None</ivalue>
+            <ivalue classname="sessions.chromium%.icon" variableExpression="" variableSubstitutionActive="false">chromium</ivalue>
+            <ivalue classname="sessions.chromium%.menu_path" variableExpression="" variableSubstitutionActive="false"></ivalue>
+            <ivalue classname="sessions.chromium%.name" variableExpression="UDS" variableSubstitutionActive="true">###LOC_DEFAULT###</ivalue>
+            <ivalue classname="sessions.chromium%.position" variableExpression="" variableSubstitutionActive="false">0</ivalue>
+            <ivalue classname="sessions.chromium%.pulldown" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.pwprotected" variableExpression="" variableSubstitutionActive="false">none</ivalue>
+            <ivalue classname="sessions.chromium%.quick_start" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.scardautostart" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.snotify" variableExpression="" variableSubstitutionActive="false">true</ivalue>
+            <ivalue classname="sessions.chromium%.startmenu" variableExpression="" variableSubstitutionActive="false">true</ivalue>
+            <ivalue classname="sessions.chromium%.startmenu_system" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.usehotkey" variableExpression="" variableSubstitutionActive="false">false</ivalue>
+            <ivalue classname="sessions.chromium%.waittime2autostart" variableExpression="" variableSubstitutionActive="false">0</ivalue>
+            <ivalue classname="sessions.chromium%.waittime2restart" variableExpression="" variableSubstitutionActive="false">0</ivalue>
+        </instance>
+    </instancesettings>
+</profile>

client-py3/full/linux/igel/UDSClient-template.inf

@@ -0,0 +1,7 @@
+[INFO]
+[PART]
+file="UDSClient.tar.bz2"
+version="1.1_igel1"
+size="_SIZE_"
+name="UDSClient"
+minfw="11.05.120"

client-py3/full/linux/igel/UDSClient.desktop

@@ -2,7 +2,7 @@
 Name=UDSClient
 Comment=UDS Helper
 Keywords=uds;client;vdi;
-Exec=/bin/udsclient %u
+Exec=/UDSClient/UDSClient %u
 Icon=help-browser
 StartupNotify=true
 Terminal=false

client-py3/full/linux/igel/init.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+cp /UDSClient/UDSClient.desktop /usr/share/applications.mime

client-py3/full/linux/installer-appimage-template.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Check for root
+if ! [ $(id -u) = 0 ]; then
+   echo "This script must be run as root" 
+   exit 1
+fi
+
+echo "Installing UDSClient Portable..."
+
+cp UDSClient-0.0.0-x86_64.AppImage /usr/bin
+cp UDSClient.desktop /usr/share/applications
+update-desktop-database
+
+echo "Installation process done."

client-py3/full/linux/installer.sh

@@ -8,6 +8,8 @@ echo "Installation process done."
 echo "Remember that the following packages must be installed on system:"
 echo "* Python3 paramiko"
 echo "* Python3 PyQt5"
+echo "* Python3 six"
 echo "* Python3 requests"
+echo "* Python3 cryptography"
 echo "Theese packages (as their names), are dependent on your platform, so you must locate and install them"
 echo "Also, ensure that a /media folder exists on your machine, that will be redirected on RDP connections"

client-py3/full/linux/thinpro/firefox/45-uds

@@ -0,0 +1,4 @@
+# UDS handlers.json
+cp "/lib/UDSClient/firefox/handlers.json" "$FIREFOX_PROFILE_HANDLERS"
+ffset "network.protocol-handler.external.uds" "true"
+ffset "network.protocol-handler.external.udss" "true"

client-py3/full/linux/thinpro/firefox/handlers.json

@@ -0,0 +1,98 @@
+{
+    "defaultHandlersVersion": {
+        "en-US": 4
+    },
+    "mimeTypes": {
+        "application/pdf": {
+            "action": 3,
+            "extensions": [
+                "pdf"
+            ]
+        },
+        "application/x-ica": {
+            "action": 2,
+            "extensions": [
+                "ica"
+            ],
+            "handlers": [
+                {
+                    "name": "wfica",
+                    "path": "/usr/share/hptc-firefox-mgr/handlers/citrix"
+                }
+            ]
+        },
+        "application/x-rdp": {
+            "action": 2,
+            "extensions": [
+                "rdp"
+            ],
+            "handlers": [
+                {
+                    "name": "HP xfreerdp",
+                    "path": "/usr/share/hptc-firefox-mgr/handlers/rdp"
+                }
+            ]
+        },
+        "text/lic": {
+            "action": 2,
+            "extensions": [
+                "lic"
+            ],
+            "handlers": [
+                {
+                    "name": "Copy license to ThinPro",
+                    "path": "/usr/share/hptc-firefox-mgr/handlers/copy_lic"
+                }
+            ]
+        },
+        "text/xml": {
+            "action": 3,
+            "extensions": [
+                "xml"
+            ]
+        },
+        "image/svg+xml": {
+            "action": 3,
+            "extensions": [
+                "svg"
+            ]
+        },
+        "image/webp": {
+            "action": 3,
+            "extensions": [
+                "webp"
+            ]
+        }
+    },
+    "schemes": {
+        "vmware-view": {
+            "action": 2,
+            "handlers": [
+                {
+                    "name": "VMWare Horizon View",
+                    "path": "/usr/share/hptc-firefox-mgr/handlers/vmware"
+                }
+            ]
+        },
+        "uds": {
+            "action": 2,
+            "handlers": [
+                {
+                    "name": "UDS Client for ThinPro (SSL)",
+                    "path": "/usr/share/hptc-firefox-mgr/handlers/uds"
+                }
+            ]
+        },
+        "udss": {
+            "action": 2,
+            "handlers": [
+                {
+                    "name": "UDS Client for ThinPro",
+                    "path": "/usr/share/hptc-firefox-mgr/handlers/uds"
+                }
+            ]
+        }
+
+
+    }
+}

client-py3/full/linux/thinpro/firefox/uds

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export LD_PRELOAD=""
+/bin/udsclient $*
+exit 0

client-py3/full/linux/thinpro/firefox7.1/45-uds

@@ -0,0 +1,2 @@
+# UDS handlers.json
+restore "/lib/UDSClient/firefox/handlers.json" "$FIREFOX_PROFILE_HANDLERS"

client-py3/full/linux/thinpro/firefox7.1/handlers.json

@@ -0,0 +1,50 @@
+{
+  "defaultHandlersVersion":{
+    "en-US":4
+  },
+  "mimeTypes":{
+    "application/pdf":{
+      "action":3,
+      "extensions":["pdf"]
+    },
+    "application/x-ica":{
+      "action":2,
+      "handlers":[{
+        "name":"wfica",
+        "path":"/usr/bin/hptc-firefox-run-wfica.sh"
+      }],
+      "extensions":["ica"]
+    },
+    "application/x-rdp":{
+      "action":2,
+      "handlers":[{
+        "name":"HP xfreerdp",
+        "path":"/usr/bin/hptc-run-rdp-file-freerdp.sh"
+      }],
+      "extensions":["rdp"]
+    }
+  },
+  "schemes":{
+    "vmware-view":{
+      "action":2,
+      "handlers":[{
+        "name":"VMWare Horizon View",
+        "path":"/usr/bin/vmware-view"
+      }]
+    },
+    "udss":{
+      "action":2,
+      "handlers":[{
+          "name":"UDS Client",
+          "path":"/bin/udsclient"
+      }]
+    },
+    "uds":{
+      "action":2,
+      "handlers":[{
+          "name":"UDS Client",
+          "path":"/bin/udsclient"
+      }]
+    }
+  }
+}

client-py3/full/linux/thinpro/firefox7.1/syspref.js

@@ -0,0 +1,37 @@
+// This file can be used to configure global preferences for Firefox
+// Example: Homepage
+//pref("browser.startup.homepage", "http://www.weebls-stuff.com/wab/");
+pref("plugin.default.state", 2);
+pref("xpinstall.signatures.required", false, locked);
+pref("extensions.autoDisableScopes", 0, locked);
+pref("extensions.pocket.enabled", false, locked);
+pref("extensions.screenshots.disabled", true, locked);
+pref("datareporting.policy.dataSubmissionEnabled", false, locked);
+pref("datareporting.policy.dataSubmissionEnabled.v2", false, locked);
+
+pref("app.update.auto", false, locked);
+pref("app.update.enabled", false, locked);
+pref("browser.download.manager.closeWhenDone", true, locked);
+pref("browser.helperApps.neverAsk.openFile", "application/x-rdp, application/x-java-jnlp-file", locked);
+pref("browser.EULA.3.accepted", true, locked);
+pref("browser.rights.3.shown", true, locked);
+pref("browser.safebrowsing.enabled", false, locked);
+pref("browser.search.update", false, locked);
+pref("browser.sessionstore.enabled", false, locked);
+pref("browser.sessionhistory.cache_subframes", false, locked);
+pref("datareporting.healthreport.service.enabled", false, locked);
+pref("datareporting.healthreport.uploadEnabled", false, locked);
+pref("devtools.toolbox.host", "none", locked);
+pref("extensions.autoDisableScopes", 14, locked);
+pref("extensions.blocklist.enabled", false, locked);
+pref("extensions.update.enabled", false, locked);
+pref("intl.charsetmenu.browser.cache", "UTF-8", locked);
+
+pref("network.protocol-handler.external.mailto", false, locked);
+pref("network.protocol-handler.external.news", false, locked);
+pref("network.protocol-handler.external.snews", false, locked);
+pref("network.protocol-handler.external.nntp", false, locked);
+pref("network.protocol-handler.external-default", false, locked);
+pref("network.protocol-handler.external.vmware-view", true, locked);
+pref("network.protocol-handler.external.uds", true, locked);
+pref("network.protocol-handler.external.udss", true, locked);

client-py3/full/linux/thinpro/install-uds-client.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Common part
+
+# unlocks so we can write on TC
+fsunlock
+
+cp UDSClient /bin/udsclient
+chmod 755 /bin/udsclient
+# RDP Script for UDSClient. Launchs udsclient using the "Template_UDS" profile
+cp udsrdp /usr/bin
+
+INSTALLED=0
+# Installation for 7.1.x version
+grep -q "7.1" /etc/issue
+if [ $? -eq 0 ]; then
+    echo "Installing for thinpro version 7.1"
+    # Allow UDS apps without asking
+    cp firefox7.1/syspref.js /etc/firefox
+    # Copy handlers.json for firefox
+    mkdir -p /lib/UDSClient/firefox/ > /dev/null 2>&1
+    cp firefox7.1/handlers.json /lib/UDSClient/firefox/
+    # and runner
+    cp firefox7.1/45-uds /etc/hptc-firefox-mgr/prestart
+else
+    echo "Installing for thinpro version 7.2 or later"
+    # Copy handlers for firefox
+    mkdir -p /lib/UDSClient/firefox/ > /dev/null 2>&1
+    # Copy handlers.json for firefox
+    cp firefox/handlers.json /lib/UDSClient/firefox/
+    cp firefox/45-uds /etc/hptc-firefox-mgr/prestart
+    # copy uds handler for firefox
+    cp firefox/uds /usr/share/hptc-firefox-mgr/handlers/uds
+    chmod 755 /usr/share/hptc-firefox-mgr/handlers/uds
+fi
+
+# Common part
+fslock

client-py3/full/linux/thinpro/udsrdp

@@ -0,0 +1,390 @@
+#!/bin/bash
+
+function clearParams {
+  mclient set $REGKEY/address ""
+  mclient set $REGKEY/username ""
+  mclient set $REGKEY/password ""
+  mclient set $REGKEY/domain ""
+
+  mclient set $REGKEY/authorizations/user/execution 0
+
+  mclient commit
+}
+
+function getRegKey {
+  # Get Template_UDS
+  for key in `mclient get root/ConnectionType/freerdp/connections | sed "s/dir //g"`; do
+    val=`mclient get $key/label | sed "s/value //g"`
+    if [ "$val" == "Template_UDS" ]; then
+      REGKEY=$key
+    fi
+  done
+}
+
+function createUDSConnectionTemplate {
+  TMPFILE=$(mktemp /tmp/udsexport.XXXXXX)
+  cat > $TMPFILE << EOF
+<Profile>
+ <ProfileSettings>
+  <Name>UDS Template Profile</Name>
+  <RegistryRoot>root/ConnectionType/freerdp/connections/{ff064bd9-047a-45ec-b70f-04ab218186ff}</RegistryRoot>
+  <Target>
+   <Hardware>t420</Hardware>
+   <ImageId>T7X62022</ImageId>
+   <Version>6.2.0</Version>
+   <Config>standard</Config>
+  </Target>
+ </ProfileSettings>
+ <ProfileRegistry>
+  <NodeDir name="{ff064bd9-047a-45ec-b70f-04ab218186ff}">
+   <NodeDir name="rdWebFeed">
+    <NodeKey name="keepResourcesWindowOpened">
+     <NodeParam name="value">0</NodeParam>
+     <NodeParam name="type">bool</NodeParam>
+    </NodeKey>
+    <NodeKey name="autoStartSingleResource">
+     <NodeParam name="value">0</NodeParam>
+     <NodeParam name="type">bool</NodeParam>
+    </NodeKey>
+    <NodeKey name="autoDisconnectTimeout">
+     <NodeParam name="value">0</NodeParam>
+     <NodeParam name="type">number</NodeParam>
+    </NodeKey>
+   </NodeDir>
+   <NodeDir name="loginfields">
+    <NodeKey name="username">
+     <NodeParam name="value">3</NodeParam>
+     <NodeParam name="type">number</NodeParam>
+    </NodeKey>
+    <NodeKey name="rememberme">
+     <NodeParam name="value">2</NodeParam>
+     <NodeParam name="type">number</NodeParam>
+    </NodeKey>
+    <NodeKey name="password">
+     <NodeParam name="value">3</NodeParam>
+     <NodeParam name="type">number</NodeParam>
+    </NodeKey>
+    <NodeKey name="domain">
+     <NodeParam name="value">3</NodeParam>
+     <NodeParam name="type">number</NodeParam>
+    </NodeKey>
+   </NodeDir>
+   <NodeDir name="authorizations">
+    <NodeDir name="user">
+     <NodeKey name="execution">
+      <NodeParam name="value">0</NodeParam>
+      <NodeParam name="type">string</NodeParam>
+     </NodeKey>
+     <NodeKey name="edit">
+      <NodeParam name="value">0</NodeParam>
+      <NodeParam name="type">string</NodeParam>
+     </NodeKey>
+    </NodeDir>
+   </NodeDir>
+   <NodeKey name="address">
+    <NodeParam name="value"/>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="username">
+    <NodeParam name="value"/>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="password">
+    <NodeParam name="value">NLCR.1</NodeParam>
+    <NodeParam name="type">rc4</NodeParam>
+   </NodeKey>
+   <NodeKey name="domain">
+    <NodeParam name="value"/>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="label">
+    <NodeParam name="value">Template_UDS</NodeParam>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="credentialsType">
+    <NodeParam name="value">password</NodeParam>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="gatewayEnabled">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="gatewayPort">
+    <NodeParam name="value">443</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="gatewayUsesSameCredentials">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="gatewayCredentialsType">
+    <NodeParam name="value">password</NodeParam>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="remoteDesktopService">
+    <NodeParam name="value">Remote Computer</NodeParam>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="windowMode">
+    <NodeParam name="value">Remote Application</NodeParam>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="seamlessWindow">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="windowType">
+    <NodeParam name="value">full</NodeParam>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="windowSizePercentage">
+    <NodeParam name="value">70</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="windowSizeWidth">
+    <NodeParam name="value">1024</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="windowSizeHeight">
+    <NodeParam name="value">768</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="mouseMotionEvents">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="compression">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="rdpEncryption">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="offScreenBitmaps">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="attachToConsole">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="clipboardExtension">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="rdp6Buffering">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="rdpProgressiveCodec">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="securityLevel">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="tlsVersion">
+    <NodeParam name="value">auto</NodeParam>
+    <NodeParam name="type">string</NodeParam>
+   </NodeKey>
+   <NodeKey name="sound">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="printerMapping">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="portMapping">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="usbStorageRedirection">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="localPartitionRedirection">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="scRedirection">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="usbMiscRedirection">
+    <NodeParam name="value">2</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="perfFlagNoWallpaper">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="perfFlagFontSmoothing">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="perfFlagDesktopComposition">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="perfFlagNoWindowDrag">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="perfFlagNoMenuAnimations">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="perfFlagNoTheming">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="timeoutsEnabled">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="timeoutWarning">
+    <NodeParam name="value">6000</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="timeoutWarningDialog">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="timeoutRecovery">
+    <NodeParam name="value">30000</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="timeoutError">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="showRDPDashboard">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="showConnectionGraph">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="x11Synchronous">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="x11Logging">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="x11LogAutoflush">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="x11Capture">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="SingleSignOn">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="autostart">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">number</NodeParam>
+   </NodeKey>
+   <NodeKey name="waitForNetwork">
+    <NodeParam name="value">1</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="hasDesktopIcon">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+   <NodeKey name="autoReconnect">
+    <NodeParam name="value">0</NodeParam>
+    <NodeParam name="type">bool</NodeParam>
+   </NodeKey>
+  </NodeDir>
+ </ProfileRegistry>
+ <ProfileFiles/>
+</Profile>
+EOF
+  mclient import $TMPFILE
+  rm $TMPFILE
+}
+
+ADDRESS=
+USERNAME=
+PASSWORD=
+DOMAIN=
+REGKEY=
+CLEAR=0
+
+# Try to locate registry key for UDS Template
+getRegKey
+
+if [ "$REGKEY" == "" ]; then
+  # Not found, create on based on our template
+  createUDSConnectionTemplate
+  getRegKey
+fi
+
+for param in $@; do
+  if [ "/u:" == "${param:0:3}" ]; then
+    USERNAME=${param:3}
+    CLEAR=1
+  fi
+
+  if [ "/p:" == "${param:0:3}" ]; then
+    PASSWORD=${param:3}
+    CLEAR=1
+  fi
+  
+  if [ "/d:" == "${param:0:3}" ]; then
+    DOMAIN=${param:3}
+    CLEAR=1
+  fi
+  
+  if [ "/v:" == "${param:0:3}" ]; then
+    ADDRESS=${param:3}
+    CLEAR=1
+  fi
+done
+
+if [ "$CLEAR" -eq 1 ]; then
+  clearParams
+fi
+
+ID=`basename $REGKEY`
+RESPAWN=0
+
+if [ "" != "$ADDRESS" ]; then
+  mclient set $REGKEY/address "${ADDRESS}"
+  RESPAWN=1
+fi
+
+if [ "" != "$USERNAME" ]; then
+  mclient set $REGKEY/username "${USERNAME}"
+  RESPAWN=1
+fi
+
+if [ "" != "$PASSWORD" ]; then  
+  mclient set $REGKEY/password "${PASSWORD}"
+  RESPAWN=1
+fi
+
+if [ "" != "$DOMAIN" ]; then
+  mclient set $REGKEY/domain "${DOMAIN}"
+  RESPAWN=1
+fi
+
+if [ "$RESPAWN" -eq 1 ]; then
+  mclient set $REGKEY/authorizations/user/execution 1 
+  mclient commit
+  exec $0 # Restart without command line
+fi
+
+process-connection $ID
+
+clearParams

client-py3/full/linux/udsclient-appimage-x86_64.recipe

@@ -0,0 +1,62 @@
+version: 1
+script:
+  # Remove any previous build
+  - rm -rf /tmp/UDSClientDir  | true
+  # Make usr and icons dirs
+  - mkdir -p /tmp/UDSClientDir/usr/src
+  # Copy the python application code into the UDSClientDir
+  - cp ../src/UDS*.py /tmp/UDSClientDir/usr/src
+  - cp -r ../src/uds /tmp/UDSClientDir/usr/src
+  # Remove __pycache__ and .mypy if exists
+  - rm /tmp/UDSClientDir/usr/src/.mypy_cache -rf 2>&1 > /dev/null
+  - rm /tmp/UDSClientDir/usr/src/uds/.mypy_cache -rf 2>&1 > /dev/null
+  - rm /tmp/UDSClientDir/usr/src/__pycache__ -rf 2>&1 > /dev/null
+  - rm /tmp/UDSClientDir/usr/src/uds/__pycache__ -rf 2>&1 > /dev/null
+
+AppDir:
+  # On /tmp, that is an ext4 filesystem. On btrfs squashfs complains with "Unrecognised xattr prefix btrfs.compression"
+  path: /tmp/UDSClientDir
+
+  app_info:
+    id: com.udsenterprise.UDSClient3
+    name: UDSClient
+    icon: utilities-terminal
+    version: 0.0.0
+    # Set the python executable as entry point
+    exec: usr/bin/python3
+    # Set the application main script path as argument. Use '$@' to forward CLI parameters
+    exec_args: "$APPDIR/usr/src/UDSClient.py $@"
+
+  apt:
+    arch: amd64
+    sources:
+      - sourceline: 'deb [arch=amd64] http://ftp.de.debian.org/debian/ bullseye main contrib non-free'
+        key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x648ACFD622F3D138'
+
+    include:
+      - python3
+      - python3-pkg-resources
+      - python3-pyqt5
+      - python3-paramiko
+      - python3-cryptography
+      - python3-certifi
+      - python3-psutil
+      - freerdp2-x11
+      - freerdp2-wayland
+      - x2goclient
+      - openssh-sftp-server
+    exclude: []
+
+  runtime:
+    env:
+      # Set python home
+      # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONHOME
+      PYTHONHOME: '${APPDIR}/usr'
+      # Path to the site-packages dir or other modules dirs
+      # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH
+      PYTHONPATH: '${APPDIR}/usr/lib/python3.9/site-packages'
+
+AppImage:
+  update-information: None
+  sign-key: None
+  arch: x86_64

client-py3/full/linux/udsclient-template.spec

@@ -11,7 +11,7 @@ Release: %{release}
 Summary: Client for Universal Desktop Services (UDS) Broker
 License: BSD3
 Group: Applications/Productivity
-Requires: python3-six python3-requests python3-paramiko python3-qt5 (python3-crypto or python3-pycrypto)
+Requires: python3-paramiko python3-qt5 python3-cryptography python3-certifi python3-psutil
 Vendor: Virtual Cable S.L.U.
 URL: http://www.udsenterprise.com
 Provides: udsclient

client-py3/full/src/.gitignore

@@ -1,4 +1,6 @@
 /build
 /dist
-UDSClient.dmg
-UDSClient.pkg
+/UDSClient*.pkg
+/UDSClient*.dist
+/UDSClient*.build
+/.eggs

client-py3/full/src/UDSClient.py

@@ -1,7 +1,7 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S python3 -s
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014-2017 Virtual Cable S.L.
+# Copyright (c) 2014-2021 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -12,7 +12,7 @@
 #    * Redistributions in binary form must reproduce the above copyright notice,
 #      this list of conditions and the following disclaimer in the documentation
 #      and/or other materials provided with the distribution.
-#    * Neither the name of Virtual Cable S.L. nor the names of its contributors
+#    * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
 #      may be used to endorse or promote products derived from this software
 #      without specific prior written permission.
 #
@@ -31,41 +31,45 @@
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
 import sys
+import os
+import platform
+import time
 import webbrowser
-import json
-import base64, bz2
+import threading
+import typing
 
-from PyQt5 import QtCore, QtGui, QtWidgets  # @UnresolvedImport
-import six
+from PyQt5 import QtCore, QtWidgets, QtGui
+from PyQt5.QtCore import QSettings
+
+from uds.rest import RestApi, RetryException, InvalidVersion, UDSException
+
+# Just to ensure there are available on runtime
+from uds.forward import forward as ssh_forward # type: ignore
+from uds.tunnel import forward as tunnel_forwards  # type: ignore
 
-from uds.rest import RestRequest
-from uds.forward import forward  # pylint: disable=unused-import
 from uds.log import logger
 from uds import tools
 from uds import VERSION
 
 from UDSWindow import Ui_MainWindow
 
-# Server before this version uses "unsigned" scripts
-OLD_METHOD_VERSION = '2.4.0'
-
-class RetryException(Exception):
-    pass
 
 class UDSClient(QtWidgets.QMainWindow):
 
-    ticket = None
-    scrambler = None
+    ticket: str = ''
+    scrambler: str = ''
     withError = False
-    animTimer = None
-    anim = 0
-    animInverted = False
-    serverVersion = 'X.Y.Z'  # Will be overwriten on getVersion
-    req = None
+    animTimer: typing.Optional[QtCore.QTimer] = None
+    anim: int = 0
+    animInverted: bool = False
+    api: RestApi
 
-    def __init__(self):
+    def __init__(self, api: RestApi, ticket: str, scrambler: str):
         QtWidgets.QMainWindow.__init__(self)
-        self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.WindowStaysOnTopHint)
+        self.api = api
+        self.ticket = ticket
+        self.scrambler = scrambler
+        self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.WindowStaysOnTopHint)  # type: ignore
 
         self.ui = Ui_MainWindow()
         self.ui.setupUi(self)
@@ -75,41 +79,36 @@ class UDSClient(QtWidgets.QMainWindow):
 
         self.ui.info.setText('Initializing...')
 
-        screen = QtWidgets.QDesktopWidget().screenGeometry()
+        screen_geometry = QtGui.QGuiApplication.primaryScreen().geometry()
         mysize = self.geometry()
-        hpos = (screen.width() - mysize.width()) // 2
-        vpos = (screen.height() - mysize.height() - mysize.height()) // 2
+        hpos = (screen_geometry.width() - mysize.width()) // 2
+        vpos = (screen_geometry.height() - mysize.height() - mysize.height()) // 2
         self.move(hpos, vpos)
 
         self.animTimer = QtCore.QTimer()
-        self.animTimer.timeout.connect(self.updateAnim)
+        self.animTimer.timeout.connect(self.updateAnim)  # type: ignore
         # QtCore.QObject.connect(self.animTimer, QtCore.SIGNAL('timeout()'), self.updateAnim)
 
         self.activateWindow()
 
         self.startAnim()
 
-
     def closeWindow(self):
         self.close()
 
-    def processError(self, data):
-        if 'error' in data:
-            # QtWidgets.QMessageBox.critical(self, 'Request error {}'.format(data.get('retryable', '0')), data['error'], QtWidgets.QMessageBox.Ok)
-            if data.get('retryable', '0') == '1':
-                raise RetryException(data['error'])
-
-            raise Exception(data['error'])
-            # QtWidgets.QMessageBox.critical(self, 'Request error', rest.data['error'], QtWidgets.QMessageBox.Ok)
-            # self.closeWindow()
-            # return
-
     def showError(self, error):
         logger.error('got error: %s', error)
         self.stopAnim()
-        self.ui.info.setText('UDS Plugin Error')  # In fact, main window is hidden, so this is not visible... :)
+        self.ui.info.setText(
+            'UDS Plugin Error'
+        )  # In fact, main window is hidden, so this is not visible... :)
         self.closeWindow()
-        QtWidgets.QMessageBox.critical(None, 'UDS Plugin Error', '{}'.format(error), QtWidgets.QMessageBox.Ok)
+        QtWidgets.QMessageBox.critical(
+            None,  # type: ignore
+            'UDS Plugin Error',
+            '{}'.format(error),
+            QtWidgets.QMessageBox.Ok,
+        )
         self.withError = True
 
     def cancelPushed(self):
@@ -125,165 +124,227 @@ class UDSClient(QtWidgets.QMainWindow):
         self.ui.progressBar.setValue(self.anim)
 
     def startAnim(self):
-        self.ui.progressBar.invertedAppearance = False
+        self.ui.progressBar.invertedAppearance = False  # type: ignore
         self.anim = 0
         self.animInverted = False
         self.ui.progressBar.setInvertedAppearance(self.animInverted)
-        self.animTimer.start(40)
+        if self.animTimer:
+            self.animTimer.start(40)
 
     def stopAnim(self):
-        self.ui.progressBar.invertedAppearance = False
-        self.animTimer.stop()
+        self.ui.progressBar.invertedAppearance = False  # type: ignore
+        if self.animTimer:
+            self.animTimer.stop()
 
     def getVersion(self):
-        self.req = RestRequest('', self, self.version)
-        self.req.get()
-
-    def version(self, data):
         try:
-            self.processError(data)
-            self.ui.info.setText('Processing...')
-
-            if data['result']['requiredVersion'] > VERSION:
-                QtWidgets.QMessageBox.critical(self, 'Upgrade required', 'A newer connector version is required.\nA browser will be opened to download it.', QtWidgets.QMessageBox.Ok)
-                webbrowser.open(data['result']['downloadUrl'])
-                self.closeWindow()
-                return
-
-            self.serverVersion = data['result']['requiredVersion']
-            self.getTransportData()
-
-        except RetryException as e:
-            self.ui.info.setText(str(e))
-            QtCore.QTimer.singleShot(1000, self.getVersion)
-
+            self.api.getVersion()
+        except InvalidVersion as e:
+            QtWidgets.QMessageBox.critical(
+                self,
+                'Upgrade required',
+                'A newer connector version is required.\nA browser will be opened to download it.',
+                QtWidgets.QMessageBox.Ok,
+            )
+            webbrowser.open(e.downloadUrl)
+            self.closeWindow()
+            return
         except Exception as e:
             self.showError(e)
 
+        self.getTransportData()
+
     def getTransportData(self):
         try:
-            self.req = RestRequest('/{}/{}'.format(self.ticket, self.scrambler), self, self.transportDataReceived, params={'hostname': tools.getHostName(), 'version': VERSION})
-            self.req.get()
-        except Exception as e:
-            logger.exception('Got exception on getTransportData')
-            raise e
-
-    def transportDataReceived(self, data):
-        logger.debug('Transport data received')
-        try:
-            self.processError(data)
-
-            params = None
-
-            if self.serverVersion <= OLD_METHOD_VERSION:
-                script = bz2.decompress(base64.b64decode(data['result']))
-                # This fixes uds 2.2 "write" string on binary streams on some transport 
-                script = script.replace(b'stdin.write("', b'stdin.write(b"')
-                script = script.replace(b'version)', b'version.decode("utf-8"))')
-            else:
-                res = data['result']
-                # We have three elements on result:
-                # * Script
-                # * Signature
-                # * Script data
-                # We test that the Script has correct signature, and them execute it with the parameters
-                #script, signature, params = res['script'].decode('base64').decode('bz2'), res['signature'], json.loads(res['params'].decode('base64').decode('bz2'))
-                script, signature, params = bz2.decompress(base64.b64decode(res['script'])), res['signature'], json.loads(bz2.decompress(base64.b64decode(res['params'])))
-                if tools.verifySignature(script, signature) is False:
-                    logger.error('Signature is invalid')
-
-                    raise Exception('Invalid UDS code signature. Please, report to administrator')
-
+            script, params = self.api.getScriptAndParams(self.ticket, self.scrambler)
             self.stopAnim()
 
             if 'darwin' in sys.platform:
                 self.showMinimized()
 
-            QtCore.QTimer.singleShot(3000, self.endScript)
-            self.hide()
+            # QtCore.QTimer.singleShot(3000, self.endScript)
+            # self.hide()
+            self.closeWindow()
 
-            six.exec_(script.decode("utf-8"), globals(), {'parent': self, 'sp':  params})
+            exec(script, globals(), {'parent': self, 'sp': params})
+
+            # Execute the waiting tasks...
+            threading.Thread(target=endScript).start()
 
         except RetryException as e:
-            self.ui.info.setText(six.text_type(e) + ', retrying access...')
+            self.ui.info.setText(str(e) + ', retrying access...')
             # Retry operation in ten seconds
             QtCore.QTimer.singleShot(10000, self.getTransportData)
-
         except Exception as e:
-            #logger.exception('Got exception executing script:')
             self.showError(e)
 
-    def endScript(self):
-        # After running script, wait for stuff
-        try:
-            tools.waitForTasks()
-        except Exception:
-            pass
-
-        try:
-            tools.unlinkFiles()
-        except Exception:
-            pass
-
-        try:
-            tools.execBeforeExit()
-        except Exception:
-            pass
-
-        self.closeWindow()
-
     def start(self):
-        '''
+        """
         Starts proccess by requesting version info
-        '''
+        """
         self.ui.info.setText('Initializing...')
         QtCore.QTimer.singleShot(100, self.getVersion)
 
 
-def done(data):
-    QtWidgets.QMessageBox.critical(None, 'Notice', six.text_type(data.data), QtWidgets.QMessageBox.Ok)
-    sys.exit(0)
+def endScript():
+    # Wait a bit before start processing ending sequence
+    time.sleep(3)
+    try:
+        # Remove early stage files...
+        tools.unlinkFiles(early=True)
+    except Exception as e:
+        logger.debug('Unlinking files on early stage: %s', e)
+
+    # After running script, wait for stuff
+    try:
+        logger.debug('Wating for tasks to finish...')
+        tools.waitForTasks()
+    except Exception as e:
+        logger.debug('Watiting for tasks to finish: %s', e)
+
+    try:
+        logger.debug('Unlinking files')
+        tools.unlinkFiles(early=False)
+    except Exception as e:
+        logger.debug('Unlinking files on later stage: %s', e)
+
+    # Removing
+    try:
+        logger.debug('Executing threads before exit')
+        tools.execBeforeExit()
+    except Exception as e:
+        logger.debug('execBeforeExit: %s', e)
+
+    logger.debug('endScript done')
+
 
 # Ask user to approve endpoint
-def approveHost(hostName, parentWindow=None):
+def approveHost(hostName: str):
     settings = QtCore.QSettings()
     settings.beginGroup('endpoints')
 
-    #approved = settings.value(hostName, False).toBool()
+    # approved = settings.value(hostName, False).toBool()
     approved = bool(settings.value(hostName, False))
 
     errorString = '<p>The server <b>{}</b> must be approved:</p>'.format(hostName)
-    errorString += '<p>Only approve UDS servers that you trust to avoid security issues.</p>'
+    errorString += (
+        '<p>Only approve UDS servers that you trust to avoid security issues.</p>'
+    )
 
-    if approved or QtWidgets.QMessageBox.warning(parentWindow, 'ACCESS Warning', errorString, QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No) == QtWidgets.QMessageBox.Yes:
-        settings.setValue(hostName, True)
-        approved = True
+    if not approved:
+        if (
+            QtWidgets.QMessageBox.warning(
+                None,  # type: ignore
+                'ACCESS Warning',
+                errorString,
+                QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,  # type: ignore
+            )
+            == QtWidgets.QMessageBox.Yes
+        ):
+            settings.setValue(hostName, True)
+            approved = True
 
     settings.endGroup()
     return approved
 
-if __name__ == "__main__":
-    logger.debug('Initializing connector')
-    
-    # Initialize app
-    app = QtWidgets.QApplication(sys.argv)
 
+def sslError(hostname: str, serial):
+    settings = QSettings()
+    settings.beginGroup('ssl')
+
+    approved = settings.value(serial, False)
+
+    if (
+        approved
+        or QtWidgets.QMessageBox.warning(
+            None,  # type: ignore
+            'SSL Warning',
+            f'Could not check SSL certificate for {hostname}.\nDo you trust this host?',
+            QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,  # type: ignore
+        )
+        == QtWidgets.QMessageBox.Yes
+    ):
+        approved = True
+        settings.setValue(serial, True)
+
+    settings.endGroup()
+    return approved
+
+
+# Used only if command line says so
+def minimal(api: RestApi, ticket: str, scrambler: str):
+    try:
+        logger.info('Minimal Execution')
+        logger.debug('Getting version')
+        try:
+            api.getVersion()
+        except InvalidVersion as e:
+            QtWidgets.QMessageBox.critical(
+                None,  # type: ignore
+                'Upgrade required',
+                'A newer connector version is required.\nA browser will be opened to download it.',
+                QtWidgets.QMessageBox.Ok,
+            )
+            webbrowser.open(e.downloadUrl)
+            return 0
+        logger.debug('Transport data')
+        script, params = api.getScriptAndParams(ticket, scrambler)
+
+        # Execute UDS transport script
+        exec(script, globals(), {'parent': None, 'sp': params})
+        # Execute the waiting task...
+        threading.Thread(target=endScript).start()
+
+    except RetryException as e:
+        QtWidgets.QMessageBox.warning(
+            None,  # type: ignore
+            'Service not ready',
+            '{}'.format('.\n'.join(str(e).split('.')))
+            + '\n\nPlease, retry again in a while.',
+            QtWidgets.QMessageBox.Ok,
+        )
+    except Exception as e:
+        # logger.exception('Got exception on getTransportData')
+        QtWidgets.QMessageBox.critical(
+            None,  # type: ignore
+            'Error',
+            '{}'.format(str(e)) + '\n\nPlease, retry again in a while.',
+            QtWidgets.QMessageBox.Ok,
+        )
+    return 0
+
+
+def main(args: typing.List[str]):
+    app = QtWidgets.QApplication(sys.argv)
+    logger.debug('Initializing connector for %s(%s)', sys.platform, platform.machine())
+
+    logger.debug('Arguments: %s', args)
     # Set several info for settings
     QtCore.QCoreApplication.setOrganizationName('Virtual Cable S.L.U.')
     QtCore.QCoreApplication.setApplicationName('UDS Connector')
 
     if 'darwin' not in sys.platform:
         logger.debug('Mac OS *NOT* Detected')
-        app.setStyle('plastique')
-
-    if six.PY3 is False:
-        logger.debug('Fixing threaded execution of commands')
-        import threading
-        threading._DummyThread._Thread__stop = lambda x: 42  # type: ignore # pylint: disable=protected-access
+        app.setStyle('plastique')  # type: ignore
+    else:
+        logger.debug('Platform is Mac OS, adding homebrew possible paths')
+        os.environ['PATH'] += ''.join(
+            os.pathsep + i
+            for i in (
+                '/usr/local/bin',
+                '/opt/homebrew/bin',
+            )
+        )
+        logger.debug('Now path is %s', os.environ['PATH'])
 
     # First parameter must be url
+    useMinimal = False
     try:
-        uri = sys.argv[1]
+        uri = args[1]
+
+        if uri == '--minimal':
+            useMinimal = True
+            uri = args[2]  # And get URI
 
         if uri == '--test':
             sys.exit(0)
@@ -293,17 +354,28 @@ if __name__ == "__main__":
             raise Exception()
 
         ssl = uri[3] == 's'
-        host, UDSClient.ticket, UDSClient.scrambler = uri.split('//')[1].split('/')  # type: ignore
-        logger.debug('ssl:%s, host:%s, ticket:%s, scrambler:%s', ssl, host, UDSClient.ticket, UDSClient.scrambler)
+        host, ticket, scrambler = uri.split('//')[1].split('/')  # type: ignore
+        logger.debug(
+            'ssl:%s, host:%s, ticket:%s, scrambler:%s',
+            ssl,
+            host,
+            ticket,
+            scrambler,
+        )
     except Exception:
         logger.debug('Detected execution without valid URI, exiting')
-        QtWidgets.QMessageBox.critical(None, 'Notice', 'UDS Client Version {}'.format(VERSION), QtWidgets.QMessageBox.Ok)
+        QtWidgets.QMessageBox.critical(
+            None,  # type: ignore
+            'Notice',
+            'UDS Client Version {}'.format(VERSION),
+            QtWidgets.QMessageBox.Ok,
+        )
         sys.exit(1)
 
     # Setup REST api endpoint
-    RestRequest.restApiUrl = '{}://{}/rest/client'.format(['http', 'https'][ssl], host)
-    logger.debug('Setting request URL to %s', RestRequest.restApiUrl)
-    # RestRequest.restApiUrl = 'https://172.27.0.1/rest/client'
+    api = RestApi(
+        '{}://{}/uds/rest/client'.format(['http', 'https'][ssl], host), sslError
+    )
 
     try:
         logger.debug('Starting execution')
@@ -312,18 +384,23 @@ if __name__ == "__main__":
         if approveHost(host) is False:
             raise Exception('Host {} was not approved'.format(host))
 
-        win = UDSClient()
+        win = UDSClient(api, ticket, scrambler)
         win.show()
 
         win.start()
 
-        exitVal = app.exec_()
+        exitVal = app.exec()
         logger.debug('Execution finished correctly')
 
     except Exception as e:
         logger.exception('Got an exception executing client:')
         exitVal = 128
-        QtWidgets.QMessageBox.critical(None, 'Error', six.text_type(e), QtWidgets.QMessageBox.Ok)
+        QtWidgets.QMessageBox.critical(
+            None, 'Error', str(e), QtWidgets.QMessageBox.Ok  # type: ignore
+        )
 
     logger.debug('Exiting')
     sys.exit(exitVal)
+
+if __name__ == "__main__":
+    main(sys.argv)

client-py3/full/src/UDSClientLauncher.py

@@ -0,0 +1,75 @@
+import sys
+import os.path
+import subprocess
+import typing
+
+from uds.log import logger
+import UDSClient
+from UDSLauncherMac import Ui_MacLauncher
+
+from PyQt5 import QtCore, QtWidgets, QtGui
+
+SCRIPT_NAME = 'UDSClientLauncher'
+
+class UdsApplication(QtWidgets.QApplication):
+    path: str
+    tunnels: typing.List[subprocess.Popen]
+
+    def __init__(self, argv: typing.List[str]) -> None:
+        super().__init__(argv)
+        self.path = os.path.join(os.path.dirname(sys.argv[0]).replace('Resources', 'MacOS'), SCRIPT_NAME)
+        self.tunnels = []
+        self.lastWindowClosed.connect(self.closeTunnels)  # type: ignore
+
+    def cleanTunnels(self) -> None:
+        def isRunning(p: subprocess.Popen):
+            try:
+                if p.poll() is None:
+                    return True
+            except Exception as e:
+                logger.debug('Got error polling subprocess: %s', e)
+            return False
+
+        for k in [i for i, tunnel in enumerate(self.tunnels) if not isRunning(tunnel)]:
+            try:
+                del self.tunnels[k]
+            except Exception as e:
+                logger.debug('Error closing tunnel: %s', e)
+
+    def closeTunnels(self) -> None:
+        logger.debug('Closing remaining tunnels')
+        for tunnel in self.tunnels:
+            logger.debug('Checking %s - "%s"', tunnel, tunnel.poll())
+            if tunnel.poll() is None:  # Running
+                logger.info('Found running tunnel %s, closing it', tunnel.pid)
+                tunnel.kill()
+
+    def event(self, evnt: QtCore.QEvent) -> bool:
+        if evnt.type() == QtCore.QEvent.FileOpen:  # type: ignore
+            fe = typing.cast(QtGui.QFileOpenEvent, evnt)
+            logger.debug('Got url: %s', fe.url().url())
+            fe.accept()
+            logger.debug('Spawning %s', self.path)
+            # First, remove all finished tunnel processed from check queue
+            self.cleanTunnels()
+            # And now add a new one
+            self.tunnels.append(subprocess.Popen([self.path, fe.url().url()]))
+
+        return super().event(evnt)
+
+
+def main(args: typing.List[str]):
+    if len(args) > 1:
+        UDSClient.main(args)
+    else:
+        app = UdsApplication(sys.argv)
+        window = QtWidgets.QMainWindow()
+        Ui_MacLauncher().setupUi(window)
+
+        window.showMinimized()
+
+        sys.exit(app.exec())
+
+if __name__ == "__main__":
+    main(args=sys.argv)
+

client-py3/full/src/UDSLauncherMac.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'UDSLauncherMac.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.2
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_MacLauncher(object):
+    def setupUi(self, MacLauncher):
+        MacLauncher.setObjectName("MacLauncher")
+        MacLauncher.setWindowModality(QtCore.Qt.NonModal)
+        MacLauncher.resize(235, 120)
+        MacLauncher.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/images/logo-uds-small"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        MacLauncher.setWindowIcon(icon)
+        MacLauncher.setWindowOpacity(1.0)
+        self.centralwidget = QtWidgets.QWidget(MacLauncher)
+        self.centralwidget.setAutoFillBackground(True)
+        self.centralwidget.setObjectName("centralwidget")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.centralwidget)
+        self.verticalLayout_2.setContentsMargins(4, 4, 4, 4)
+        self.verticalLayout_2.setSpacing(4)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.frame = QtWidgets.QFrame(self.centralwidget)
+        self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.frame.setObjectName("frame")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.frame)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.topLabel = QtWidgets.QLabel(self.frame)
+        self.topLabel.setTextFormat(QtCore.Qt.RichText)
+        self.topLabel.setObjectName("topLabel")
+        self.verticalLayout.addWidget(self.topLabel)
+        self.image = QtWidgets.QLabel(self.frame)
+        self.image.setMinimumSize(QtCore.QSize(0, 32))
+        self.image.setAutoFillBackground(True)
+        self.image.setText("")
+        self.image.setPixmap(QtGui.QPixmap(":/images/logo-uds-small"))
+        self.image.setScaledContents(False)
+        self.image.setAlignment(QtCore.Qt.AlignCenter)
+        self.image.setObjectName("image")
+        self.verticalLayout.addWidget(self.image)
+        self.label_2 = QtWidgets.QLabel(self.frame)
+        self.label_2.setTextFormat(QtCore.Qt.RichText)
+        self.label_2.setObjectName("label_2")
+        self.verticalLayout.addWidget(self.label_2)
+        self.verticalLayout_2.addWidget(self.frame)
+        MacLauncher.setCentralWidget(self.centralwidget)
+
+        self.retranslateUi(MacLauncher)
+        QtCore.QMetaObject.connectSlotsByName(MacLauncher)
+
+    def retranslateUi(self, MacLauncher):
+        _translate = QtCore.QCoreApplication.translate
+        MacLauncher.setWindowTitle(_translate("MacLauncher", "UDS Launcher"))
+        self.topLabel.setText(_translate("MacLauncher", "<html><head/><body><p align=\"center\"><span style=\" font-size:12pt; font-weight:600;\">UDS Launcher</span></p></body></html>"))
+        self.label_2.setText(_translate("MacLauncher", "<html><head/><body><p align=\"center\"><span style=\" font-size:6pt;\">Closing this window will end all UDS tunnels</span></p></body></html>"))
+import UDSResources_rc
+
+
+if __name__ == "__main__":
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+    MacLauncher = QtWidgets.QMainWindow()
+    ui = Ui_MacLauncher()
+    ui.setupUi(MacLauncher)
+    MacLauncher.show()
+    sys.exit(app.exec())

client-py3/full/src/UDSLauncherMac.ui

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MacLauncher</class>
+ <widget class="QMainWindow" name="MacLauncher">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>235</width>
+    <height>120</height>
+   </rect>
+  </property>
+  <property name="cursor">
+   <cursorShape>ArrowCursor</cursorShape>
+  </property>
+  <property name="windowTitle">
+   <string>UDS Launcher</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="UDSResources.qrc">
+    <normaloff>:/images/logo-uds-small</normaloff>:/images/logo-uds-small</iconset>
+  </property>
+  <property name="windowOpacity">
+   <double>1.000000000000000</double>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <property name="spacing">
+     <number>4</number>
+    </property>
+    <property name="leftMargin">
+     <number>4</number>
+    </property>
+    <property name="topMargin">
+     <number>4</number>
+    </property>
+    <property name="rightMargin">
+     <number>4</number>
+    </property>
+    <property name="bottomMargin">
+     <number>4</number>
+    </property>
+    <item>
+     <widget class="QFrame" name="frame">
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="topLabel">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;UDS Launcher&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="image">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="autoFillBackground">
+          <bool>true</bool>
+         </property>
+         <property name="text">
+          <string notr="true"/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="UDSResources.qrc">:/images/logo-uds-small</pixmap>
+         </property>
+         <property name="scaledContents">
+          <bool>false</bool>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:6pt;&quot;&gt;Closing this window will end all UDS tunnels&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources>
+  <include location="UDSResources.qrc"/>
+ </resources>
+ <connections/>
+</ui>

client-py3/full/src/UDSResources_rc.py

@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created by: The Resource Compiler for PyQt5 (Qt v5.13.2)
+# Created by: The Resource Compiler for PyQt5 (Qt v5.15.2)
 #
 # WARNING! All changes made in this file will be lost!
 

client-py3/full/src/UDSWindow.py

@@ -2,9 +2,10 @@
 
 # Form implementation generated from reading ui file 'UDSWindow.ui'
 #
-# Created by: PyQt5 UI code generator 5.13.2
+# Created by: PyQt5 UI code generator 5.15.2
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -89,4 +90,4 @@ if __name__ == "__main__":
     ui = Ui_MainWindow()
     ui.setupUi(MainWindow)
     MainWindow.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

client-py3/full/src/uds/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014-2017 Virtual Cable S.L.
+# Copyright (c) 2014-2021 Virtual Cable S.L.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -29,13 +29,11 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
-
-VERSION = '3.0.0'
+VERSION = '3.6.0'
 
 __title__ = 'udclient'
 __version__ = VERSION
-__build__ = 0x010760
-__author__ = 'Adolfo Gómez'
+__build__ = 0x010712
+__author__ = 'Adolfo Gómez <dkmaster@dkmon.com>'
 __license__ = "BSD 3-clause"
-__copyright__ = "Copyright 2014-2017 VirtualCable S.L.U."
+__copyright__ = "Copyright 2014-2022 VirtualCable S.L.U."

client-py3/full/src/uds/forward.py

@@ -9,6 +9,7 @@ import random
 import time
 import select
 import socketserver
+import typing
 
 import paramiko
 
@@ -24,7 +25,11 @@ class CheckfingerPrints(paramiko.MissingHostKeyPolicy):
         if self.fingerPrints:
             remotefingerPrints = hexlify(key.get_fingerprint()).decode().lower()
             if remotefingerPrints not in self.fingerPrints.split(','):
-                logger.error("Server {!r} has invalid fingerPrints. ({} vs {})".format(hostname, remotefingerPrints, self.fingerPrints))
+                logger.error(
+                    "Server {!r} has invalid fingerPrints. ({} vs {})".format(
+                        hostname, remotefingerPrints, self.fingerPrints
+                    )
+                )
                 raise paramiko.SSHException(
                     "Server {!r} has invalid fingerPrints".format(hostname)
                 )
@@ -36,26 +41,49 @@ class ForwardServer(socketserver.ThreadingTCPServer):
 
 
 class Handler(socketserver.BaseRequestHandler):
+    event: threading.Event
+    thread: 'ForwardThread'
+    ssh_transport: paramiko.Transport
+    chain_host: str
+    chain_port: int
 
     def handle(self):
         self.thread.currentConnections += 1
 
         try:
-            chan = self.ssh_transport.open_channel('direct-tcpip',
-                                                   (self.chain_host, self.chain_port),
-                                                   self.request.getpeername())
+            chan = self.ssh_transport.open_channel(
+                'direct-tcpip',
+                (self.chain_host, self.chain_port),
+                self.request.getpeername(),
+            )
         except Exception as e:
-            logger.exception('Incoming request to %s:%d failed: %s', self.chain_host, self.chain_port, repr(e))
+            logger.exception(
+                'Incoming request to %s:%d failed: %s',
+                self.chain_host,
+                self.chain_port,
+                repr(e),
+            )
             return
         if chan is None:
-            logger.error('Incoming request to %s:%d was rejected by the SSH server.', self.chain_host, self.chain_port)
+            logger.error(
+                'Incoming request to %s:%d was rejected by the SSH server.',
+                self.chain_host,
+                self.chain_port,
+            )
             return
 
-        logger.debug('Connected!  Tunnel open %r -> %r -> %r', self.request.getpeername(), chan.getpeername(), (self.chain_host, self.chain_port))
+        logger.debug(
+            'Connected!  Tunnel open %r -> %r -> %r',
+            self.request.getpeername(),
+            chan.getpeername(),
+            (self.chain_host, self.chain_port),
+        )
         # self.ssh_transport.set_keepalive(10)  # Keep alive every 10 seconds...
         try:
             while self.event.is_set() is False:
-                r, _w, _x = select.select([self.request, chan], [], [], 1)  # pylint: disable=unused-variable
+                r, _w, _x = select.select(
+                    [self.request, chan], [], [], 1
+                )  # pylint: disable=unused-variable
 
                 if self.request in r:
                     data = self.request.recv(1024)
@@ -74,7 +102,10 @@ class Handler(socketserver.BaseRequestHandler):
             peername = self.request.getpeername()
             chan.close()
             self.request.close()
-            logger.debug('Tunnel closed from %r', peername,)
+            logger.debug(
+                'Tunnel closed from %r',
+                peername,
+            )
         except Exception:
             pass
 
@@ -86,8 +117,21 @@ class Handler(socketserver.BaseRequestHandler):
 
 class ForwardThread(threading.Thread):
     status = 0  # Connecting
+    client: typing.Optional[paramiko.SSHClient]
+    fs: typing.Optional[ForwardServer]
 
-    def __init__(self, server, port, username, password, localPort, redirectHost, redirectPort, waitTime, fingerPrints):
+    def __init__(
+        self,
+        server,
+        port,
+        username,
+        password,
+        localPort,
+        redirectHost,
+        redirectPort,
+        waitTime,
+        fingerPrints,
+    ):
         threading.Thread.__init__(self)
         self.client = None
         self.fs = None
@@ -102,7 +146,7 @@ class ForwardThread(threading.Thread):
         self.redirectPort = redirectPort
 
         self.waitTime = waitTime
-        
+
         self.fingerPrints = fingerPrints
 
         self.stopEvent = threading.Event()
@@ -116,9 +160,19 @@ class ForwardThread(threading.Thread):
         if localPort is None:
             localPort = random.randrange(33000, 53000)
 
-        ft = ForwardThread(self.server, self.port, self.username, self.password, localPort, redirectHost, redirectPort, self.waitTime, self.fingerPrints)
+        ft = ForwardThread(
+            self.server,
+            self.port,
+            self.username,
+            self.password,
+            localPort,
+            redirectHost,
+            redirectPort,
+            self.waitTime,
+            self.fingerPrints,
+        )
         ft.client = self.client
-        self.client.useCount += 1  # One more using this client
+        self.client.useCount += 1  # type: ignore
         ft.start()
 
         while ft.status == 0:
@@ -126,7 +180,6 @@ class ForwardThread(threading.Thread):
 
         return (ft, localPort)
 
-
     def _timerFnc(self):
         self.timer = None
         logger.debug('Timer fnc: %s', self.currentConnections)
@@ -138,14 +191,23 @@ class ForwardThread(threading.Thread):
         if self.client is None:
             try:
                 self.client = paramiko.SSHClient()
-                self.client.useCount = 1  # Custom added variable, to keep track on when to close tunnel
+                self.client.useCount = 1  # type: ignore
                 self.client.load_system_host_keys()
-                self.client.set_missing_host_key_policy(CheckfingerPrints(self.fingerPrints))
+                self.client.set_missing_host_key_policy(
+                    CheckfingerPrints(self.fingerPrints)
+                )
 
                 logger.debug('Connecting to ssh host %s:%d ...', self.server, self.port)
 
                 # To disable ssh-ageng asking for passwords: allow_agent=False
-                self.client.connect(self.server, self.port, username=self.username, password=self.password, timeout=5, allow_agent=False)
+                self.client.connect(
+                    self.server,
+                    self.port,
+                    username=self.username,
+                    password=self.password,
+                    timeout=5,
+                    allow_agent=False,
+                )
             except Exception:
                 logger.exception('Exception connecting: ')
                 self.status = 2  # Error
@@ -173,18 +235,30 @@ class ForwardThread(threading.Thread):
                 self.timer.cancel()
 
             self.stopEvent.set()
-            self.fs.shutdown()
+
+            if self.fs:
+                self.fs.shutdown()
 
             if self.client is not None:
-                self.client.useCount -= 1
-                if self.client.useCount == 0:
+                self.client.useCount -= 1  # type: ignore
+                if self.client.useCount == 0:  # type: ignore
                     self.client.close()
                 self.client = None  # Clean up
         except Exception:
             logger.exception('Exception stopping')
 
 
-def forward(server, port, username, password, redirectHost, redirectPort, localPort=None, waitTime=10, fingerPrints=None):
+def forward(
+    server,
+    port,
+    username,
+    password,
+    redirectHost,
+    redirectPort,
+    localPort=None,
+    waitTime=10,
+    fingerPrints=None,
+):
     '''
     Instantiates an ssh connection to server:port
     Returns the Thread created and the local redirected port as a list: (thread, port)
@@ -194,10 +268,28 @@ def forward(server, port, username, password, redirectHost, redirectPort, localP
     if localPort is None:
         localPort = random.randrange(40000, 50000)
 
-    logger.debug('Connecting to %s:%s using %s/%s redirecting to %s:%s, listening on 127.0.0.1:%s',
-                 server, port, username, password, redirectHost, redirectPort, localPort)
+    logger.debug(
+        'Connecting to %s:%s using %s/%s redirecting to %s:%s, listening on 127.0.0.1:%s',
+        server,
+        port,
+        username,
+        password,
+        redirectHost,
+        redirectPort,
+        localPort,
+    )
 
-    ft = ForwardThread(server, port, username, password, localPort, redirectHost, redirectPort, waitTime, fingerPrints)
+    ft = ForwardThread(
+        server,
+        port,
+        username,
+        password,
+        localPort,
+        redirectHost,
+        redirectPort,
+        waitTime,
+        fingerPrints,
+    )
 
     ft.start()
 

client-py3/full/src/uds/log.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014 Virtual Cable S.L.
+# Copyright (c) 2014-2021 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -29,27 +29,35 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
-
 import logging
 import os
+import os.path
 import sys
 import tempfile
 
-if sys.platform.startswith('linux'):
-    from os.path import expanduser  # pylint: disable=ungrouped-imports
-    logFile = expanduser('~/udsclient.log')
+LOGLEVEL = logging.INFO
+DEBUG = False
+
+# Update debug level if uds-debug-on exists
+if 'linux' in sys.platform or 'darwin' in sys.platform:
+    logFile = os.path.expanduser('~/udsclient.log')
+    if os.path.isfile(os.path.expanduser('~/uds-debug-on')):
+        LOGLEVEL = logging.DEBUG
+        DEBUG = True
 else:
-    logFile = os.path.join(tempfile.gettempdir(), b'udsclient.log')
+    logFile = os.path.join(tempfile.gettempdir(), 'udsclient.log')
+    if os.path.isfile(os.path.join(tempfile.gettempdir(), 'uds-debug-on')):
+        LOGLEVEL = logging.DEBUG
+        DEBUG = True
 
 try:
     logging.basicConfig(
         filename=logFile,
         filemode='a',
         format='%(levelname)s %(asctime)s %(message)s',
-        level=logging.INFO
+        level=LOGLEVEL,
     )
 except Exception:
-    logging.basicConfig(format='%(levelname)s %(asctime)s %(message)s', level=logging.INFO)
+    logging.basicConfig(format='%(levelname)s %(asctime)s %(message)s', level=LOGLEVEL)
 
 logger = logging.getLogger('udsclient')

client-py3/full/src/uds/os_detector.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #
-# Copyright (c) 2017 Virtual Cable S.L.
+# Copyright (c) 2017-2021 Virtual Cable S.L.U.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -30,14 +30,13 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
-
 import sys
 
 LINUX = 'Linux'
 WINDOWS = 'Windows'
 MAC_OS_X = 'Mac os x'
 
+
 def getOs():
     if sys.platform.startswith('linux'):
         return LINUX