Merge remote-tracking branch 'origin/v4.0' into dev/andres/v4.0

Updates logic to use the correct macOS-specific custom parameters
instead of Linux parameters when generating RDP connection settings.
Adds type ignore comments to improve compatibility with type checkers
and prevent related runtime issues.

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/server" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/auto-assign.yml

@@ -0,0 +1,19 @@
+name: Auto Assign
+on:
+  issues:
+    types: [opened]
+  pull_request:
+    types: [opened]
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - name: 'Auto-assign issue'
+      uses: pozil/auto-assign-issue@v1
+      with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          assignees: dkmstr
+          numOfAssignee: 1

.github/workflows/dependency-review.yml

@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v3

.gitignore

@@ -3,70 +3,20 @@
 *.orig
 *~
 *.swp
-
+.DS_Store
 *_enterprise.*
 .settings/
+.ipynb_checkpoints
+.idea/
 
 # Debian buildings
 *.debhelper*
 *-stamp
 *.substvars
-
-# /client/administration/
-/client/administration/*.suo
-
-# /client/administration/UdsAdmin/
-/client/administration/UdsAdmin/*.user
-
-# /client/administration/UdsAdmin/bin/
-/client/administration/UdsAdmin/bin/Debug
-/client/administration/UdsAdmin/bin/Release
-
-# /client/administration/UdsAdmin/obj/x86/
-/client/administration/UdsAdmin/obj/x86/Debug
-/client/administration/UdsAdmin/obj/x86/Release
-
-# /client/administration/installer/UDSAdminInstaller/
-/client/administration/installer/UDSAdminInstaller/MSChart.exe
-/client/administration/installer/UDSAdminInstaller/UDSAdminSetup.exe
-
-# /guacamole-tunnel/
-/guacamole-tunnel/target
-
-# /linuxActor/
-/linuxActor/udsactor_*
-
-# /linuxActor/src/debian/
-/linuxActor/src/debian/udsactor
-
-# /linuxActorNX/
-/linuxActorNX/udsactor-nx_*
-
-# /linuxActorNX/src/debian/
-/linuxActorNX/src/debian/udsactor-nx
-
-# /linuxActorXRDP/
-/linuxActorXRDP/udsactor-xrdp_*
-
-# /linuxActorXRDP/src/debian/
-/linuxActorXRDP/src/debian/udsactor-xrdp
-
-# /nxtransport/jar/
-/nxtransport/jar/*.sh
-/nxtransport/jar/*.jar
-
-# /nxtuntransport/jar/
-/nxtuntransport/jar/*.sh
-/nxtuntransport/jar/*.jar
-
-# /rdptransport/java/jar/
-/rdptransport/java/jar/*.sh
-/rdptransport/java/jar/*.jar
+.coverage*
 
 # /server/
 *_enterprise
-/server/openuds.sublime-project
-/server/openuds.sublime-workspace
 
 # /server/src/
 /server/src/taskmanager.pid
@@ -89,7 +39,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
@@ -129,37 +78,10 @@
 # /server/src/uds/transports/
 /server/src/uds/transports/*-enterprise
 
-# /udsService/
-/udsService/*.suo
+.vscode
+.mypy_cache
+.pytest_cache
+.python-version
 
-# /udsService/installer/
-/udsService/installer/UDSActorSetup.exe
-
-# /udsService/rpc/bin/
-/udsService/rpc/bin/Debug
-/udsService/rpc/bin/Release
-/udsService/rpc/bin/x86
-
-# /udsService/rpc/obj/
-/udsService/rpc/obj/Debug
-/udsService/rpc/obj/Release
-/udsService/rpc/obj/x86
-
-# /udsService/udsService/bin/
-/udsService/udsService/bin/Debug
-/udsService/udsService/bin/Release
-/udsService/udsService/bin/x64
-
-# /udsService/udsService/obj/
-/udsService/udsService/obj/x64
-/udsService/udsService/obj/x86
-
-# /udsService/udsgui/bin/
-/udsService/udsgui/bin/Debug
-/udsService/udsgui/bin/Release
-/udsService/udsgui/bin/x86
-
-# /udsService/udsgui/obj/
-/udsService/udsgui/obj/Debug
-/udsService/udsgui/obj/Release
-/udsService/udsgui/obj/x86
+target/
+server/test-vars.ini

.gitmodules

@@ -0,0 +1,16 @@
+[submodule "guacamole-auth-uds"]
+	path = guacamole-auth-uds
+	url = git@github.com:VirtualCable/guacamole-auth-uds.git
+	branch = master
+[submodule "tunnel-server"]
+	path = tunnel-server
+	url = git@github.com:VirtualCable/uds-tunnel-server.git
+	branch = master
+[submodule "actor"]
+	path = actor
+	url = git@github.com:VirtualCable/uds-actor.git
+	branch = master
+[submodule "client-py3"]
+	path = client
+	url = git@github.com:VirtualCable/uds-client.git
+	branch = master

LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2022-2024, 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

@@ -1,7 +1,17 @@
-![UDS Logo](https://www.udsenterprise.com/static//img/logoUDSNav.png)
-
-openuds
+OpenUDS
 =======
 
-OpenUDS Is an Open Source Source project, initiated by Spanish Company ​Virtualcable and released Open Source with the help of several Spanish Universities.
+OpenUDS (Universal Desktop Services) is a multiplatform connection broker for:
+- VDI: Windows and Linux virtual desktops administration and deployment
+- App virtualization
+- Desktop services consolidation
+- ...
 
+This is an Open Source project, initiated by Spanish Company ​Virtual Cable and released Open Source with the help of several Spanish Universities.
+
+Please feel free to contribute to this project.
+
+Notes
+=====
+* From 4.0 onwards (current master), OpenUDS has been splitted in several repositories and contains submodules. Remember to use "git clone --resursive ..." to fetch it ;-).
+* 4.0 version is tested on Python 3.11. It will probably work on 3.12 and 3.13 too (maybe 3.10, but not tested also)

SECURITY.md

@@ -0,0 +1,11 @@
+# Security
+
+Virtual Cable takes the security of our software products and services seriously.
+
+If you find any vulnerability, please, report it to "agomez@virtualcable.net".
+
+Please, do not use the issue tracker for security vulnerabilities.
+
+[]: # Path: README.md
+
+Thank you very much for your interest in OpenUDS.

TODO.txt

@@ -1,6 +0,0 @@
-* Add "Scheduler" to manage pools, and posibbly other operations (Expect to release an version 1.7.1??)
-* Improve stats
-* Add App Virtualization support
-* Add "Meta Pools"
-* Manage to connect several UDS in "tree", so one UDS can be provider o another UDS
-

VERSION

@@ -0,0 +1 @@
+4.0.0

actors/.gitignore

@@ -1,8 +0,0 @@
-bin
-*_enterprise*
-udsactor*.deb
-udsactor*.build
-udsactor*.changes
-/udsactor_1.7.0.dsc
-/udsactor_1.7.0.tar.xz
-/udsactor*.rpm

actors/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>actors</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>

actors/.pydevproject

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/${PROJECT_DIR_NAME}/src</path>
-</pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-</pydev_project>

actors/linux/.gitignore

@@ -1 +0,0 @@
-/udsactor-opensuse-1.7.0.spec

actors/linux/Makefile

@@ -1,96 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Directories
-SOURCEDIR := ../src
-LIBDIR := $(DESTDIR)/usr/share/UDSActor
-BINDIR := $(DESTDIR)/usr/bin
-SBINDIR = $(DESTDIR)/usr/sbin
-APPSDIR := $(DESTDIR)/usr/share/applications
-CFGDIR := $(DESTDIR)/etc/udsactor
-INITDIR := $(DESTDIR)/etc/init.d
-POLKITDIR := $(DESTDIR)/usr/share/polkit-1/actions/
-XDGAUTOSTARTDIR := $(DESTDIR)/etc/xdg/autostart
-KDEAUTOSTARTDIR := $(DESTDIR)/usr/share/autostart
-
-PYC := $(shell find $(SOURCEDIR) -name '*.py[co]')
-CACHES := $(shell find $(SOURCEDIR) -name '__pycache__')
-
-clean:
-	rm -rf $(PYC) $(CACHES) $(DESTDIR)
-install-udsactor-xrdp:
-	mkdir -p $(BINDIR)
-	cp scripts/uds-sesman.sh $(BINDIR)/uds-sesman
-	cp scripts/uds-wait-session.sh $(BINDIR)/uds-wait-session
-	
-	chmod 0755 $(BINDIR)/uds-sesman
-	chmod 0755 $(BINDIR)/uds-wait-session
-
-install-udsactor-nx:
-	mkdir -p $(BINDIR)
-	cp scripts/udsnxstart.sh $(BINDIR)/udsnxstart
-	cp scripts/udsnxstop.sh $(BINDIR)/udsnxstop
-	
-	chmod 0755 $(BINDIR)/udsnxstart
-	chmod 0755 $(BINDIR)/udsnxstop
-install-udsactor:
-	rm -rf $(DESTDIR)
-	mkdir -p $(LIBDIR)
-	mkdir -p $(BINDIR)
-	mkdir -p $(SBINDIR)
-	mkdir -p $(APPSDIR)
-	mkdir -p $(CFGDIR)
-	mkdir -p $(POLKITDIR)
-	mkdir -p $(XDGAUTOSTARTDIR)
-	mkdir -p $(KDEAUTOSTARTDIR)
-	
-	mkdir $(LIBDIR)/img
-	
-	# Cleans up .pyc and cache folders
-	rm -f $(PYC) $(CACHES)
-	
-	cp -r $(SOURCEDIR)/udsactor $(LIBDIR)/udsactor
-	cp $(SOURCEDIR)/img/uds.png $(LIBDIR)/img
-
-	cp $(SOURCEDIR)/UDSActorConfig.py $(LIBDIR)
-	cp $(SOURCEDIR)/UDSActorUser.py $(LIBDIR)
-	# QT Dialogs & resources
-	cp $(SOURCEDIR)/*_ui.py $(LIBDIR)
-	cp $(SOURCEDIR)/UDSActor_rc.py $(LIBDIR)
-	
-	# Menu GUI app
-	cp desktop/UDS_Actor_Configuration.desktop $(APPSDIR)
-	
-	# Autostart elements for gnome/kde
-	cp desktop/UDSActorTool.desktop $(XDGAUTOSTARTDIR)
-	cp desktop/UDSActorTool.desktop $(KDEAUTOSTARTDIR)
-	
-	# scripts
-	cp scripts/udsactor $(BINDIR)
-	cp scripts/UDSActorConfig-pkexec $(SBINDIR)
-	cp scripts/UDSActorTool-startup $(BINDIR)
-	
-	# Policy to run as administrator
-	cp policy/org.openuds.pkexec.UDSActorConfig.policy $(POLKITDIR)
-
-	# Fix permissions
-	chmod 755 $(BINDIR)/udsactor
-	chmod 755 $(BINDIR)/UDSActorTool-startup
-	chmod 755 $(SBINDIR)/UDSActorConfig-pkexec
-	chmod 755 $(LIBDIR)/UDSActorConfig.py
-	chmod 755 $(LIBDIR)/UDSActorUser.py
-	chmod 644 $(POLKITDIR)/org.openuds.pkexec.UDSActorConfig.policy
-	
-	# If for red hat based, copy init.d
-ifeq ($(DISTRO),rh)
-	mkdir -p $(INITDIR)
-	cp debian/udsactor.init $(INITDIR)/udsactor
-	ln -s /usr/share/UDSActor/UDSActorConfig.py $(SBINDIR)/UDSActorConfig
-	ln -s /usr/share/UDSActor/UDSActorUser.py $(BINDIR)/UDSActorTool
-endif
-	
-	# chmod 0755 $(BINDIR)/udsactor
-uninstall:
-	rm -rf $(LIBDIR)
-	# rm -f $(BINDIR)/udsactor
-	rm -rf $(CFGDIR)

actors/linux/buildrpm.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-VERSION=1.7.0
-RELEASE=1
-
-top=`pwd`
-
-cat udsactor-template.spec | 
-  sed -e s/"version 1.7.0"/"version ${VERSION}"/g |
-  sed -e s/"release 1"/"release ${RELEASE}"/g > udsactor-$VERSION.spec
-  
-# Now fix dependencies for opensuse
-cat udsactor-template.spec | 
-  sed -e s/"name udsactor"/"name udsactor-opensuse"/g |
-  sed -e s/"PyQt4"/"python-qt4"/g |
-  sed -e s/"libXScrnSaver"/"libXss1"/g > udsactor-opensuse-$VERSION.spec
-
-
-# Right now, udsactor-xrdp-1.7.0.spec is not needed
-for pkg in udsactor-$VERSION.spec udsactor-opensuse-$VERSION.spec; do
-    
-    rm -rf rpm
-    for folder in SOURCES BUILD RPMS SPECS SRPMS; do
-        mkdir -p rpm/$folder
-    done
-    
-    rpmbuild -v -bb --clean --buildroot=$top/rpm/BUILD/$pkg-root --target noarch $pkg 2>&1
-done
-
-#rm udsactor-$VERSION

actors/linux/debian/.gitignore

@@ -1,3 +0,0 @@
-/udsactor/
-/udsactor-xrdp/
-/udsactor-nx/

actors/linux/debian/changelog

@@ -1,5 +0,0 @@
-udsactor (1.7.0) stable; urgency=medium
-
-  * Initial release.
-
- -- Adolfo Gómez García <agomez@virtualcable.es>  Mon, 17 Nov 2014 05:32:41 +0100

actors/linux/debian/compat

@@ -1 +0,0 @@
-9

actors/linux/debian/control

@@ -1,31 +0,0 @@
-Source: udsactor
-Section: admin
-Priority: optional
-Maintainer: Adolfo Gómez García <agomez@virtualcable.es>
-Build-Depends: debhelper (>= 7), po-debconf
-Standards-Version: 3.9.2
-Homepage: http://www.virtualcable.es
-
-Package: udsactor
-Section: admin
-Priority: optional
-Architecture: all
-Depends: policykit-1(>=0.100), python-requests (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python-prctl(>=1.1.1), python (>=2.7), libxss1, ${misc:Depends}
-Description: Actor for Universal Desktop Services (UDS) Broker
- This package provides the required components to allow this machine to work on an environment managed by UDS Broker.
-
-Package: udsactor-xrdp
-Section: x11
-Priority: optional
-Architecture: all
-Depends: xrdp (>= 0.5.0), udsactor (>= ${binary:Version}), libpam-modules-bin (>=1.0), ${misc:Depends}
-Description: UDS Actor component for xrdp
- This package provides connection between uds actor and xrdp
-
-Package: udsactor-nx
-Section: x11
-Priority: optional
-Architecture: all
-Depends: nxnode (>= 3.5.0), udsactor (>= ${binary:Version}), ${misc:Depends}
-Description: UDS Actor component for nx
- This package provides connection between uds actor and nx 

actors/linux/debian/copyright

@@ -1,26 +0,0 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: udsactor
-Maintainer: Adolfo Gómez García
-Source: http://www.udsenterprise.com/
-
-Copyright: 2014 Virtual Cable S.L.U.
-License: BSD-3-clause
-
-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'.

actors/linux/debian/docs

@@ -1 +0,0 @@
-readme.txt

actors/linux/debian/files

@@ -1,3 +0,0 @@
-udsactor_1.7.0_all.deb admin optional
-udsactor-xrdp_1.7.0_all.deb x11 optional
-udsactor-nx_1.7.0_all.deb x11 optional

actors/linux/debian/rules

@@ -1,46 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch $@
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	dh_clean
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/udsactor install-udsactor
-	$(MAKE) DESTDIR=$(CURDIR)/debian/udsactor-xrdp install-udsactor-xrdp
-	$(MAKE) DESTDIR=$(CURDIR)/debian/udsactor-nx install-udsactor-nx
-binary-arch: build install
-	# emptyness
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installdebconf
-	dh_installinit --no-start
-	dh_python2=python
-	dh_compress
-	dh_link
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-binary: binary-indep
-.PHONY: build clean binary-indep binary install configure

actors/linux/debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

actors/linux/debian/udsactor-nx.postinst

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-NXNODECFG=/usr/NX/etc/node.cfg
-
-. /usr/share/debconf/confmodule
-
-set -e
-
-case "$1" in
-    configure)
-       TMPFILE=$(mktemp /tmp/node.cfg.XXXXX)
-       trap "rm -f $TMPFILE" 0
-       cat $NXNODECFG | sed -e "s/.*udsnxst.*//; s/\(UserScriptAfterSessionStart *=.*\)/#\1/;s/\(UserScriptAfterSessionClose *=.*\)/#\1/" > $TMPFILE
-       echo >> $TMPFILE
-       echo "# Added by udsactor-nx (udsnxstart and udsnxstop)" >> $TMPFILE
-       echo UserScriptAfterSessionStart = \"/usr/bin/udsnxstart\" >> $TMPFILE
-       echo UserScriptAfterSessionClose = \"/usr/bin/udsnxstop\" >> $TMPFILE
-       cp $TMPFILE $NXNODECFG
-       invoke-rc.d nxserver restart
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-# Don't know why, but descriptors get "weird" when launched daemon, so we tell here to debconf to stop.
-# Solved not starting the service right now, defered to next reboot
-
-
-exit 0

actors/linux/debian/udsactor-nx.postrm

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-NXNODECFG=/usr/NX/etc/node.cfg
-
-. /usr/share/debconf/confmodule
-
-set -e
-
-case "$1" in
-    purge)
-    ;;
-    remove)
-        if [ -f $NXNODECFG ]; then
-            TMPFILE=$(mktemp /tmp/node.cfg.XXXXX)
-            trap "rm -f $TMPFILE" 0
-            cat $NXNODECFG | sed -e "s/.*udsnxst.*//" > $TMPFILE
-            cp $TMPFILE $NXNODECFG
-            invoke-rc.d nxserver restart
-        fi
-    ;;
-	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#

actors/linux/debian/udsactor-xrdp.postinst

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-SESMANFILE=/etc/pam.d/xrdp-sesman
-
-. /usr/share/debconf/confmodule
-
-set -e
-
-case "$1" in
-    configure)
-       trap "cp $SESMANFILE $SESMANFILE.uds.old" 0
-       
-       TMPFILE=$(mktemp /tmp/sesman.XXXXX)
-       trap "rm -f $TMPFILE" 0
-       grep -v uds $SESMANFILE > $TMPFILE  # Removes all UDS lines from sesman if they exists
-       
-       echo >> $TMPFILE
-       echo "# Added by udsactor-xrdp" >> $TMPFILE
-       echo "session optional pam_exec.so /usr/bin/uds-sesman" >> $TMPFILE
-       cp $TMPFILE $SESMANFILE
-       trap "rm -f $TMPFILE" 0
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-# Don't know why, but descriptors get "weird" when launched daemon, so we tell here to debconf to stop.
-# Solved not starting the service right now, defered to next reboot
-
-
-exit 0

actors/linux/debian/udsactor-xrdp.postrm

@@ -1,30 +0,0 @@
-#!/bin/sh -e
-
-SESMANFILE=/etc/pam.d/xrdp-sesman
-
-. /usr/share/debconf/confmodule
-
-set -e
-
-case "$1" in
-    purge)
-    ;;
-    remove)
-        if [ -f $SESMANFILE ]; then
-            TMPFILE=$(mktemp /tmp/sesman.XXXXX)
-            trap "rm -f $TMPFILE" 0
-            grep -v uds $SESMANFILE > $TMPFILE  # Removes all UDS lines from sesman if they exists
-            cp $TMPFILE $SESMANFILE
-            trap "rm -f $TMPFILE" 0
-        fi
-    ;;
-	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#

actors/linux/debian/udsactor.config

@@ -1,45 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-# This conf script is capable of backing up
-db_capb backup
-
-if [ -f /etc/udsactor/udsactor.cfg ] && [ "$1" != "reconfigure" ]; then
-	echo "/etc/udsactor/udsactor.cfg already exists, leaving untouched."
-	exit 0
-fi
-
-STATE=1 
-while [ "$STATE" != 0 -a "$STATE" != 4 ]; do
-  case "$STATE" in
-    1)
-      db_input high udsactor/host || true
-      ;;
-    2)
-      db_input high udsactor/secure || true
-      ;;
-    3)
-      db_input high udsactor/masterKey || true
-      ;;      
-  esac
-
-  if db_go; then
-      STATE=$(($STATE + 1))
-  else
-      STATE=$(($STATE - 1))
-  fi
-    
-done
-
-# If "cancelled", exit
-if [ "$STATE" = 0 ]; then
-	exit 0
-fi
-
-# If using reconfigure, and already exists an configuration file, move it to a backup
-if [ -f /etc/udsactor/udsactor.cfg ] && [ "$1" = "reconfigure" ]; then
-	echo "/etc/udsactor.cfg backup to /etc/udsactor.cfg.back"
-	mv /etc/udsactor/udsactor.cfg /etc/udsactor/udsactor.cfg.back
-fi

actors/linux/debian/udsactor.init

@@ -1,23 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          udsactor
-# Required-Start:    $local_fs $remote_fs $network $syslog $named
-# Required-Stop:     $local_fs $remote_fs $network $syslog $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: UDS Actor
-### END INIT INFO
-#
-
-# . /lib/lsb/init-functions
-
-case "$1" in
-  start|stop|restart) 
-    /usr/bin/udsactor $1
-	;;
-  force-reload)
-  	/usr/bin/udsactor restart 
-	;;
-  *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2; exit 1 ;;
-esac
-

actors/linux/debian/udsactor.links

@@ -1,2 +0,0 @@
-/usr/share/UDSActor/UDSActorConfig.py /usr/sbin/UDSActorConfig
-/usr/share/UDSActor/UDSActorUser.py /usr/bin/UDSActorTool

actors/linux/debian/udsactor.postinst

@@ -1,53 +0,0 @@
-#!/bin/sh
-
-. /usr/share/debconf/confmodule
-
-set -e
-case "$1" in
-	configure)
-		# If new "fresh" install or if configuration file has disappeared...
-		if [ "$2" = "" ] || [ ! -f /etc/udsactor/udsactor.cfg ]; then
-			db_get udsactor/host
-			host=$RET
-			db_get udsactor/secure
-			ssl=$RET
-			if [ "$ssl" = "true" ]; then 
-				ssl=True;
-			else
-				ssl=False;
-			fi
-			db_get udsactor/masterKey
-			masterKey=$RET
-			
-			# If already has a config file there
-			if [ -f /etc/udsactor/udsactor.cfg ]; then
-				cp /etc/udsactor/udsactor.cfg /etc/udsactor/udsactor.cfg.dpkg-old
-			fi
-			
-			echo "[uds]" > /etc/udsactor/udsactor.cfg
-			echo "host = $host" >> /etc/udsactor/udsactor.cfg
-			echo "logLevel = 30000" >> /etc/udsactor/udsactor.cfg
-			echo "ssl = $ssl" >> /etc/udsactor/udsactor.cfg
-			echo "masterKey = $masterKey" >> /etc/udsactor/udsactor.cfg
-			
-		fi
-
-		# Fix perms so only root can access "masterKey"
-		chmod 0700 /etc/udsactor
-		chmod 0600 /etc/udsactor/udsactor.cfg
-		chown root:root /etc/udsactor
-		chown root:root /etc/udsactor/udsactor.cfg
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

actors/linux/debian/udsactor.postrm

@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-set -e
-
-if [ "$1" = "purge" ] ; then
-	if [ -f /etc/udsactor/udsactor.cfg ]; then
-		mv /etc/udsactor/udsactor.cfg /etc/udsactor/udsactor.cfg.dpkg-backup
-        # Remove .pyc leaved behind
-        rm -rf /usr/share/UDSActor || true > /dev/null 2>&1
-	fi
-fi
-

actors/linux/debian/udsactor.prerm

@@ -1 +0,0 @@
-#! /bin/bash -e

actors/linux/debian/udsactor.templates

@@ -1,20 +0,0 @@
-Template: udsactor/host
-Type: string
-Default:
-Description: UDS Server address:
- The actor needs the address of the server in order to communicate with it.
- Provide here full address (or i) of the UDS server
-
-Template: udsactor/secure
-Type: boolean
-Default: true
-Description: Use secure (https) connection to communicate with UDS server?
- If selected, the communication will be done using https. 
- If not selected, the communication will be done using http
-
-Template: udsactor/masterKey
-Type: string
-Default:
-Description: Master Key:
- This key is available on UDS Administration interface.
- Look for it under configuration, on Security tab.

actors/linux/desktop/UDSActorTool.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=UDS Actor Tool
-Comment=UDS Actor Userspace tools
-Exec=/usr/bin/UDSActorTool-startup
-Icon=/usr/share/UDSActor/img/uds.png
-Terminal=false
-Type=Application
-NoDisplay=true
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-DBUS-StartupType=Unique
-X-KDE-UniqueApplet=true

actors/linux/desktop/UDS_Actor_Configuration.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=UDS Actor Configuration
-Version=1.0
-Exec=/usr/sbin/UDSActorConfig-pkexec
-Comment=UDS Actor Configuration Application. (Must be executed as root)
-Icon=/usr/share/UDSActor/img/uds.png
-Type=Application
-Terminal=false
-StartupNotify=true
-Encoding=UTF-8
-Categories=Settings;System;

actors/linux/policy/org.openuds.pkexec.UDSActorConfig.policy

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-
-<policyconfig>
-
-  <action id="org.freedesktop.policykit.pkexec.run-UDSActorConfig">
-    <description>Run UDS Actor Configuration Program</description>
-    <message>Authentication is required to run UDS Actor Configuration</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/UDSActorConfig</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">TRUE</annotate>
-  </action>
-
-</policyconfig>

actors/linux/readme.txt

@@ -1,3 +0,0 @@
-UDSActor is the client actor needed to get machines managed by UDS Broker.
-
-Please, visit http://www.udsenterprise.com for more information

actors/linux/scripts/UDSActorConfig-pkexec

@@ -1,2 +0,0 @@
-#!/bin/sh
-pkexec "/usr/sbin/UDSActorConfig" "$@"

actors/linux/scripts/UDSActorTool-startup

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Simple hack to wait for systray to be present
-# Exec tool if not already runned by session manager
-ps -ef | grep "$USER" | grep -v grep | grep -v UDSActorTool-startup | grep 'UDSActorTool' -q
-# If not already running
-if [ $? -eq 1 ]; then
-    sleep 5
-    exec /usr/bin/UDSActorTool
-fi

actors/linux/scripts/uds-sesman.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-env > /tmp/env.txt
-
-if [ "$PAM_TYPE" = "open_session" ]; then
-  nohup /usr/bin/udsactor login $PAM_USER &
-  # Wait in backgroud to TTY to close (close_session is not being invoked right now)
-  nohup /usr/bin/uds-wait-session &
-elif [ "$PAM_TYPE" = "close_session" ]; then
-  nohup /usr/bin/udsactor logout $PAM_USER &
-fi
-
-return 0

actors/linux/scripts/uds-wait-session.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-while :
-do
-  sleep 5  # Wait 5 seconds between checks
-  found=`ps -f -u$PAM_USER | grep -v grep | grep -v uds-wait-session | grep "$PAM_TTY" | wc -l`
-  
-  if [ "$found" = "0" ]; then
-    /usr/bin/udsactor logout $PAM_USER
-    exit 0
-  fi
-done

actors/linux/scripts/udsactor

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-FOLDER=/usr/share/UDSActor
-
-cd $FOLDER
-python -m udsactor.linux.UDSActorService $@

actors/linux/scripts/udsnxstart.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/udsactor login $2 &

actors/linux/scripts/udsnxstop.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/udsactor logout $2 &

actors/linux/udsactor-1.7.0.spec

@@ -1,69 +0,0 @@
-%define _topdir %(echo $PWD)/rpm
-%define name udsactor
-%define version 1.7.0
-%define release 1
-%define buildroot %{_topdir}/%{name}-%{version}-%{release}-root
-
-BuildRoot: %{buildroot} 
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Actor for Universal Desktop Services (UDS) Broker
-License: BSD3
-Group: Admin
-Requires: python-six python-requests PyQt4 libXScrnSaver
-Vendor: Virtual Cable S.L.U.
-URL: http://www.udsenterprise.com
-Provides: udsactor
-
-%define _rpmdir ../
-%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-
-
-%install
-curdir=`pwd`
-cd ../..
-make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh install-udsactor
-cd $curdir
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-curdir=`pwd`
-cd ../..
-make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh clean
-cd $curdir
-
-
-%post
-systemctl enable udsactor.service > /dev/null 2>&1
-
-%preun
-systemctl disable udsactor.service > /dev/null 2>&1
-systemctl stop udsactor.service > /dev/null 2>&1
-
-%postun
-# $1 == 0 on uninstall, == 1 on upgrade for preun and postun (just a reminder for me... :) )
-if [ $1 -eq 0 ]; then
-    rm -rf /etc/udsactor
-    rm /var/log/udsactor.log
-fi
-# And, posibly, the .pyc leaved behind on /usr/share/UDSActor
-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.
-
-%files
-%defattr(-,root,root)
-/etc/udsactor
-/etc/xdg/autostart/UDSActorTool.desktop
-/etc/init.d/udsactor
-/usr/bin/UDSActorTool-startup
-/usr/bin/udsactor
-/usr/bin/UDSActorTool
-/usr/sbin/UDSActorConfig
-/usr/sbin/UDSActorConfig-pkexec
-/usr/share/UDSActor/*
-/usr/share/applications/UDS_Actor_Configuration.desktop
-/usr/share/autostart/UDSActorTool.desktop
-/usr/share/polkit-1/actions/org.openuds.pkexec.UDSActorConfig.policy

actors/linux/udsactor-template.spec

@@ -1,69 +0,0 @@
-%define _topdir %(echo $PWD)/rpm
-%define name udsactor
-%define version 1.7.0
-%define release 1
-%define buildroot %{_topdir}/%{name}-%{version}-%{release}-root
-
-BuildRoot: %{buildroot} 
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Actor for Universal Desktop Services (UDS) Broker
-License: BSD3
-Group: Admin
-Requires: python-six python-requests PyQt4 libXScrnSaver
-Vendor: Virtual Cable S.L.U.
-URL: http://www.udsenterprise.com
-Provides: udsactor
-
-%define _rpmdir ../
-%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-
-
-%install
-curdir=`pwd`
-cd ../..
-make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh install-udsactor
-cd $curdir
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-curdir=`pwd`
-cd ../..
-make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh clean
-cd $curdir
-
-
-%post
-systemctl enable udsactor.service > /dev/null 2>&1
-
-%preun
-systemctl disable udsactor.service > /dev/null 2>&1
-systemctl stop udsactor.service > /dev/null 2>&1
-
-%postun
-# $1 == 0 on uninstall, == 1 on upgrade for preun and postun (just a reminder for me... :) )
-if [ $1 -eq 0 ]; then
-    rm -rf /etc/udsactor
-    rm /var/log/udsactor.log
-fi
-# And, posibly, the .pyc leaved behind on /usr/share/UDSActor
-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.
-
-%files
-%defattr(-,root,root)
-/etc/udsactor
-/etc/xdg/autostart/UDSActorTool.desktop
-/etc/init.d/udsactor
-/usr/bin/UDSActorTool-startup
-/usr/bin/udsactor
-/usr/bin/UDSActorTool
-/usr/sbin/UDSActorConfig
-/usr/sbin/UDSActorConfig-pkexec
-/usr/share/UDSActor/*
-/usr/share/applications/UDS_Actor_Configuration.desktop
-/usr/share/autostart/UDSActorTool.desktop
-/usr/share/polkit-1/actions/org.openuds.pkexec.UDSActorConfig.policy

actors/linux/udsactor-xrdp-1.7.0.spec

@@ -1,61 +0,0 @@
-%define _topdir %(echo $PWD)/rpm
-%define name udsactor-xrdp
-%define version 1.7.0
-%define release 1
-%define buildroot %{_topdir}/%{name}-%{version}-%{release}-root
-
-BuildRoot: %{buildroot} 
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Glue between UDS Actor and XRDP
-License: BSD3
-Group: Admin
-Requires: xrdp udsactor pam
-Vendor: Virtual Cable S.L.U.
-URL: http://www.udsenterprise.com
-Provides: udsactor-xrdp
-
-%define _rpmdir ../
-%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-
-
-%install
-curdir=`pwd`
-cd ../..
-make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh install-udsactor-xrdp
-cd $curdir
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-curdir=`pwd`
-cd ../..
-make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh clean
-cd $curdir
-
-
-%post
-SESMANFILE=/etc/pam.d/xrdp-sesman
-TMPFILE=$(mktemp /tmp/sesman.XXXXX)
-grep -v uds $SESMANFILE > $TMPFILE
-echo >> $TMPFILE
-echo "# Added by udsactor-xrdp" >> $TMPFILE
-echo "session optional pam_exec.so /usr/bin/uds-sesman" >> $TMPFILE
-cp $TMPFILE $SESMANFILE
-rm $TMPFILE > /dev/null 2>&1
-
-%preun
-
-%postun
-SESMANFILE=/etc/pam.d/xrdp-sesman
-TMPFILE=$(mktemp /tmp/sesman.XXXXX)
-grep -v uds $SESMANFILE > $TMPFILE
-cp $TMPFILE $SESMANFILE
-rm $TMPFILE > /dev/null 2>&1
-
-%description
-This package provides the required components to allow this machine to work on an environment managed by UDS Broker.
-
-%files
-%defattr(-,root,root)
-/usr/bin/*

actors/src/.gitignore

@@ -1,4 +0,0 @@
-build
-.idea
-*_enterprise*
-/samples/

actors/src/UDSActor.qrc

@@ -1,5 +0,0 @@
-<RCC>
-  <qresource prefix="images">
-    <file>img/uds.png</file>
-  </qresource>
-</RCC>

actors/src/UDSActorConfig.manifest

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity
-    type="win32"
-    name="UDSActorConfig"
-    version="1.6.0.0"
-    processorArchitecture="x86"
-  />
-  <description>Description</description>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

actors/src/UDSActorConfig.py

@@ -1,112 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import sys
-from PyQt4 import QtCore, QtGui
-import six
-
-from udsactor import store
-from udsactor import REST
-from udsactor import utils
-from udsactor.log import logger
-
-from setup_dialog_ui import Ui_UdsActorSetupDialog
-
-
-class UDSConfigDialog(QtGui.QDialog):
-
-    def __init__(self, data, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-        self.ui = Ui_UdsActorSetupDialog()
-        self.ui.setupUi(self)
-        if data is not None:
-            self.ui.host.setText(data.get('host', ''))
-            self.ui.masterKey.setText(data.get('masterKey', ''))
-            self.ui.useSSl.setCurrentIndex(1 if data.get('ssl', False) is True else 0)
-            self.ui.logLevelComboBox.setCurrentIndex(int(data.get('logLevel', '10000')) / 10000 - 1)
-
-    def _getCfg(self):
-        return {
-            'host': six.text_type(self.ui.host.text()),
-            'masterKey': six.text_type(self.ui.masterKey.text()),
-            'ssl': self.ui.useSSl.currentIndex() == 1,
-            'logLevel': (self.ui.logLevelComboBox.currentIndex() + 1) * 10000
-        }
-
-    def textChanged(self):
-        enableButtons = self.ui.host.text() != '' and self.ui.masterKey.text() != ''
-        self.ui.testButton.setEnabled(enableButtons)
-        self.ui.saveButton.setEnabled(enableButtons)
-
-    def cancelAndDiscard(self):
-        logger.debug('Cancelling changes')
-        self.close()
-
-    def testParameters(self):
-        logger.debug('Testing connection')
-        try:
-            cfg = self._getCfg()
-            api = REST.Api(
-                cfg['host'], cfg['masterKey'], cfg['ssl'])
-            api.test()
-            QtGui.QMessageBox.information(
-                self, 'Test Passed', 'The test was executed successfully', QtGui.QMessageBox.Ok)
-            logger.info('Test was passed successfully')
-        except Exception as e:
-            logger.info('Test error: {}'.format(utils.exceptionToMessage(e)))
-            QtGui.QMessageBox.critical(self, 'Test Error', utils.exceptionToMessage(e), QtGui.QMessageBox.Ok)
-
-    def acceptAndSave(self):
-        cfg = self._getCfg()
-        store.writeConfig(cfg)
-        self.close()
-
-if __name__ == "__main__":
-    app = QtGui.QApplication(sys.argv)
-
-    if store.checkPermissions() is False:
-        QtGui.QMessageBox.critical(None, 'Notice', 'This Program must be executed as administrator', QtGui.QMessageBox.Ok)
-        sys.exit(1)
-
-    # Read configuration
-    cfg = store.readConfig()
-
-    if cfg is not None:
-        logger.setLevel(int(cfg.get('logLevel', 20000)))
-    else:
-        logger.setLevel(20000)
-
-    myapp = UDSConfigDialog(cfg)
-    myapp.show()
-    sys.exit(app.exec_())

actors/src/UDSActorService.manifest

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity
-    type="win32"
-    name="UDSActorService"
-    version="1.6.0.0"
-    processorArchitecture="x86"
-  />
-  <description>Description</description>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

actors/src/UDSActorUser.py

@@ -1,308 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import sys
-from PyQt4 import QtGui
-from PyQt4 import QtCore
-import pickle
-import time
-import signal
-from udsactor import ipc
-from udsactor import utils
-from udsactor.log import logger
-from udsactor.service import IPC_PORT
-from udsactor import operations
-from about_dialog_ui import Ui_UDSAboutDialog
-from message_dialog_ui import Ui_UDSMessageDialog
-from udsactor.scriptThread import ScriptExecutorThread
-
-trayIcon = None
-
-
-def sigTerm(sigNo, stackFrame):
-    if trayIcon:
-        trayIcon.quit()
-
-
-# About dialog
-class UDSAboutDialog(QtGui.QDialog):
-    def __init__(self, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-        self.ui = Ui_UDSAboutDialog()
-        self.ui.setupUi(self)
-
-    def closeDialog(self):
-        self.hide()
-
-
-class UDSMessageDialog(QtGui.QDialog):
-    def __init__(self, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-        self.ui = Ui_UDSMessageDialog()
-        self.ui.setupUi(self)
-
-    def displayMessage(self, message):
-        self.ui.message.setText(message)
-        self.show()
-
-    def closeDialog(self):
-        self.hide()
-
-
-class MessagesProcessor(QtCore.QThread):
-
-    logoff = QtCore.pyqtSignal(name='logoff')
-    displayMessage = QtCore.pyqtSignal(QtCore.QString, name='displayMessage')
-    script = QtCore.pyqtSignal(QtCore.QString, name='script')
-    exit = QtCore.pyqtSignal(name='exit')
-    information = QtCore.pyqtSignal(dict, name='information')
-
-    def __init__(self):
-        super(self.__class__, self).__init__()
-        # Retries connection for a while
-        for _ in range(10):
-            try:
-                self.ipc = ipc.ClientIPC(IPC_PORT)
-                self.ipc.start()
-                break
-            except Exception:
-                logger.debug('IPC Server is not reachable')
-                self.ipc = None
-                time.sleep(2)
-
-        self.running = False
-
-    def stop(self):
-        self.running = False
-        if self.ipc:
-            self.ipc.stop()
-
-    def isAlive(self):
-        return self.ipc is not None
-
-    def requestInformation(self):
-        if self.ipc is not None:
-            info = self.ipc.requestInformation()
-            logger.debug('Request information: {}'.format(info))
-
-    def sendLogin(self, userName):
-        if self.ipc:
-            self.ipc.sendLogin(userName)
-
-    def sendLogout(self, userName):
-        if self.ipc:
-            self.ipc.sendLogout(userName)
-
-    def run(self):
-        if self.ipc is None:
-            return
-        self.running = True
-
-        # Wait a bit so we ensure IPC thread is running...
-        time.sleep(2)
-
-        while self.running and self.ipc.running:
-            try:
-                msg = self.ipc.getMessage()
-                if msg is None:
-                    break
-                msgId, data = msg
-                logger.debug('Got Message on User Space: {}:{}'.format(msgId, data))
-                if msgId == ipc.MSG_MESSAGE:
-                    self.displayMessage.emit(QtCore.QString.fromUtf8(data))
-                elif msgId == ipc.MSG_LOGOFF:
-                    self.logoff.emit()
-                elif msgId == ipc.MSG_SCRIPT:
-                    self.script.emit(QtCore.QString.fromUtf8(data))
-                elif msgId == ipc.MSG_INFORMATION:
-                    self.information.emit(pickle.loads(data))
-            except Exception as e:
-                try:
-                    logger.error('Got error on IPC thread {}'.format(utils.exceptionToMessage(e)))
-                except:
-                    logger.error('Got error on IPC thread (an unicode error??)')
-
-        if self.ipc.running is False and self.running is True:
-            logger.warn('Lost connection with Service, closing program')
-
-        self.exit.emit()
-
-
-class UDSSystemTray(QtGui.QSystemTrayIcon):
-    def __init__(self, app_, parent=None):
-        self.app = app_
-
-        style = app.style()
-        icon = QtGui.QIcon(style.standardPixmap(QtGui.QStyle.SP_DesktopIcon))
-
-        QtGui.QSystemTrayIcon.__init__(self, icon, parent)
-        self.menu = QtGui.QMenu(parent)
-        exitAction = self.menu.addAction("About")
-        exitAction.triggered.connect(self.about)
-        self.setContextMenu(self.menu)
-        self.ipc = MessagesProcessor()
-        self.maxIdleTime = None
-        self.timer = QtCore.QTimer()
-        self.timer.timeout.connect(self.checkIdle)
-        self.showIdleWarn = True
-
-        if self.ipc.isAlive() is False:
-            raise Exception('no connection to service, exiting')
-
-        self.stopped = False
-
-        self.ipc.displayMessage.connect(self.displayMessage)
-        self.ipc.exit.connect(self.quit)
-        self.ipc.script.connect(self.executeScript)
-        self.ipc.logoff.connect(self.logoff)
-        self.ipc.information.connect(self.information)
-
-        # Pre generate a request for information (general parameters) to daemon/service
-        self.ipc.requestInformation()
-
-        self.aboutDlg = UDSAboutDialog()
-        self.msgDlg = UDSMessageDialog()
-
-        self.counter = 0
-
-        self.timer.start(5000)  # Launch idle checking every 5 seconds
-        self.graceTimerShots = 6  # Start counting for idle after 30 seconds after login, got on windows some "instant" logout because of idle timer not being reset??
-
-        self.ipc.start()
-        # If this is running, it's because he have logged in
-        self.ipc.sendLogin(operations.getCurrentUser())
-
-    def checkIdle(self):
-        if self.maxIdleTime is None:  # No idle check
-            return
-
-        if self.graceTimerShots > 0:
-            self.graceTimerShots -= 1
-            return
-
-        idleTime = operations.getIdleDuration()
-        remainingTime = self.maxIdleTime - idleTime
-
-        if remainingTime > 300:  # Reset show Warning dialog if we have more than 5 minutes left
-            self.showIdleWarn = True
-
-        logger.debug('User has been idle for: {}'.format(idleTime))
-
-        if remainingTime <= 0:
-            logger.info('User has been idle for too long, notifying Broker that service can be reclaimed')
-            self.quit()
-
-        if self.showIdleWarn is True and remainingTime < 120:  # With two minutes, show a warning message
-            self.showIdleWarn = False
-            self.msgDlg.displayMessage("You have been idle for too long. The session will end if you don't resume operations")
-
-    def displayMessage(self, message):
-        logger.debug('Displaying message')
-        self.msgDlg.displayMessage(message)
-
-    def executeScript(self, script):
-        logger.debug('Executing script')
-        th = ScriptExecutorThread(script)
-        th.start()
-
-    def logoff(self):
-        self.counter += 1
-        print("Loggof --", self.counter)
-
-    def information(self, info):
-        '''
-        Invoked when received information from service
-        '''
-        logger.debug('Got information message: {}'.format(info))
-        if 'idle' in info:
-            idle = int(info['idle'])
-            operations.initIdleDuration(idle)
-            self.maxIdleTime = idle
-            logger.debug('Set screensaver launching to {}'.format(idle))
-        else:
-            self.maxIdleTime = None
-
-    def about(self):
-        self.aboutDlg.exec_()
-
-    def quit(self):
-        logger.debug('Quit invoked')
-        if self.stopped is False:
-            self.stopped = True
-            try:
-                # If we close Client, send Logoff to Broker
-                self.ipc.sendLogout(operations.getCurrentUser())
-                self.timer.stop()
-                self.ipc.stop()
-            except Exception:
-                # May we have lost connection with server, simply exit in that case
-                pass
-
-        try:
-            operations.loggoff()  # Invoke log off
-        except Exception:
-            pass
-
-        self.app.quit()
-
-if __name__ == '__main__':
-    app = QtGui.QApplication(sys.argv)
-
-    if not QtGui.QSystemTrayIcon.isSystemTrayAvailable():
-        # QtGui.QMessageBox.critical(None, "Systray", "I couldn't detect any system tray on this system.")
-        sys.exit(1)
-
-    # This is important so our app won't close on message windows
-    QtGui.QApplication.setQuitOnLastWindowClosed(False)
-
-    try:
-        trayIcon = UDSSystemTray(app)
-    except Exception:
-        logger.error('UDS Service is not running. Tool stopped')
-        sys.exit(1)
-
-    # Sets a default idle duration, but will not be used unless idle is notified from server
-    operations.initIdleDuration(3600 * 10)
-
-    trayIcon.show()
-
-    # Catch kill and logout user :)
-    signal.signal(signal.SIGTERM, sigTerm)
-
-    res = app.exec_()
-
-    logger.debug('Exiting')
-    trayIcon.quit()
-
-    sys.exit(res)

actors/src/UDSActor_rc.py

@@ -1,251 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Resource object code
-#
-# Created: Fri Nov 21 12:40:02 2014
-#      by: The Resource Compiler for PyQt (Qt v4.8.6)
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore
-
-qt_resource_data = "\
-\x00\x00\x0c\xe0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x30\x00\x00\x00\x30\x08\x06\x00\x00\x00\x57\x02\xf9\x87\
-\x00\x00\x00\x04\x67\x41\x4d\x41\x00\x00\xb1\x8f\x0b\xfc\x61\x05\
-\x00\x00\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x26\x00\x00\x80\x84\
-\x00\x00\xfa\x00\x00\x00\x80\xe8\x00\x00\x75\x30\x00\x00\xea\x60\
-\x00\x00\x3a\x98\x00\x00\x17\x70\x9c\xba\x51\x3c\x00\x00\x00\x06\
-\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\x00\
-\x00\x07\x74\x49\x4d\x45\x07\xde\x0b\x11\x04\x03\x27\xf2\xbb\x98\
-\x60\x00\x00\x0b\xe4\x49\x44\x41\x54\x68\xde\xe5\x9a\x7b\x6c\x1c\
-\xc7\x79\xc0\x7f\x33\xbb\x7b\xef\x3b\x8a\xa4\xf8\x96\x48\x49\xa4\
-\x25\x59\x91\x28\xc9\x72\xf4\x96\x6d\xc5\x6d\x9a\xca\x71\x22\x03\
-\xb2\xe3\x5a\x71\xd2\x04\xa8\xdd\xb8\x06\x52\xd8\x4e\xd5\x36\x29\
-\x60\xd4\x70\x5c\x38\x69\x8a\x06\x4d\xd0\xba\x45\x03\xb8\xa8\x0b\
-\x34\x45\x0d\xd7\xad\x9d\x1a\x4d\xdc\xd4\x8f\xc0\x55\xf4\xb2\xf5\
-\x20\x65\x53\x2f\x4a\x22\x45\x4a\x24\xef\x8e\xf7\xda\xdd\x99\xe9\
-\x1f\x47\x52\x77\xe4\x1d\x7d\x92\x6c\x14\x45\x3f\xe0\x70\xb7\x3b\
-\xdf\x7e\xf3\xfd\xbe\x99\x6f\xf6\x9b\xdd\x13\xc6\x18\xc3\xff\x61\
-\x91\xff\xdb\x0e\xfc\xbf\x07\xb0\xaf\x45\xd9\x18\x83\x31\x3e\xda\
-\xb8\x18\xe3\xa1\x8d\x87\xd6\x2e\x06\x1f\x8c\xc2\xa0\xd1\x5a\xe1\
-\xfb\x06\xcf\xd3\xf8\xbe\x41\x69\x83\xd6\x60\x4c\xf1\x03\x02\x21\
-\x04\x96\xb4\xb1\x2c\x1b\xc7\x0e\x60\xdb\x01\x02\x4e\x88\x60\x20\
-\x8c\x6d\x3b\x1f\x1d\x80\x31\x06\xa5\x33\x14\xdc\x21\xf2\xee\x30\
-\xae\x37\x4a\xde\x1b\xa6\xe0\x0d\xe1\xf9\x13\x78\x6a\x02\xcf\x9f\
-\x40\xeb\x49\x94\xce\x71\x69\x24\xc3\xc5\xa1\x3c\xa3\x97\x0b\x8c\
-\x8d\x17\x48\x4f\x7a\x14\x5c\x83\xef\x1a\x3c\x05\x46\x0b\x40\x60\
-\x59\x01\xc2\xa1\x18\xe1\x70\x82\x44\xb4\x81\x44\xbc\x81\xfa\xba\
-\x16\xda\x5b\x96\xb1\xa8\xed\x26\x3a\x5a\x7b\x68\x6f\x5e\x8a\xe3\
-\x04\x3f\x14\x40\x54\x4a\x62\x5f\x65\x98\xcc\xf5\x31\x96\x7a\x93\
-\x54\xf6\x28\x79\x77\x10\xd7\xbb\x82\xaf\x92\x28\x95\x45\xe3\x21\
-\x00\x03\x08\xc0\x75\x0d\xef\x1e\xf5\x38\xf4\x6e\x81\x74\xd2\xc5\
-\x53\x36\x9e\x49\xa0\x09\x82\xb0\x40\x48\x04\x80\x50\x48\xe3\x23\
-\x85\x42\x90\x47\xea\x2c\xc2\xa8\x62\xb0\x84\xc4\xb6\xc3\xc4\x63\
-\x0d\x34\x37\x2e\x62\xf5\xf2\x2d\xec\xdc\xfa\x05\xba\xbb\xd6\xcc\
-\x0b\x52\x06\xe0\x7a\x57\x18\x9d\x78\x8d\xf3\x97\xff\x9e\x4c\xee\
-\x7d\x94\xce\x62\x8c\x87\xa1\xa8\x32\xed\x74\xe9\x6f\x63\x0c\x07\
-\x0e\xba\xfc\xfc\xcd\x3c\x79\xd5\xc8\x84\xbd\x93\x94\xbd\x8d\x9c\
-\x5c\x84\x21\x80\xc1\x9a\xd2\x06\x21\xc0\x8e\x26\xb0\x63\x31\x2c\
-\x9d\xc1\xf6\x47\x08\xba\xfd\x04\x0b\x27\x08\x15\x8e\x13\xf0\x06\
-\x90\x3a\x8d\x30\x3e\x96\x65\x13\x8f\x35\xb2\x75\xc3\x5d\xec\xdd\
-\xbd\x8f\x96\xa6\xae\xf9\x01\x5c\xef\x32\xfd\x83\x4f\x32\x3c\xf6\
-\x2f\x68\x53\x98\xea\xf2\xaa\xc3\x65\x17\x95\xb4\x69\x65\xf8\xd9\
-\x7f\xe6\xf8\xc5\x91\x66\xce\x86\xbf\x45\x5a\xae\x9b\xd2\xf1\xa7\
-\xbe\xa7\xe0\x9d\x20\x76\xbc\x09\x19\x49\x4c\x59\x90\x18\x21\x01\
-\x89\x30\x1a\xa9\xd3\x04\xdd\x3e\xa2\xd9\xb7\x88\x65\x5e\x27\x9c\
-\xdf\x8f\xd4\x93\x20\x24\x9b\xd7\xef\xe2\x91\x2f\x7d\x87\xf6\x96\
-\x65\x73\x7c\x99\x59\x85\x86\xc6\x5e\x62\x78\xec\x45\xb4\x29\x5c\
-\xcd\x81\x1a\x92\xc8\xb2\xa0\xad\xcd\x22\x19\xf9\x1c\x69\xb9\x0e\
-\x81\x87\xc4\x43\x60\x8a\xce\x1b\x83\xb0\x03\x38\xf5\xed\xc8\x70\
-\x7c\xea\xbc\x46\xe0\x23\x8d\x8b\x34\x79\x04\x1e\x5a\x86\xc9\x86\
-\x36\x70\xb9\xe1\x51\xce\xb7\xfd\x90\xe1\xe6\x67\xf0\xec\x0e\x30\
-\x9a\xfd\x47\x5e\xe3\x85\x97\x9e\x65\x3c\x39\x52\x19\xc0\xf7\x5d\
-\x06\x87\xdf\x41\xa0\x6a\x72\xde\x94\xb4\x1b\x60\xe5\x4d\x36\x9b\
-\xd7\xe6\xc0\xe8\xb9\x5a\xb6\x83\x5d\xdf\x8e\x0c\x84\x11\xa2\xba\
-\x45\x81\x46\xe2\x03\x1a\xdf\x6e\x66\x22\xf1\x00\xc3\xcd\xcf\xe0\
-\xdb\xed\x28\xe5\xf1\xce\xa1\x57\x39\xda\xff\x36\xb3\x53\x56\x02\
-\x28\xed\x31\x30\x38\x8e\xeb\x6b\xaa\xf6\x51\x55\x04\x4e\x40\xb0\
-\x67\xcb\x4b\xdc\xbe\xfc\xa7\x68\x23\xaf\xc2\x4b\x0b\x27\xd1\x8c\
-\x0c\x46\xe6\x09\x89\x98\x75\x24\x8a\xf9\x25\x20\x15\xdf\xc5\xd8\
-\x82\x2f\x63\x84\xcd\x78\x72\x84\xfd\x47\x5e\x23\x93\x4b\xcd\x05\
-\xb0\xed\x20\x9e\xdb\x40\xdf\x29\x77\x2a\x1a\x57\x4d\x8b\x79\xba\
-\x9d\x6e\xd3\x46\x62\x09\x8f\x3d\xb7\xbe\xc0\x8a\x96\x7e\xb4\xb6\
-\x30\x46\x20\x9c\x10\x22\x14\x9d\xc9\x83\xea\xe3\x39\x77\x7c\x8b\
-\xd7\xd8\x4c\x46\x7f\x05\x2d\xe3\x80\xe1\xf4\xe0\x31\xb2\xd9\x0a\
-\x00\x96\xb4\x59\xde\xb5\x95\xfe\x01\xc5\xa9\x41\xaf\xcc\xa8\x99\
-\xa7\xdb\xd2\x36\x65\x2c\x5a\x12\x17\x78\x70\xf3\xdf\xb0\xa8\x7e\
-\x10\x83\x40\x3a\x21\x84\xbc\xa6\x7b\xe5\x9c\x5e\x7c\xab\x0d\x25\
-\xe3\x60\x0c\x63\x13\x97\x70\xbd\xfc\x5c\x00\x80\x4d\x6b\xee\x65\
-\x49\xfb\x56\x8e\x9c\xc8\x71\xe9\x8a\x2a\x5b\x32\x67\x0f\xb4\x98\
-\xf5\x29\x6d\x59\xd5\xf1\x2e\x5f\xdd\xfe\x97\xc4\x82\x19\x0c\xf6\
-\x9c\xf6\xea\x96\x2a\xeb\x18\x61\x81\x28\x06\xc1\x57\x2e\xba\x2c\
-\xcf\x4a\x00\x82\x81\x08\xbb\x77\xfe\x21\xd1\xf0\x32\x0e\x1e\xcd\
-\x92\xce\x28\x64\x89\xdd\x52\x98\xd2\x04\x2e\x3f\x2f\x50\xda\xa2\
-\x77\xf1\x01\xf6\x6c\xf8\x07\x1c\x91\x46\x95\xf5\x37\x7d\xc5\x7c\
-\x8b\x74\xb9\x08\x53\x40\xe8\x02\x08\x08\xd8\x41\xa4\x28\x2f\xdf\
-\xca\x8e\x7a\x3a\x37\x73\xe7\xc6\x87\x48\x4d\x06\x39\x74\x3c\x87\
-\xd2\xa6\x6a\x1e\x54\x9f\x5a\x02\x63\xe0\xd3\x9f\xf8\x57\x3e\xb3\
-\xe2\x9f\x91\xc6\xc7\x98\xeb\xad\x19\x25\xb6\x1a\x47\x9a\x2c\x20\
-\x48\xc4\x1b\x71\xec\xe0\x2c\x8d\x12\x71\xec\x20\xdb\xd7\x3f\xc8\
-\x96\xde\xfb\x38\x3f\xac\x39\x72\x22\x8f\xaf\xae\xba\x5a\x09\xa4\
-\xf2\x54\x92\xd8\x96\xcb\x3d\x6b\x7f\xc4\xa7\x96\xfc\x23\x52\x28\
-\x8c\x29\xd5\x98\x3d\x9e\x25\xc7\x57\xab\xbe\x62\x1a\xfb\xe7\x91\
-\xda\xc5\x20\xe8\x68\xed\x21\x1c\x8a\x55\x07\x00\x88\x47\x1b\xb9\
-\xfb\xf6\x7d\x74\xb6\xae\xa5\xff\x74\x9e\x81\x73\xee\x4c\x29\x31\
-\xdb\xf1\xf9\xc4\x20\x09\xdb\x93\xec\x59\xf5\xa7\x6c\x6a\x7b\x05\
-\x65\xec\x59\x10\x55\x64\x26\x1a\x02\x81\xc1\xf1\x2e\x02\x2e\x52\
-\x48\xda\x5b\x96\x11\x0a\x46\xe6\x07\x00\x68\x69\xec\x66\xf7\xce\
-\x6f\x62\xcb\x04\x47\x4f\xe6\x18\x9b\x28\xe6\x83\xa9\xd0\x57\xa5\
-\x73\xd3\xa2\xb1\x88\x05\xc6\xb8\x7f\xd5\xd3\xac\x5e\xf8\xd6\x14\
-\x44\x6d\x04\x06\x03\xc6\xc7\xf1\xcf\x83\xf1\x08\x87\x62\xb4\xb7\
-\x74\xe3\x38\x81\x0f\x07\x00\x58\xdd\x73\x27\xbb\x76\x3c\x86\xe7\
-\x85\x78\xeb\x40\x86\x74\x46\x97\x25\xf5\xf4\x10\x97\x7e\x4f\xff\
-\x2e\x3d\xd6\x46\x52\x1f\x1a\xe6\x6b\xb7\x7c\x9d\x3b\x16\xff\x98\
-\x68\xc0\x23\x12\x90\x04\x2c\x31\xc7\x5e\xb9\x35\x89\x65\x72\x04\
-\xbc\xb3\x80\x21\x1e\xab\x67\x61\x7d\x1b\x62\x56\x12\x57\x5d\xa4\
-\x03\x4e\x84\xed\xeb\xf7\x32\x78\x69\x3f\xff\xfd\xde\x2b\x1c\x3c\
-\x96\x65\x63\x6f\x84\x50\xf0\xaa\x81\x4a\x23\x50\x29\xa2\x1a\x58\
-\x10\x1c\x66\xef\xea\x27\xd9\x3e\x79\x12\x3b\xfc\x04\x59\x3f\xca\
-\x68\xda\xe7\x42\xd2\x30\x32\xa9\xb9\x90\x34\x8c\xe7\x4a\x43\x22\
-\x90\x3a\x8d\xed\x5f\x42\x00\x89\x68\x3d\xf5\x75\xcd\x73\xac\x57\
-\x05\xc8\xbb\xa7\x30\xe2\xbf\xd8\xd8\x1b\xe6\xe4\xd9\x10\xe7\x2e\
-\x66\xa9\x8b\x5b\xf4\xae\x08\x81\x10\x73\x72\x60\x76\x99\x3d\x17\
-\xc2\x22\x6c\xa7\x58\xd3\xf8\x3c\x8b\x9a\xa0\xb3\xf5\x77\x51\xa6\
-\x81\x64\xde\x30\x9e\x35\x5c\x48\x1a\xde\x3e\xe3\xf3\xc6\x29\xc5\
-\xc9\x51\x8d\xa7\xc1\x52\x63\xd8\xfe\x15\x10\x82\xc6\xfa\x76\x16\
-\x36\x74\xcc\x0f\xe0\xf9\x59\xb2\x85\x3e\x32\xf9\x37\x48\xe7\xf6\
-\x63\x4c\x9a\x05\x75\x9a\xad\x1b\x7a\xf9\xb7\xd7\x8f\x70\xfc\xfd\
-\x3c\xb1\xa8\xa4\xa7\x33\x58\x5c\x2c\xaa\xc6\xbc\x72\x9b\x41\xe2\
-\xa9\x1c\xe7\x46\xfe\x0e\x08\xb0\xa4\xed\x51\xda\x12\xf5\xb4\x25\
-\xe0\xe6\x16\xc3\x8e\x6e\x8b\x87\xb7\x18\xfe\xbd\xdf\xe7\xfb\x6f\
-\xf8\xa4\x86\x2e\x61\xe9\x2b\xd8\x96\xcd\xd2\xc5\xab\x88\x45\x17\
-\xcc\x0f\x30\x30\xf8\x36\xbf\x38\xfa\x07\x2c\x5f\x9a\xa0\x3e\x11\
-\x26\x99\x6b\xe2\x83\xd1\xf5\x1c\x1e\xdd\x8e\x8e\xbf\x84\x97\xfe\
-\x33\x0e\xbc\x97\xa5\x2e\x66\xd1\xd4\x50\x4c\xc8\xda\xa6\x51\x29\
-\x84\xc0\xd7\x39\xce\x8e\xfc\x08\x03\x74\x77\xfc\x1e\x96\x0c\x22\
-\x84\x20\x64\x43\x6b\x42\xf0\xe5\x4f\x06\x68\x89\xc1\x93\xcf\x5f\
-\x44\xea\x34\x4e\x28\xc4\x8a\xee\x5b\x11\x15\xca\xd9\x32\x00\x5f\
-\x49\xde\x3c\xd0\xc7\x89\x01\x87\xce\x9e\xaf\x32\x90\xfa\x0a\x43\
-\xc9\xa5\x14\xfc\x30\x76\xa4\x91\x80\x7b\x80\x7c\xfe\x27\x1c\x39\
-\x91\x63\xcb\x2d\x51\x22\x21\x59\xb1\x14\xab\x65\x54\xb4\xce\x70\
-\x6e\xe4\x6f\x89\x85\x57\xd0\xd6\x78\xef\x1c\xe7\x36\x76\xc2\xad\
-\x2d\x49\xfa\xce\xb8\x84\x82\x0d\x2c\xeb\xea\xad\x68\xb7\x2c\xa5\
-\x1b\xea\xda\x49\x44\x5b\x18\x1a\x99\xe0\xcd\xe3\x3d\x9c\x1d\x5f\
-\x85\xa7\x22\x48\x21\xd0\xd6\x62\xbc\xf8\x37\x11\xce\x4d\x0c\x8d\
-\xba\x1c\x3e\x9e\xc3\xf5\x4c\xcd\xe5\x77\x25\x50\xa5\xb3\x0c\x5c\
-\xfc\x2e\x23\x13\xaf\x62\x8c\x2a\x6b\x77\xc8\xb1\x50\xf4\x01\x82\
-\x65\x9d\xbd\xb4\x2c\xec\xfc\x70\x80\x70\x30\x41\xeb\xc2\x9e\xe2\
-\x4a\xac\x2e\x22\x84\x40\x88\xe2\x5e\x56\x20\xd1\x81\x2d\xb8\x89\
-\x6f\x63\x88\x31\x70\xae\x40\xdf\xa9\x3c\x52\xce\x57\xdc\x55\x1f\
-\x8d\x69\xc9\x15\xce\x32\x70\xe1\x59\x26\x26\x7f\x39\x6b\xb3\x62\
-\x58\x10\x8b\xd2\xbd\x64\x2d\x3b\xb7\xdc\x8b\x25\xad\x1a\x00\x42\
-\x09\x16\xb7\xf6\x22\xa4\x44\xf8\xfd\x88\x59\x95\x1f\x80\x0a\xee\
-\x42\x45\xbe\x04\x48\x8e\x7f\x90\xe7\xe2\xa8\x37\xb3\xd3\x9a\x7d\
-\x0f\xa8\x65\x34\x0c\x30\x99\x3b\xc1\xe9\xa1\xbf\x40\xe9\xec\xcc\
-\xf9\x68\x38\xce\xde\x7b\xf6\xf1\x8d\x87\x9f\x63\xfb\xc6\xcf\x57\
-\xb5\x55\x06\x10\x74\x22\x74\xb6\xf6\x12\x0a\x26\x90\xaa\x1f\x74\
-\xb2\x42\xf8\x02\x78\xd1\x47\xd1\xc1\x9d\x78\xae\xe6\xc0\x7b\x39\
-\x92\x69\x55\x75\xbb\x58\xcb\x88\x18\xe0\x4a\xea\x75\x2e\x8d\xbd\
-\x3c\x33\x0a\x52\x5a\x34\x35\x74\xd0\xb3\x64\x2d\xb1\x48\x5d\x6d\
-\x00\x42\x48\x96\x76\xdc\x42\x5b\xd3\xcd\x08\x35\x84\xf4\x0e\x55\
-\x74\xc9\xd8\xcb\xf1\x12\x4f\x61\x02\x6b\x19\x1b\xf7\x38\x74\x3c\
-\x47\xbe\x30\x7f\xd1\x57\xa9\xad\xac\xec\x30\x1e\x67\x86\x7f\x48\
-\x36\x7f\xaa\x06\xe4\x2a\x00\x00\x2d\x0d\x3d\xac\x58\xb2\x03\x5b\
-\xe4\xb0\x0a\xaf\x82\xc9\x57\xbc\x50\x3b\xb7\xe2\xc5\x9e\x00\x21\
-\x39\x3f\xec\x72\xf2\x74\x61\xa6\x34\xa8\x65\x03\x39\x7b\xdb\x2a\
-\x80\xbc\x7b\x9e\xcb\xa9\xd7\x31\x15\xa6\x6e\xcd\x00\xb6\x1d\x60\
-\xdb\xba\x07\x88\x86\xe3\x58\x85\xff\x40\xf8\xc7\xaa\x38\x24\x50\
-\xa1\xdd\xa8\xc8\x83\x28\xa5\x39\xfa\x7e\x8e\xa1\x51\x0f\x4b\x56\
-\xd2\xa4\xea\x9d\xbb\x54\x94\xce\x92\xca\x1c\xc6\x57\x93\xd7\x0f\
-\x00\xd0\xd9\xda\xcb\x9d\x9b\xbe\x86\xe5\x1f\xc3\xc9\x3c\x87\x30\
-\xa9\xca\x57\x8b\x70\x71\x2a\x85\x77\xe3\x7b\xb0\xff\x48\x96\xe4\
-\x64\x79\x3e\x18\xe6\x26\x77\x29\x50\x39\x88\xc1\xf5\x46\xf1\x55\
-\x95\xfe\x6a\x05\x00\xd8\xd2\xfb\x05\xda\x9a\x56\x60\xe5\x5f\xc4\
-\x72\xdf\xa9\x3a\x2d\xb4\x68\xc3\x8b\xfe\x0e\x38\xdd\x24\x27\x7d\
-\x8e\x9d\x2c\xe0\xba\xf3\xdf\x1f\xe6\x6e\x45\xab\x8f\xca\x75\x03\
-\x2c\x5c\xd0\xc5\x9d\x1b\x7f\x9b\x70\xc0\xc3\x49\x3f\x85\xd0\x23\
-\x95\x15\x85\x40\x05\xb7\xe1\xc5\x1e\xc7\x18\x8b\xd3\xe7\x0b\x9c\
-\xb9\xe0\x5e\xc7\xf3\xa5\xa2\x38\x76\x3d\xb6\x15\xab\x59\xbf\x2a\
-\x80\x65\x39\x6c\x59\x7b\x3f\x9b\xd7\xdc\x8f\xa3\x0e\x12\x48\x7d\
-\x0b\xf4\x95\xb9\xfe\x03\x10\xc4\x8f\xfc\x26\x2a\xfa\x10\xbe\x27\
-\x78\xaf\x3f\xc7\xc4\x3c\x4b\x6b\x69\xe4\x4b\xa7\x92\x63\xd5\xd1\
-\x98\xb8\x03\xdb\xaa\xa3\x56\xa9\x0a\x20\x84\x20\x16\x69\xe4\xb3\
-\xb7\x7d\x83\x25\x1d\xeb\xb1\xf2\xff\x84\x93\x7d\x0e\x4c\xa6\x0a\
-\x84\x8d\x17\x7b\x0c\x13\xdc\x46\x26\xa3\x38\x74\x3c\x87\xef\x9b\
-\xaa\xcb\x26\x15\xce\x37\x26\x6e\xa7\xb9\xfe\x33\x15\x8b\xb6\x6b\
-\x06\x98\x96\xe6\x86\x65\xdc\xb3\xf3\x8f\x58\x10\x8d\x62\x4f\x7e\
-\x1f\x3b\xf7\x42\xf5\x88\x5a\x8b\xf1\xe2\x8f\x21\x9c\x2e\x2e\x5c\
-\x72\x39\x75\xce\x9d\xb7\xb8\x9b\x79\x44\x0f\x44\x83\xcb\x58\xd6\
-\xfe\x38\x8e\xbd\xa0\x66\xe7\x6b\x02\x00\xf8\x44\xf7\x4e\xbe\x78\
-\xd7\xf7\x68\x4c\x84\x71\x52\xfb\xb0\xb3\xcf\x03\xf9\x0a\x05\x9a\
-\x8d\x0a\xfe\x1a\x5e\xec\xeb\x68\x1d\xa0\xef\x54\x9e\x89\x94\xfa\
-\x90\x1b\x9b\xa4\x2e\xb2\x8e\x55\x4b\xbe\x47\x2c\xbc\xfc\x9a\x9c\
-\xaf\x19\xc0\xb2\x1c\xd6\xaf\xfc\x2c\x77\xdf\xb6\x8f\x86\x58\x1c\
-\x27\xf5\xfb\xd8\x99\xbf\x46\x98\xf2\x52\xa3\xe8\xa8\x83\x1f\xde\
-\x8b\x76\x56\x93\x4c\x7b\x7c\x70\xa6\x80\x2e\x79\x4c\x72\x55\xaf\
-\x28\x0d\x89\x1d\xac\xec\xfa\x36\xf5\xf1\x4d\x73\xf6\xbb\x1f\x19\
-\x00\x40\xc0\x09\xb3\x7d\xfd\x17\xb9\xf7\xd3\x4f\x13\x0b\x7a\x38\
-\xe9\xa7\x71\xd2\xcf\x80\xc9\xcd\xd1\x35\xb2\x11\x15\xf9\x0a\xc6\
-\x08\x4e\x9f\x2f\xcc\x3c\xd5\x98\x2d\x8d\x89\x3b\x58\xd9\xf9\x14\
-\x0b\x62\x1b\xae\xcb\xf9\x6b\x02\x00\x08\x06\xa2\x6c\x5e\x73\x1f\
-\xbf\xf1\xeb\xdf\xa5\xa9\x2e\x4e\x20\xfb\x03\x02\xc9\x47\x11\xaa\
-\x1f\xf0\xcb\x5e\x45\xa9\xe0\x1d\x08\xab\x89\x5c\x4e\x71\x7a\xd0\
-\x2d\x5b\x91\x2c\x19\xa1\xbd\xf1\x01\x6e\xee\x7a\x96\x58\x78\xc5\
-\x75\x39\x3e\x2d\xd7\xfc\xe8\xd8\xb6\x03\x6c\x5b\xbf\x97\xa6\x86\
-\xa5\xbc\xfc\xf3\x3f\xe1\xe8\x07\xcf\x23\xbd\xc3\x78\x91\x47\x50\
-\xe1\xbb\x40\xb6\x4e\x2d\x8f\x06\x84\x85\x90\x70\x79\xdc\x47\xa9\
-\xe2\xbe\x22\xe8\xb4\xd3\xd5\xfa\x30\xed\x8d\xf7\x11\x70\x1a\x6e\
-\xc8\xf9\xeb\x02\x28\x46\xd0\xe6\xe6\xa5\xb7\x51\x1f\x6f\xe3\xc5\
-\x9f\xfd\x31\x87\xfa\x5e\x26\x97\x7a\x02\x55\x78\x0d\x15\xfe\x3c\
-\xc6\xea\xc0\xce\xfd\x18\xa1\x47\x99\x79\x65\x22\x20\x12\xea\xa1\
-\xbb\xfd\x71\x5a\x1a\x3e\x87\x14\x37\xf2\xd8\xfd\xaa\x88\x1b\xfd\
-\xaf\x44\x6a\x72\x84\xc3\xfd\xaf\xf0\x93\xb7\xff\x9c\x8b\xa3\xfd\
-\x28\x13\x06\x11\x06\x3d\x06\xc6\x43\x69\x58\xb3\xa2\x8e\x5d\x3b\
-\xee\xa6\xab\xf9\x11\x12\xd1\x75\x48\x79\x6d\x2f\xb3\x3f\x56\x80\
-\x69\x49\x67\x2e\xf3\xd3\x77\xfe\x8a\x5f\x1e\x7f\x91\x2b\xc9\x41\
-\x72\x85\x14\x96\x74\xe8\x6c\x5b\xcc\x9e\x5f\xfd\x2d\x56\x76\x3d\
-\x84\x65\x45\x6e\xbc\xa3\x8f\x0b\x00\x40\x29\x8f\xa1\xcb\x27\x39\
-\x73\xe1\x20\x23\xe3\xa7\x89\x84\x63\xac\xee\xd9\x44\xfb\xc2\x4f\
-\x22\x65\xe0\xc6\x3b\xf8\xb8\x01\xa6\xc5\x18\x83\x52\x2e\x42\x58\
-\x58\xd6\x47\x33\xd7\xab\xc9\xff\x00\xbd\xd9\x0a\x65\xdf\x68\x9f\
-\x0e\x00\x00\x00\x25\x74\x45\x58\x74\x64\x61\x74\x65\x3a\x63\x72\
-\x65\x61\x74\x65\x00\x32\x30\x31\x34\x2d\x31\x31\x2d\x31\x30\x54\
-\x30\x35\x3a\x32\x30\x3a\x30\x36\x2b\x30\x31\x3a\x30\x30\x8d\xd4\
-\xe4\x1f\x00\x00\x00\x25\x74\x45\x58\x74\x64\x61\x74\x65\x3a\x6d\
-\x6f\x64\x69\x66\x79\x00\x32\x30\x31\x34\x2d\x31\x30\x2d\x31\x36\
-\x54\x30\x35\x3a\x32\x32\x3a\x31\x38\x2b\x30\x32\x3a\x30\x30\xf2\
-\x2f\xb1\x0f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-"
-
-qt_resource_name = "\
-\x00\x06\
-\x07\x03\x7d\xc3\
-\x00\x69\
-\x00\x6d\x00\x61\x00\x67\x00\x65\x00\x73\
-\x00\x03\
-\x00\x00\x70\x37\
-\x00\x69\
-\x00\x6d\x00\x67\
-\x00\x07\
-\x0b\xb6\x57\xa7\
-\x00\x75\
-\x00\x64\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-"
-
-qt_resource_struct = "\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
-\x00\x00\x00\x12\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
-\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-"
-
-def qInitResources():
-    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-def qCleanupResources():
-    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-qInitResources()

actors/src/about-dialog.ui

@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>UDSAboutDialog</class>
- <widget class="QDialog" name="UDSAboutDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>466</width>
-    <height>402</height>
-   </rect>
-  </property>
-  <property name="font">
-   <font>
-    <family>Verdana</family>
-    <pointsize>9</pointsize>
-   </font>
-  </property>
-  <property name="windowTitle">
-   <string>About UDS Actor</string>
-  </property>
-  <property name="locale">
-   <locale language="English" country="UnitedStates"/>
-  </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
-  <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>9</number>
-   </property>
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="LogoLabel">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/images/img/uds.png&quot;/&gt; UDS Actor Tools&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>5</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="TitleLabel">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:600;&quot;&gt;UDS Actor&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="VersionLabel">
-     <property name="text">
-      <string>Version 1.7.0</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>5</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="aboutTab">
-      <attribute name="title">
-       <string>&amp;About</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>9</number>
-       </property>
-       <item>
-        <widget class="QTextBrowser" name="aboutBrowser">
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;(c) 2014, Virtual Cable S.L.U.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-style:italic;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.udsenterprise.com&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.udsenterprise.com&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.openuds.org&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.openuds.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="openExternalLinks">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="authorsTab">
-      <attribute name="title">
-       <string>A&amp;uthors</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>9</number>
-       </property>
-       <item>
-        <widget class="QTextBrowser" name="authorsBrowser">
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;Adolfo Gómez García &amp;lt;agomez@virtualcable.es&amp;gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="openExternalLinks">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="licenseTab">
-      <attribute name="title">
-       <string>&amp;License Agreement</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>9</number>
-       </property>
-       <item>
-        <widget class="QTextBrowser" name="licenseBrowser">
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Copyright (c) 2014 Virtual Cable S.L.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;All rights reserved.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Redistribution and use in source and binary forms, with or without modification,&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;are permitted provided that the following conditions are met:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;   * Redistributions of source code must retain the above copyright notice,&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;     this list of conditions and the following disclaimer.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;   * Redistributions in binary form must reproduce the above copyright notice,&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;     this list of conditions and the following disclaimer in the documentation&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;     and/or other materials provided with the distribution.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;   * Neither the name of Virtual Cable S.L. nor the names of its contributors&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;     may be used to endorse or promote products derived from this software&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;     without specific prior written permission.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &amp;quot;AS IS&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="UDSActor.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>clicked(QAbstractButton*)</signal>
-   <receiver>UDSAboutDialog</receiver>
-   <slot>closeDialog()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>432</x>
-     <y>381</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>282</x>
-     <y>362</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>closeDialog()</slot>
- </slots>
-</ui>

actors/src/about_dialog_ui.py

@@ -1,154 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'about-dialog.ui'
-#
-# Created: Tue Dec 09 10:54:30 2014
-#      by: PyQt4 UI code generator 4.11.2
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
-
-class Ui_UDSAboutDialog(object):
-    def setupUi(self, UDSAboutDialog):
-        UDSAboutDialog.setObjectName(_fromUtf8("UDSAboutDialog"))
-        UDSAboutDialog.resize(466, 402)
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        font.setPointSize(9)
-        UDSAboutDialog.setFont(font)
-        UDSAboutDialog.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
-        UDSAboutDialog.setModal(True)
-        self.vboxlayout = QtGui.QVBoxLayout(UDSAboutDialog)
-        self.vboxlayout.setSpacing(9)
-        self.vboxlayout.setMargin(9)
-        self.vboxlayout.setObjectName(_fromUtf8("vboxlayout"))
-        self.LogoLabel = QtGui.QLabel(UDSAboutDialog)
-        self.LogoLabel.setObjectName(_fromUtf8("LogoLabel"))
-        self.vboxlayout.addWidget(self.LogoLabel)
-        spacerItem = QtGui.QSpacerItem(20, 5, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.vboxlayout.addItem(spacerItem)
-        self.TitleLabel = QtGui.QLabel(UDSAboutDialog)
-        self.TitleLabel.setObjectName(_fromUtf8("TitleLabel"))
-        self.vboxlayout.addWidget(self.TitleLabel)
-        self.VersionLabel = QtGui.QLabel(UDSAboutDialog)
-        self.VersionLabel.setObjectName(_fromUtf8("VersionLabel"))
-        self.vboxlayout.addWidget(self.VersionLabel)
-        spacerItem1 = QtGui.QSpacerItem(20, 5, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.vboxlayout.addItem(spacerItem1)
-        self.tabWidget = QtGui.QTabWidget(UDSAboutDialog)
-        self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
-        self.aboutTab = QtGui.QWidget()
-        self.aboutTab.setObjectName(_fromUtf8("aboutTab"))
-        self.vboxlayout1 = QtGui.QVBoxLayout(self.aboutTab)
-        self.vboxlayout1.setSpacing(6)
-        self.vboxlayout1.setMargin(9)
-        self.vboxlayout1.setObjectName(_fromUtf8("vboxlayout1"))
-        self.aboutBrowser = QtGui.QTextBrowser(self.aboutTab)
-        self.aboutBrowser.setOpenExternalLinks(True)
-        self.aboutBrowser.setObjectName(_fromUtf8("aboutBrowser"))
-        self.vboxlayout1.addWidget(self.aboutBrowser)
-        self.tabWidget.addTab(self.aboutTab, _fromUtf8(""))
-        self.authorsTab = QtGui.QWidget()
-        self.authorsTab.setObjectName(_fromUtf8("authorsTab"))
-        self.vboxlayout2 = QtGui.QVBoxLayout(self.authorsTab)
-        self.vboxlayout2.setSpacing(6)
-        self.vboxlayout2.setMargin(9)
-        self.vboxlayout2.setObjectName(_fromUtf8("vboxlayout2"))
-        self.authorsBrowser = QtGui.QTextBrowser(self.authorsTab)
-        self.authorsBrowser.setOpenExternalLinks(True)
-        self.authorsBrowser.setObjectName(_fromUtf8("authorsBrowser"))
-        self.vboxlayout2.addWidget(self.authorsBrowser)
-        self.tabWidget.addTab(self.authorsTab, _fromUtf8(""))
-        self.licenseTab = QtGui.QWidget()
-        self.licenseTab.setObjectName(_fromUtf8("licenseTab"))
-        self.vboxlayout3 = QtGui.QVBoxLayout(self.licenseTab)
-        self.vboxlayout3.setSpacing(6)
-        self.vboxlayout3.setMargin(9)
-        self.vboxlayout3.setObjectName(_fromUtf8("vboxlayout3"))
-        self.licenseBrowser = QtGui.QTextBrowser(self.licenseTab)
-        self.licenseBrowser.setObjectName(_fromUtf8("licenseBrowser"))
-        self.vboxlayout3.addWidget(self.licenseBrowser)
-        self.tabWidget.addTab(self.licenseTab, _fromUtf8(""))
-        self.vboxlayout.addWidget(self.tabWidget)
-        self.buttonBox = QtGui.QDialogButtonBox(UDSAboutDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close)
-        self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
-        self.vboxlayout.addWidget(self.buttonBox)
-
-        self.retranslateUi(UDSAboutDialog)
-        self.tabWidget.setCurrentIndex(0)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("clicked(QAbstractButton*)")), UDSAboutDialog.closeDialog)
-        QtCore.QMetaObject.connectSlotsByName(UDSAboutDialog)
-
-    def retranslateUi(self, UDSAboutDialog):
-        UDSAboutDialog.setWindowTitle(_translate("UDSAboutDialog", "About UDS Actor", None))
-        self.LogoLabel.setText(_translate("UDSAboutDialog", "<html><head/><body><p><img src=\":/images/img/uds.png\"/> UDS Actor Tools</p></body></html>", None))
-        self.TitleLabel.setText(_translate("UDSAboutDialog", "<html><head/><body><p><span style=\" font-family:\'Sans Serif\'; font-size:9pt; font-weight:600;\">UDS Actor</span></p></body></html>", None))
-        self.VersionLabel.setText(_translate("UDSAboutDialog", "Version 1.7.0", None))
-        self.aboutBrowser.setHtml(_translate("UDSAboutDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Verdana\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'Sans Serif\';\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Sans Serif\'; font-weight:600;\">(c) 2014, Virtual Cable S.L.U.</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'Sans Serif\'; font-style:italic;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><a href=\"http://www.udsenterprise.com\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt; text-decoration: underline; color:#0000ff;\">http://www.udsenterprise.com</span></a></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><a href=\"http://www.openuds.org\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt; text-decoration: underline; color:#0000ff;\">http://www.openuds.org</span></a></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'Sans Serif\';\"><br /></p></body></html>", None))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.aboutTab), _translate("UDSAboutDialog", "&About", None))
-        self.authorsBrowser.setHtml(_translate("UDSAboutDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Verdana\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Sans Serif\';\">Adolfo Gómez García &lt;agomez@virtualcable.es&gt;</span></p></body></html>", None))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.authorsTab), _translate("UDSAboutDialog", "A&uthors", None))
-        self.licenseBrowser.setHtml(_translate("UDSAboutDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Verdana\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">Copyright (c) 2014 Virtual Cable S.L.</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'MS Shell Dlg 2\'; font-size:8pt;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">All rights reserved.</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'MS Shell Dlg 2\'; font-size:8pt;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">Redistribution and use in source and binary forms, with or without modification,</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">are permitted provided that the following conditions are met:</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'MS Shell Dlg 2\'; font-size:8pt;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">   * Redistributions of source code must retain the above copyright notice,</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">     this list of conditions and the following disclaimer.</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">   * Redistributions in binary form must reproduce the above copyright notice,</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">     this list of conditions and the following disclaimer in the documentation</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">     and/or other materials provided with the distribution.</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">   * Neither the name of Virtual Cable S.L. nor the names of its contributors</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">     may be used to endorse or promote products derived from this software</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">     without specific prior written permission.</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'MS Shell Dlg 2\'; font-size:8pt;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot;</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt;\">OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'MS Shell Dlg 2\'; font-size:8pt;\"><br /></p></body></html>", None))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.licenseTab), _translate("UDSAboutDialog", "&License Agreement", None))
-
-import UDSActor_rc

actors/src/message-dialog.ui

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>UDSMessageDialog</class>
- <widget class="QDialog" name="UDSMessageDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>339</width>
-    <height>188</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="font">
-   <font>
-    <family>Verdana</family>
-    <pointsize>10</pointsize>
-   </font>
-  </property>
-  <property name="windowTitle">
-   <string>UDS Actor</string>
-  </property>
-  <widget class="QWidget" name="verticalLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>321</width>
-     <height>171</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <widget class="QTextBrowser" name="message"/>
-    </item>
-    <item>
-     <spacer name="verticalSpacer">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>20</width>
-        <height>15</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QDialogButtonBox" name="buttonBox">
-      <property name="standardButtons">
-       <set>QDialogButtonBox::Ok</set>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>clicked(QAbstractButton*)</signal>
-   <receiver>UDSMessageDialog</receiver>
-   <slot>closeDialog()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>203</x>
-     <y>161</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>337</x>
-     <y>125</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>closeDialog()</slot>
- </slots>
-</ui>

actors/src/message_dialog_ui.py

@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'message-dialog.ui'
-#
-# Created: Tue Dec  9 11:27:47 2014
-#      by: PyQt4 UI code generator 4.11.2
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
-
-class Ui_UDSMessageDialog(object):
-    def setupUi(self, UDSMessageDialog):
-        UDSMessageDialog.setObjectName(_fromUtf8("UDSMessageDialog"))
-        UDSMessageDialog.resize(339, 188)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(UDSMessageDialog.sizePolicy().hasHeightForWidth())
-        UDSMessageDialog.setSizePolicy(sizePolicy)
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        font.setPointSize(10)
-        UDSMessageDialog.setFont(font)
-        self.verticalLayoutWidget = QtGui.QWidget(UDSMessageDialog)
-        self.verticalLayoutWidget.setGeometry(QtCore.QRect(10, 10, 321, 171))
-        self.verticalLayoutWidget.setObjectName(_fromUtf8("verticalLayoutWidget"))
-        self.verticalLayout = QtGui.QVBoxLayout(self.verticalLayoutWidget)
-        self.verticalLayout.setMargin(0)
-        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.message = QtGui.QTextBrowser(self.verticalLayoutWidget)
-        self.message.setObjectName(_fromUtf8("message"))
-        self.verticalLayout.addWidget(self.message)
-        spacerItem = QtGui.QSpacerItem(20, 15, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.verticalLayout.addItem(spacerItem)
-        self.buttonBox = QtGui.QDialogButtonBox(self.verticalLayoutWidget)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
-        self.verticalLayout.addWidget(self.buttonBox)
-
-        self.retranslateUi(UDSMessageDialog)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("clicked(QAbstractButton*)")), UDSMessageDialog.closeDialog)
-        QtCore.QMetaObject.connectSlotsByName(UDSMessageDialog)
-
-    def retranslateUi(self, UDSMessageDialog):
-        UDSMessageDialog.setWindowTitle(_translate("UDSMessageDialog", "UDS Actor", None))
-

actors/src/setup-dialog.ui

@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>UdsActorSetupDialog</class>
- <widget class="QDialog" name="UdsActorSetupDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>243</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="font">
-   <font>
-    <family>Verdana</family>
-    <pointsize>9</pointsize>
-   </font>
-  </property>
-  <property name="windowTitle">
-   <string>UDS Actor Configuration</string>
-  </property>
-  <property name="autoFillBackground">
-   <bool>false</bool>
-  </property>
-  <property name="locale">
-   <locale language="English" country="UnitedStates"/>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>false</bool>
-  </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
-  <widget class="QPushButton" name="testButton">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>160</y>
-     <width>361</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="toolTip">
-    <string>Click to test the selecter parameters</string>
-   </property>
-   <property name="whatsThis">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click on this button to test the server host and master key parameters.&lt;/p&gt;&lt;p&gt;A window will be displayed with results after the test is executed.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;This button will only be active if all parameters are filled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-   </property>
-   <property name="text">
-    <string>Test parameters</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="saveButton">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>190</y>
-     <width>101</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="toolTip">
-    <string>Accepts changes and saves them</string>
-   </property>
-   <property name="whatsThis">
-    <string>Clicking on this button will accept all changes and save them, closing the configuration window</string>
-   </property>
-   <property name="text">
-    <string>Accept &amp;&amp; Save</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="cancelButton">
-   <property name="geometry">
-    <rect>
-     <x>260</x>
-     <y>190</y>
-     <width>121</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="toolTip">
-    <string>Cancel all changes and discard them</string>
-   </property>
-   <property name="whatsThis">
-    <string>Discards all changes and closes the configuration window</string>
-   </property>
-   <property name="text">
-    <string>Cancel &amp;&amp; Discard</string>
-   </property>
-  </widget>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>20</y>
-     <width>361</width>
-     <height>131</height>
-    </rect>
-   </property>
-   <layout class="QFormLayout" name="formLayout">
-    <property name="fieldGrowthPolicy">
-     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-    </property>
-    <property name="verticalSpacing">
-     <number>16</number>
-    </property>
-    <item row="0" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>UDS Server Host</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLineEdit" name="host">
-      <property name="acceptDrops">
-       <bool>false</bool>
-      </property>
-      <property name="toolTip">
-       <string>Uds Broker Server Addres. Use IP or FQDN</string>
-      </property>
-      <property name="whatsThis">
-       <string>Enter here the UDS Broker Addres using either its IP address or its FQDN address</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>UDS Master Key</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="masterKey">
-      <property name="toolTip">
-       <string>Master key to communicate with UDS Broker</string>
-      </property>
-      <property name="whatsThis">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter the Master Key (found on&lt;span style=&quot; font-weight:600;&quot;&gt; UDS Configuration&lt;/span&gt; section) of the UDS Broker to allow communication of the Actor with Broker&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="label_4">
-      <property name="text">
-       <string>Security</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QComboBox" name="useSSl">
-      <property name="toolTip">
-       <string>Select communication security with broker</string>
-      </property>
-      <property name="whatsThis">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the security for communications with UDS Broker.&lt;/p&gt;&lt;p&gt;The recommended method of communication is &lt;span style=&quot; font-weight:600;&quot;&gt;Use SSL&lt;/span&gt;, but selection needs to be acording to your broker configuration.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <item>
-       <property name="text">
-        <string>Do not use SSL</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Use SSL</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="logLevelLabel">
-      <property name="text">
-       <string>Log Level</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QComboBox" name="logLevelComboBox">
-      <property name="currentIndex">
-       <number>1</number>
-      </property>
-      <property name="frame">
-       <bool>true</bool>
-      </property>
-      <item>
-       <property name="text">
-        <string notr="true">DEBUG</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string notr="true">INFO</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string notr="true">ERROR</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string notr="true">FATAL</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>host</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>UdsActorSetupDialog</receiver>
-   <slot>textChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>123</x>
-     <y>31</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>143</x>
-     <y>48</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>masterKey</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>UdsActorSetupDialog</receiver>
-   <slot>textChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>258</x>
-     <y>75</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>299</x>
-     <y>84</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cancelButton</sender>
-   <signal>pressed()</signal>
-   <receiver>UdsActorSetupDialog</receiver>
-   <slot>cancelAndDiscard()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>315</x>
-     <y>165</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>231</x>
-     <y>161</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>testButton</sender>
-   <signal>pressed()</signal>
-   <receiver>UdsActorSetupDialog</receiver>
-   <slot>testParameters()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>239</x>
-     <y>132</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>285</x>
-     <y>185</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>saveButton</sender>
-   <signal>pressed()</signal>
-   <receiver>UdsActorSetupDialog</receiver>
-   <slot>acceptAndSave()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>71</x>
-     <y>165</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>124</x>
-     <y>181</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>textChanged()</slot>
-  <slot>cancelAndDiscard()</slot>
-  <slot>testParameters()</slot>
-  <slot>acceptAndSave()</slot>
- </slots>
-</ui>

actors/src/setup_dialog_ui.py

@@ -1,142 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'setup-dialog.ui'
-#
-# Created: Tue Dec  9 17:29:24 2014
-#      by: PyQt4 UI code generator 4.11.2
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
-
-class Ui_UdsActorSetupDialog(object):
-    def setupUi(self, UdsActorSetupDialog):
-        UdsActorSetupDialog.setObjectName(_fromUtf8("UdsActorSetupDialog"))
-        UdsActorSetupDialog.setWindowModality(QtCore.Qt.WindowModal)
-        UdsActorSetupDialog.resize(400, 243)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(UdsActorSetupDialog.sizePolicy().hasHeightForWidth())
-        UdsActorSetupDialog.setSizePolicy(sizePolicy)
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        font.setPointSize(9)
-        UdsActorSetupDialog.setFont(font)
-        UdsActorSetupDialog.setAutoFillBackground(False)
-        UdsActorSetupDialog.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
-        UdsActorSetupDialog.setSizeGripEnabled(False)
-        UdsActorSetupDialog.setModal(True)
-        self.testButton = QtGui.QPushButton(UdsActorSetupDialog)
-        self.testButton.setEnabled(False)
-        self.testButton.setGeometry(QtCore.QRect(20, 160, 361, 23))
-        self.testButton.setObjectName(_fromUtf8("testButton"))
-        self.saveButton = QtGui.QPushButton(UdsActorSetupDialog)
-        self.saveButton.setEnabled(False)
-        self.saveButton.setGeometry(QtCore.QRect(20, 190, 101, 23))
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.saveButton.sizePolicy().hasHeightForWidth())
-        self.saveButton.setSizePolicy(sizePolicy)
-        self.saveButton.setObjectName(_fromUtf8("saveButton"))
-        self.cancelButton = QtGui.QPushButton(UdsActorSetupDialog)
-        self.cancelButton.setGeometry(QtCore.QRect(260, 190, 121, 23))
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.cancelButton.sizePolicy().hasHeightForWidth())
-        self.cancelButton.setSizePolicy(sizePolicy)
-        self.cancelButton.setObjectName(_fromUtf8("cancelButton"))
-        self.layoutWidget = QtGui.QWidget(UdsActorSetupDialog)
-        self.layoutWidget.setGeometry(QtCore.QRect(20, 20, 361, 131))
-        self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
-        self.formLayout = QtGui.QFormLayout(self.layoutWidget)
-        self.formLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
-        self.formLayout.setMargin(0)
-        self.formLayout.setVerticalSpacing(16)
-        self.formLayout.setObjectName(_fromUtf8("formLayout"))
-        self.label = QtGui.QLabel(self.layoutWidget)
-        self.label.setObjectName(_fromUtf8("label"))
-        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label)
-        self.host = QtGui.QLineEdit(self.layoutWidget)
-        self.host.setAcceptDrops(False)
-        self.host.setObjectName(_fromUtf8("host"))
-        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.host)
-        self.label_3 = QtGui.QLabel(self.layoutWidget)
-        self.label_3.setObjectName(_fromUtf8("label_3"))
-        self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_3)
-        self.masterKey = QtGui.QLineEdit(self.layoutWidget)
-        self.masterKey.setObjectName(_fromUtf8("masterKey"))
-        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.masterKey)
-        self.label_4 = QtGui.QLabel(self.layoutWidget)
-        self.label_4.setObjectName(_fromUtf8("label_4"))
-        self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_4)
-        self.useSSl = QtGui.QComboBox(self.layoutWidget)
-        self.useSSl.setObjectName(_fromUtf8("useSSl"))
-        self.useSSl.addItem(_fromUtf8(""))
-        self.useSSl.addItem(_fromUtf8(""))
-        self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.useSSl)
-        self.logLevelLabel = QtGui.QLabel(self.layoutWidget)
-        self.logLevelLabel.setObjectName(_fromUtf8("logLevelLabel"))
-        self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.logLevelLabel)
-        self.logLevelComboBox = QtGui.QComboBox(self.layoutWidget)
-        self.logLevelComboBox.setFrame(True)
-        self.logLevelComboBox.setObjectName(_fromUtf8("logLevelComboBox"))
-        self.logLevelComboBox.addItem(_fromUtf8(""))
-        self.logLevelComboBox.setItemText(0, _fromUtf8("DEBUG"))
-        self.logLevelComboBox.addItem(_fromUtf8(""))
-        self.logLevelComboBox.setItemText(1, _fromUtf8("INFO"))
-        self.logLevelComboBox.addItem(_fromUtf8(""))
-        self.logLevelComboBox.setItemText(2, _fromUtf8("ERROR"))
-        self.logLevelComboBox.addItem(_fromUtf8(""))
-        self.logLevelComboBox.setItemText(3, _fromUtf8("FATAL"))
-        self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.logLevelComboBox)
-
-        self.retranslateUi(UdsActorSetupDialog)
-        self.logLevelComboBox.setCurrentIndex(1)
-        QtCore.QObject.connect(self.host, QtCore.SIGNAL(_fromUtf8("textChanged(QString)")), UdsActorSetupDialog.textChanged)
-        QtCore.QObject.connect(self.masterKey, QtCore.SIGNAL(_fromUtf8("textChanged(QString)")), UdsActorSetupDialog.textChanged)
-        QtCore.QObject.connect(self.cancelButton, QtCore.SIGNAL(_fromUtf8("pressed()")), UdsActorSetupDialog.cancelAndDiscard)
-        QtCore.QObject.connect(self.testButton, QtCore.SIGNAL(_fromUtf8("pressed()")), UdsActorSetupDialog.testParameters)
-        QtCore.QObject.connect(self.saveButton, QtCore.SIGNAL(_fromUtf8("pressed()")), UdsActorSetupDialog.acceptAndSave)
-        QtCore.QMetaObject.connectSlotsByName(UdsActorSetupDialog)
-
-    def retranslateUi(self, UdsActorSetupDialog):
-        UdsActorSetupDialog.setWindowTitle(_translate("UdsActorSetupDialog", "UDS Actor Configuration", None))
-        self.testButton.setToolTip(_translate("UdsActorSetupDialog", "Click to test the selecter parameters", None))
-        self.testButton.setWhatsThis(_translate("UdsActorSetupDialog", "<html><head/><body><p>Click on this button to test the server host and master key parameters.</p><p>A window will be displayed with results after the test is executed.</p><p><br/></p><p>This button will only be active if all parameters are filled.</p></body></html>", None))
-        self.testButton.setText(_translate("UdsActorSetupDialog", "Test parameters", None))
-        self.saveButton.setToolTip(_translate("UdsActorSetupDialog", "Accepts changes and saves them", None))
-        self.saveButton.setWhatsThis(_translate("UdsActorSetupDialog", "Clicking on this button will accept all changes and save them, closing the configuration window", None))
-        self.saveButton.setText(_translate("UdsActorSetupDialog", "Accept && Save", None))
-        self.cancelButton.setToolTip(_translate("UdsActorSetupDialog", "Cancel all changes and discard them", None))
-        self.cancelButton.setWhatsThis(_translate("UdsActorSetupDialog", "Discards all changes and closes the configuration window", None))
-        self.cancelButton.setText(_translate("UdsActorSetupDialog", "Cancel && Discard", None))
-        self.label.setText(_translate("UdsActorSetupDialog", "UDS Server Host", None))
-        self.host.setToolTip(_translate("UdsActorSetupDialog", "Uds Broker Server Addres. Use IP or FQDN", None))
-        self.host.setWhatsThis(_translate("UdsActorSetupDialog", "Enter here the UDS Broker Addres using either its IP address or its FQDN address", None))
-        self.label_3.setText(_translate("UdsActorSetupDialog", "UDS Master Key", None))
-        self.masterKey.setToolTip(_translate("UdsActorSetupDialog", "Master key to communicate with UDS Broker", None))
-        self.masterKey.setWhatsThis(_translate("UdsActorSetupDialog", "<html><head/><body><p>Enter the Master Key (found on<span style=\" font-weight:600;\"> UDS Configuration</span> section) of the UDS Broker to allow communication of the Actor with Broker</p></body></html>", None))
-        self.label_4.setText(_translate("UdsActorSetupDialog", "Security", None))
-        self.useSSl.setToolTip(_translate("UdsActorSetupDialog", "Select communication security with broker", None))
-        self.useSSl.setWhatsThis(_translate("UdsActorSetupDialog", "<html><head/><body><p>Select the security for communications with UDS Broker.</p><p>The recommended method of communication is <span style=\" font-weight:600;\">Use SSL</span>, but selection needs to be acording to your broker configuration.</p></body></html>", None))
-        self.useSSl.setItemText(0, _translate("UdsActorSetupDialog", "Do not use SSL", None))
-        self.useSSl.setItemText(1, _translate("UdsActorSetupDialog", "Use SSL", None))
-        self.logLevelLabel.setText(_translate("UdsActorSetupDialog", "Log Level", None))
-

actors/src/test.py

@@ -1,215 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import urllib3
-from udsactor import operations
-from udsactor import store
-from udsactor import REST
-from udsactor import ipc
-from udsactor import httpserver
-
-from time import sleep
-
-import random
-import requests
-import json
-import logging
-
-
-def testRest():
-    # cfg = store.readConfig()
-    cfg = {'host': '172.27.0.1:8000', 'masterKey': '8f914604ad2c5c558575856299866bbb', 'ssl': False}
-    print(cfg)
-    print("Intefaces: ", list(operations.getNetworkInfo()))
-    print("Joined Domain: ", operations.getDomainName())
-
-    # renameComputer('win7-64')
-    # joinDomain('dom.dkmon.com', 'ou=pruebas_2,dc=dom,dc=dkmon,dc=com', 'administrador@dom.dkmon.com', 'Temporal2012', True)
-    # reboot()
-    r = REST.Api(cfg['host'], cfg['masterKey'], cfg['ssl'], scrambledResponses=True)
-    print("Connected: {}".format(r.isConnected))
-    r.test()
-    try:
-        r.init('02:46:00:00:00:07')
-    except REST.UnmanagedHostError:
-        print('Unmanaged host (confirmed)')
-
-    uuid = r.init('02:46:00:00:00:08')
-    print("Notify comm:", r.notifyComm('http://172.27.0.1:8000/'))
-
-    print("Connected: {}".format(r.isConnected))
-
-    print('uuid = {}'.format(uuid))
-
-    # print 'Login: {}'.format(r.login('test-user'))
-    # print 'Logout: {}'.format(r.logout('test-user'))
-    print("Information: >>{}<<".format(r.information()))
-    print("Login: >>{}<<".format(r.login('Pepito')))
-
-    print(r.setReady([(v.mac, v.ip) for v in operations.getNetworkInfo()]))
-    print(r.log(10000, 'Test error message'))
-
-
-def ipcTest():
-    s = ipc.ServerIPC(39188)  # I have got the enterprise number for Virtual Cable. This number is not about ports, but as good as any other selection :)
-
-    s.start()
-
-    sleep(1)
-
-    client = ipc.ClientIPC(39188)
-    client.start()
-    client2 = ipc.ClientIPC(39188)
-    client2.start()
-
-    print("Requesting information")
-    client.requestInformation()
-    print("Sending login info")
-    client.sendLogin('user1')
-    print("Sending logout info")
-    client.sendLogout('mariete' * 1000)
-
-    print('Sending message')
-    s.sendMessage(ipc.MSG_LOGOFF, None)
-    s.sendMessage(ipc.MSG_MESSAGE, 'Cierra la sesión')
-    s.sendMessage(33, 'invalid')
-    s.sendMessage(ipc.MSG_SCRIPT, 'print "hello"')
-    print('Message sent')
-
-    for c in (client, client2):
-        print(c.getMessage())
-        print(c.getMessage())
-        print(c.getMessage())
-
-    client.stop()
-    client.join()
-
-    s.sendMessage(ipc.MSG_LOGOFF, None)
-    s.sendMessage(ipc.MSG_MESSAGE, 'Cierra la sesión')
-    s.sendMessage(33, 'invalid')
-    s.sendMessage(ipc.MSG_SCRIPT, 'print "hello"')
-
-    print(client2.getMessage())
-    print(client2.getMessage())
-    print(client2.getMessage())
-
-    client2.stop()
-    s.stop()
-    client2.join()
-    s.join()
-
-
-def ipcServer():
-    s = ipc.ServerIPC(39188, {'idle': 180})  # I have got the enterprise number for Virtual Cable. This number is not about ports, but as good as any other selection :)
-
-    s.start()
-
-    counter = 0
-    while True:
-        try:
-            counter += 1
-            print("Sending new message {}".format(counter))
-            s.sendMessage(ipc.MSG_MESSAGE, 'This is a test message ñöitó 33.3€ {}'.format(counter))
-            counter += 1
-            s.sendMessage(ipc.MSG_SCRIPT, 'print "This is a test message ñöitó 33.3€ {}"'.format(counter))
-            counter += 1
-            s.sendMessage(ipc.MSG_LOGOFF, None)
-            sleep(1)
-        except:
-            break
-
-    s.stop()
-
-
-def testIdle():
-    for _ in range(1, 10):
-        print(operations.getIdleDuration())
-        sleep(1)
-
-
-def testServer():
-
-    # Disable verify warinings
-    logging.getLogger("requests").setLevel(logging.ERROR)
-    urllib3.disable_warnings()  # @UndefinedVariable
-
-    s = ipc.ServerIPC(39188)  # I have got the enterprise number for Virtual Cable. This number is not about ports, but as good as any other selection :)
-
-    s.start()
-
-    client = ipc.ClientIPC(39188)
-    client.start()
-
-    while True:
-        try:
-            port = random.randrange(32000, 64000)
-            server = httpserver.HTTPServerThread(('172.27.0.8', port), s)
-            break
-        except:
-            pass
-
-    serverUrl = server.getServerUrl()
-    server.start()
-
-    print(serverUrl)
-
-    res = requests.post(serverUrl + '/message', data=json.dumps({'message': 'Test message'}), headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-    res = requests.post(serverUrl + '/script', data=json.dumps({'script': 'import time\ntime.sleep(1)\nfor v in xrange(10): print "Hello world, this is an script"'}), headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-    res = requests.post(serverUrl + '/script', data=json.dumps({'script': 'print "Hello world, this is an script"', 'user': True}), headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-    res = requests.get(serverUrl + '/information?param1=1&param2=2', headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-    print("Messages:")
-    print(client.getMessage())
-    print(client.getMessage())
-
-    # try:
-    #    while True:
-    #        Sleep(1000)
-    # except:
-    #    pass
-
-    server.stop()
-    s.stop()
-    client.stop()
-
-
-def testRemote():
-    serverUrl = "https://172.27.0.208:52562/633a1245873848b7b4017c23283bc195"
-    print(serverUrl)
-
-    res = requests.post(serverUrl + '/message', data=json.dumps({'message': 'Test message'}), headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-    res = requests.post(serverUrl + '/script', data=json.dumps({'script': 'import time\ntime.sleep(1)\nfor v in xrange(10): print "Hello world, this is an script"'}), headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-    res = requests.post(serverUrl + '/script', data=json.dumps({'script': 'print "Hello world, this is an script"', 'user': True}), headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-    res = requests.get(serverUrl + '/information?param1=1&param2=2', headers={'content-type': 'application/json'}, verify=False)
-    print(res)
-    print(res.json())
-
-
-if __name__ == '__main__':
-    # ipcServer()
-    # ipcTest()
-    testRest()
-    # testIdle()
-    # testServer()
-    # testRemote()
-

actors/src/udsactor/REST.py

@@ -1,232 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 201 Virtual Cable S.L.
-# 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. 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
-'''
-
-# pylint: disable-msg=E1101,W0703
-
-from __future__ import unicode_literals
-
-import requests
-import logging
-import json
-import uuid
-import six
-import warnings
-
-from udsactor.log import logger
-
-from udsactor import __version__ as VERSION
-from .utils import exceptionToMessage
-
-VERIFY_CERT = False
-
-
-class RESTError(Exception):
-    ERRCODE = 0
-
-
-class ConnectionError(RESTError):
-    ERRCODE = -1
-
-
-# Errors ""raised"" from broker
-class InvalidKeyError(RESTError):
-    ERRCODE = 1
-
-
-class UnmanagedHostError(RESTError):
-    ERRCODE = 2
-
-
-class UserServiceNotFoundError(RESTError):
-    ERRCODE = 3
-
-
-class OsManagerError(RESTError):
-    ERRCODE = 4
-
-
-# Disable warnings log messages
-try:
-    import urllib3  # @UnusedImport
-except Exception:
-    from requests.packages import urllib3  # @Reimport
-
-try:
-    urllib3.disable_warnings()  # @UndefinedVariable
-    warnings.simplefilter("ignore")
-except Exception:
-    pass  # In fact, isn't too important, but wil log warns to logging file
-
-
-def ensureResultIsOk(result):
-    if 'error' not in result:
-        return
-
-    for i in (InvalidKeyError, UnmanagedHostError, UserServiceNotFoundError, OsManagerError):
-        if result['error'] == i.ERRCODE:
-            raise i(result['result'])
-
-    err = RESTError(result['result'])
-    err.ERRCODE = result['error']
-    raise err
-
-
-class Api(object):
-    def __init__(self, host, masterKey, ssl):
-        self.host = host
-        self.masterKey = masterKey
-        self.useSSL = True if ssl else False
-        self.uuid = None
-        self.mac = None
-        self.url = "{}://{}/rest/actor/".format(('http', 'https')[self.useSSL], self.host)
-        self.idle = None
-        self.secretKey = six.text_type(uuid.uuid4())
-        try:
-            self.newerRequestLib = requests.__version__.split('.')[0] >= '1'
-        except Exception:
-            self.newerRequestLib = False  # I no version, guess this must be an old requests
-
-        # Disable logging requests messages except for errors, ...
-        logging.getLogger("requests").setLevel(logging.CRITICAL)
-        # Tries to disable all warnings
-        try:
-            warnings.simplefilter("ignore")  # Disables all warnings
-        except Exception:
-            pass
-
-    def _getUrl(self, method, key=None, ids=None):
-        url = self.url + method
-        params = []
-        if key is not None:
-            params.append('key=' + key)
-        if ids is not None:
-            params.append('id=' + ids)
-            params.append('version=' + VERSION)
-
-        if len(params) > 0:
-            url += '?' + '&'.join(params)
-
-        return url
-
-    def _request(self, url, data=None):
-        try:
-            if data is None:
-                # Old requests version does not support verify, but they do not checks ssl certificate by default
-                if self.newerRequestLib:
-                    r = requests.get(url, verify=VERIFY_CERT)
-                else:
-                    logger.debug('Requesting with old')
-                    r = requests.get(url)  # Always ignore certs??
-            else:
-                if self.newerRequestLib:
-                    r = requests.post(url, data=data, headers={'content-type': 'application/json'}, verify=VERIFY_CERT)
-                else:
-                    logger.debug('Requesting with old')
-                    r = requests.post(url, data=data, headers={'content-type': 'application/json'})
-
-            r = json.loads(r.content)  # Using instead of r.json() to make compatible with oooold rquests lib versions
-        except requests.exceptions.RequestException as e:
-            raise ConnectionError(e)
-        except Exception as e:
-            raise ConnectionError(exceptionToMessage(e))
-
-        ensureResultIsOk(r)
-
-        return r
-
-    @property
-    def isConnected(self):
-        return self.uuid is not None
-
-    def test(self):
-        url = self._getUrl('test', self.masterKey)
-        return self._request(url)['result']
-
-    def init(self, ids):
-        '''
-        Ids is a comma separated values indicating MAC=ip
-        Server returns:
-          uuid, mac
-          Optionally can return an third parameter, that is max "idle" request time
-        '''
-        logger.debug('Invoking init')
-        url = self._getUrl('init', key=self.masterKey, ids=ids)
-        res = self._request(url)['result']
-        logger.debug('Got response parameters: {}'.format(res))
-        self.uuid, self.mac = res[0:2]
-        self.idle = int(res[2])
-        if self.idle < 30:
-            self.idle = None  # No values under 30 seconds are allowed :)
-
-        return self.uuid
-
-    def postMessage(self, msg, data, processData=True):
-        logger.debug('Invoking post message {} with data {}'.format(msg, data))
-
-        if self.uuid is None:
-            raise ConnectionError('REST api has not been initialized')
-
-        if processData:
-            data = json.dumps({'data': data})
-        url = self._getUrl('/'.join([self.uuid, msg]))
-        return self._request(url, data)['result']
-
-    def notifyComm(self, url):
-        logger.debug('Notifying comms {}'.format(url))
-        return self.postMessage('notifyComms', url)
-
-    def login(self, username):
-        logger.debug('Notifying login {}'.format(username))
-        return self.postMessage('login', username)
-
-    def logout(self, username):
-        logger.debug('Notifying logout {}'.format(username))
-        return self.postMessage('logout', username)
-
-    def information(self):
-        logger.debug('Requesting information'.format())
-        return self.postMessage('information', '')
-
-    def setReady(self, ipsInfo):
-        logger.debug('Notifying readyness: {}'.format(ipsInfo))
-        data = ','.join(['{}={}'.format(v[0], v[1]) for v in ipsInfo])
-        return self.postMessage('ready', data)
-
-    def notifyIpChanges(self, ipsInfo):
-        logger.debug('Notifying ip changes: {}'.format(ipsInfo))
-        data = ','.join(['{}={}'.format(v[0], v[1]) for v in ipsInfo])
-        return self.postMessage('ip', data)
-
-    def log(self, logLevel, message):
-        data = json.dumps({'message': message, 'level': logLevel})
-        return self.postMessage('log', data, processData=False)
-

actors/src/udsactor/certs.py

@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-
-from tempfile import gettempdir
-from os.path import exists, join
-
-CERTFILE = 'UDSActor.pem'
-
-
-def createSelfSignedCert(force=False):
-
-    certFile = join(gettempdir(), CERTFILE)
-
-    if exists(certFile) and not force:
-        return certFile
-
-    certData = '''-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCb50K3mIznNklz
-yVAD7xSQOSJQ6+NPXj7U9/4zLZ+TvmbQ7RqUUsxbfxHbeRnoYTWV2nKk4+tHqmvz
-ujLSS/loFhTSMqtrLn7rowSYJoQhKOUkAiQlWkqCfItWgL5pJopDpNHFul9Rn3ds
-PMWQTiGeUNR4Y3RnBhr1Q1BsqAzf4m6zFUmgLPPmVLdF4uJ3Tuz8TSy2gWLs5aSr
-5do4WamwUfYjRSVMJECmwjUM4rQ8SQgg0sHBeBuDUGNBvBQFac1G7qUcMReeu8Zr
-DUtMsXma/l4rA8NB5CRmTrQbTBF4l+jb2BDFebDqDUK1Oqs9X35yOQfDOAFYHiix
-PX0IsXOZAgMBAAECggEBAJi3000RrIUZUp6Ph0gzPMuCjDEEwWiQA7CPNX1gpb8O
-dp0WhkDhUroWIaICYPSXtOwUTtVjRqivMoxPy1Thg3EIoGC/rdeSdlXRHMEGicwJ
-yVyalFnatr5Xzg5wkxVh4XMd0zeDt7e3JD7s0QLo5lm1CEzd77qz6lhzFic5/1KX
-bzdULtTlq60dazg2hEbcS4OmM1UMCtRVDAsOIUIZPL0M9j1C1d1iEdYnh2xshKeG
-/GOfo95xsgdMlGjtv3hUT5ryKVoEsu+36rGb4VfhPfUvvoVbRx5QZpW+QvxaYh5E
-Fi0JEROozFwG31Y++8El7J3yQko8cFBa1lYYUwwpNAECgYEAykT+GiM2YxJ4uVF1
-OoKiE9BD53i0IG5j87lGPnWqzEwYBwnqjEKDTou+uzMGz3MDV56UEFNho7wUWh28
-LpEkjJB9QgbsugjxIBr4JoL/rYk036e/6+U8I95lvYWrzb+rBMIkRDYI7kbQD/mQ
-piYUpuCkTymNAu2RisK6bBzJslkCgYEAxVE23OQvkCeOV8hJNPZGpJ1mDS+TiOow
-oOScMZmZpail181eYbAfMsCr7ri812lSj98NvA2GNVLpddil6LtS1cQ5p36lFBtV
-xQUMZiFz4qVbEak+izL+vPaev/mXXsOcibAIQ+qI/0txFpNhJjpaaSy6vRCBYFmc
-8pgSoBnBI0ECgYAUKCn2atnpp5aWSTLYgNosBU4vDA1PShD14dnJMaqyr0aZtPhF
-v/8b3btFJoGgPMLxgWEZ+2U4ju6sSFhPf7FXvLJu2QfQRkHZRDbEh7t5DLpTK4Fp
-va9vl6Ml7uM/HsGpOLuqfIQJUs87OFCc7iCSvMJDDU37I7ekT2GKkpfbCQKBgBrE
-0NeY0WcSJrp7/oqD2sOcYurpCG/rrZs2SIZmGzUhMxaa0vIXzbO59dlWELB8pmnE
-Tf20K//x9qA5OxDe0PcVPukdQlH+/1zSOYNliG44FqnHtyd1TJ/gKVtMBiAiE4uO
-aSClod5Yosf4SJbCFd/s5Iyfv52NqsAyp1w3Aj/BAoGAVCnEiGUfyHlIR+UH4zZW
-GXJMeqdZLfcEIszMxLePkml4gUQhoq9oIs/Kw+L1DDxUwzkXN4BNTlFbOSu9gzK1
-dhuIUGfS6RPL88U+ivC3A0y2jT43oUMqe3hiRt360UQ1GXzp2dMnR9odSRB1wHoO
-IOjEBZ8341/c9ZHc5PCGAG8=
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIJAIrEIthCfxUCMA0GCSqGSIb3DQEBCwUAMIGNMQswCQYD
-VQQGEwJFUzEPMA0GA1UECAwGTWFkcmlkMREwDwYDVQQHDAhBbGNvcmNvbjEMMAoG
-A1UECgwDVURTMQ4wDAYDVQQLDAVBY3RvcjESMBAGA1UEAwwJVURTIEFjdG9yMSgw
-JgYJKoZIhvcNAQkBFhlzdXBwb3J0QHVkc2VudGVycHJpc2UuY29tMB4XDTE0MTAy
-NjIzNDEyNFoXDTI0MTAyMzIzNDEyNFowgY0xCzAJBgNVBAYTAkVTMQ8wDQYDVQQI
-DAZNYWRyaWQxETAPBgNVBAcMCEFsY29yY29uMQwwCgYDVQQKDANVRFMxDjAMBgNV
-BAsMBUFjdG9yMRIwEAYDVQQDDAlVRFMgQWN0b3IxKDAmBgkqhkiG9w0BCQEWGXN1
-cHBvcnRAdWRzZW50ZXJwcmlzZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCb50K3mIznNklzyVAD7xSQOSJQ6+NPXj7U9/4zLZ+TvmbQ7RqUUsxb
-fxHbeRnoYTWV2nKk4+tHqmvzujLSS/loFhTSMqtrLn7rowSYJoQhKOUkAiQlWkqC
-fItWgL5pJopDpNHFul9Rn3dsPMWQTiGeUNR4Y3RnBhr1Q1BsqAzf4m6zFUmgLPPm
-VLdF4uJ3Tuz8TSy2gWLs5aSr5do4WamwUfYjRSVMJECmwjUM4rQ8SQgg0sHBeBuD
-UGNBvBQFac1G7qUcMReeu8ZrDUtMsXma/l4rA8NB5CRmTrQbTBF4l+jb2BDFebDq
-DUK1Oqs9X35yOQfDOAFYHiixPX0IsXOZAgMBAAGjUDBOMB0GA1UdDgQWBBRShS90
-5lJTNvYPIEqP3GxWwG5iiDAfBgNVHSMEGDAWgBRShS905lJTNvYPIEqP3GxWwG5i
-iDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAU0Sp4gXhQmRVzq+7+
-vRFUkQuPj4Ga/d9r5Wrbg3hck3+5pwe9/7APoq0P/M0DBhQpiJKjrD6ydUevC+Y/
-43ZOJPhMlNw0o6TdQxOkX6FDwQanLLs7sfvJvqtVzYn3nuRFKT3dvl7Zg44QMw2M
-ay42q59fAcpB4LaDx/i7gOYSS5eca3lYW7j7YSr/+ozXK2KlgUkuCUHN95lOq+dF
-trmV9mjzM4CNPZqKSE7kpHRywgrXGPCO000NvEGSYf82AtgRSFKiU8NWLQSEPdcB
-k//2dsQZw2cRZ8DrC2B6Tb3M+3+CA6wVyqfqZh1SZva3LfGvq/C+u+ItguzPqNpI
-xtvM
------END CERTIFICATE-----'''
-    with open(certFile, "wt") as f:
-        f.write(certData)
-
-    return certFile

actors/src/udsactor/httpserver.py

@@ -1,198 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-from udsactor.log import logger
-from udsactor import utils
-from udsactor.certs import createSelfSignedCert
-from udsactor.scriptThread import ScriptExecutorThread
-
-import threading
-import string
-import random
-import json
-import six
-from six.moves import socketserver  # @UnresolvedImport, pylint: disable=import-error
-from six.moves import BaseHTTPServer  # @UnresolvedImport, pylint: disable=import-error
-import time
-
-import ssl
-
-startTime = time.time()
-
-
-class HTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-    uuid = None
-    service = None
-    lock = threading.Lock()
-
-    def sendJsonError(self, code, message):
-        self.send_response(code)
-        self.send_header('Content-type', 'application/json')
-        self.end_headers()
-        self.wfile.write(json.dumps({'error': message}))
-        return
-
-    def do_GET(self):
-        # Very simple path & params splitter
-        path = self.path.split('?')[0][1:].split('/')
-        try:
-            params = dict((v.split('=') for v in self.path.split('?')[1].split('&')))
-        except Exception:
-            params = {}
-
-        if path[0] != HTTPServerHandler.uuid:
-            self.sendJsonError(403, 'Forbidden')
-            return
-
-        if len(path) != 2:
-            self.send_response(200)
-            self.send_header('Content-type', 'application/json')
-            self.end_headers()
-            # Send the html message
-            self.wfile.write(json.dumps("UDS Actor has been running for {} seconds".format(time.time() - startTime)))
-            return
-
-        try:
-            operation = getattr(self, 'get_' + path[1])
-            result = operation(params)  # Protect not POST methods
-        except AttributeError:
-            self.sendJsonError(404, 'Method not found')
-            return
-        except Exception as e:
-            logger.error('Got exception executing GET {}: {}'.format(path[1], utils.toUnicode(e.message)))
-            self.sendJsonError(500, str(e))
-            return
-
-        self.send_response(200)
-        self.send_header('Content-type', 'application/json')
-        self.end_headers()
-        # Send the html message
-        self.wfile.write(json.dumps(result))
-
-    def do_POST(self):
-        path = self.path.split('?')[0][1:].split('/')
-        if path[0] != HTTPServerHandler.uuid:
-            self.sendJsonError(403, 'Forbidden')
-            return
-
-        if len(path) != 2:
-            self.sendJsonError(400, 'Invalid request')
-            return
-
-        try:
-            HTTPServerHandler.lock.acquire()
-            length = int(self.headers.getheader('content-length'))
-            content = self.rfile.read(length)
-            print(length, ">>", content, '<<')
-            params = json.loads(content)
-
-            operation = getattr(self, 'post_' + path[1])
-            result = operation(params)  # Protect not POST methods
-        except AttributeError:
-            self.sendJsonError(404, 'Method not found')
-            return
-        except Exception as e:
-            logger.error('Got exception executing POST {}: {}'.format(path[1], utils.toUnicode(e.message)))
-            self.sendJsonError(500, str(e))
-            return
-        finally:
-            HTTPServerHandler.lock.release()
-
-        self.send_response(200)
-        self.send_header('Content-type', 'application/json')
-        self.end_headers()
-        # Send the html message
-        self.wfile.write(json.dumps(result))
-
-    def post_logoff(self, params):
-        logger.debug('Sending LOGOFF to clients')
-        HTTPServerHandler.service.ipc.sendLoggofMessage()
-        return 'ok'
-
-    # Alias
-    post_logout = post_logoff
-
-    def post_message(self, params):
-        logger.debug('Sending MESSAGE to clients')
-        if 'message' not in params:
-            raise Exception('Invalid message parameters')
-        HTTPServerHandler.service.ipc.sendMessageMessage(params['message'])
-        return 'ok'
-
-    def post_script(self, params):
-        logger.debug('Received script: {}'.format(params))
-        if 'script' not in params:
-            raise Exception('Invalid script parameters')
-        if 'user' in params:
-            logger.debug('Sending SCRIPT to clients')
-            HTTPServerHandler.service.ipc.sendScriptMessage(params['script'])
-        else:
-            # Execute script at server space, that is, here
-            # as a secondary thread
-            th = ScriptExecutorThread(params['script'])
-            th.start()
-        return 'ok'
-
-    def post_preConnect(self, params):
-        logger.debug('Received Pre connection')
-        if 'user' not in params or 'protocol' not in params:
-            raise Exception('Invalid preConnect parameters')
-        return HTTPServerHandler.service.preConnect(params.get('user'), params.get('protocol'))
-
-    def get_information(self, params):
-        # TODO: Return something useful? :)
-        return 'Information'
-
-
-class HTTPServerThread(threading.Thread):
-    def __init__(self, address, service):
-        super(self.__class__, self).__init__()
-
-        if HTTPServerHandler.uuid is None:
-            HTTPServerHandler.uuid = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(48))
-
-        HTTPServerHandler.service = service
-
-        self.certFile = createSelfSignedCert()
-        self.server = socketserver.TCPServer(address, HTTPServerHandler)
-        self.server.socket = ssl.wrap_socket(self.server.socket, certfile=self.certFile, server_side=True)
-
-    def getServerUrl(self):
-        return 'https://{}:{}/{}'.format(self.server.server_address[0], self.server.server_address[1], HTTPServerHandler.uuid)
-
-    def stop(self):
-        logger.debug('Stopping REST Service')
-        self.server.shutdown()
-
-    def run(self):
-        self.server.serve_forever()

actors/src/udsactor/ipc.py

@@ -1,421 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import socket
-import threading
-import sys
-import six
-import traceback
-import pickle
-
-from udsactor.utils import toUnicode
-from udsactor.log import logger
-
-# The IPC Server will wait for connections from clients
-# Clients will open socket, and wait for data from server
-# The messages sent (from server) will be the following (subject to future changes):
-#     Message_id     Data               Action
-#    ------------  --------         --------------------------
-#    MSG_LOGOFF     None            Logout user from session
-#    MSG_MESSAGE    message,level   Display a message with level (INFO, WARN, ERROR, FATAL)     # TODO: Include level, right now only has message
-#    MSG_SCRIPT     python script   Execute an specific python script INSIDE CLIENT environment (this messages is not sent right now)
-# The messages received (sent from client) will be the following:
-#     Message_id       Data               Action
-#    ------------    --------         --------------------------
-#    REQ_LOGOUT                   Logout user from session
-#    REQ_INFORMATION  None            Request information from ipc server (maybe configuration parameters in a near future)
-#    REQ_LOGIN        python script   Execute an specific python script INSIDE CLIENT environment (this messages is not sent right now)
-#
-# All messages are in the form:
-# BYTE
-#  0           1-2                        3 4 ...
-# MSG_ID   DATA_LENGTH (little endian)    Data (can be 0 length)
-# With a previos "MAGIC" header in fron of each message
-
-MSG_LOGOFF = 0xA1
-MSG_MESSAGE = 0xB2
-MSG_SCRIPT = 0xC3
-MSG_INFORMATION = 0xD4
-
-# Request messages
-REQ_INFORMATION = MSG_INFORMATION
-REQ_LOGIN = 0xE5
-REQ_LOGOUT = MSG_LOGOFF
-
-VALID_MESSAGES = (MSG_LOGOFF, MSG_MESSAGE, MSG_SCRIPT, MSG_INFORMATION)
-
-REQ_INFORMATION = 0xAA
-
-# Reverse msgs dict for debugging
-REV_DICT = {
-    MSG_LOGOFF: 'MSG_LOGOFF',
-    MSG_MESSAGE: 'MSG_MESSAGE',
-    MSG_SCRIPT: 'MSG_SCRIPT',
-    MSG_INFORMATION: 'MSG_INFORMATION',
-    REQ_LOGIN: 'REQ_LOGIN',
-    REQ_LOGOUT: 'REQ_LOGOUT'
-}
-
-MAGIC = b'\x55\x44\x53\x00'  # UDS in hexa with a padded 0 to the right
-
-
-# Allows notifying login/logout from client for linux platform
-ALLOW_LOG_METHODS = sys.platform != 'win32'
-
-
-# States for client processor
-ST_SECOND_BYTE = 0x01
-ST_RECEIVING = 0x02
-ST_PROCESS_MESSAGE = 0x02
-
-
-class ClientProcessor(threading.Thread):
-    def __init__(self, parent, clientSocket):
-        super(self.__class__, self).__init__()
-        self.parent = parent
-        self.clientSocket = clientSocket
-        self.running = False
-        self.messages = six.moves.queue.Queue(32)  # @UndefinedVariable
-
-    def stop(self):
-        logger.debug('Stoping client processor')
-        self.running = False
-
-    def processRequest(self, msg, data):
-        logger.debug('Got Client message {}={}'.format(msg, REV_DICT.get(msg)))
-        if self.parent.clientMessageProcessor is not None:
-            self.parent.clientMessageProcessor(msg, data)
-
-    def run(self):
-        self.running = True
-        self.clientSocket.setblocking(0)
-
-        state = None
-        recv_msg = None
-        recv_data = None
-        while self.running:
-            try:
-                counter = 1024
-                while counter > 0:  # So we process at least the incoming queue every XX bytes readed
-                    counter -= 1
-                    b = self.clientSocket.recv(1)
-                    if b == b'':
-                        # Client disconnected
-                        self.running = False
-                        break
-                    buf = six.byte2int(b)  # Empty buffer, this is set as non-blocking
-                    if state is None:
-                        if buf in (REQ_INFORMATION, REQ_LOGIN, REQ_LOGOUT):
-                            logger.debug('State set to {}'.format(buf))
-                            state = buf
-                            recv_msg = buf
-                            continue  # Get next byte
-                        else:
-                            logger.debug('Got unexpected data {}'.format(buf))
-                    elif state in (REQ_INFORMATION, REQ_LOGIN, REQ_LOGOUT):
-                        logger.debug('First length byte is {}'.format(buf))
-                        msg_len = buf
-                        state = ST_SECOND_BYTE
-                        continue
-                    elif state == ST_SECOND_BYTE:
-                        msg_len += buf << 8
-                        logger.debug('Second length byte is {}, len is {}'.format(buf, msg_len))
-                        if msg_len == 0:
-                            self.processRequest(recv_msg, None)
-                            state = None
-                            break
-                        state = ST_RECEIVING
-                        recv_data = b''
-                        continue
-                    elif state == ST_RECEIVING:
-                        recv_data += six.int2byte(buf)
-                        msg_len -= 1
-                        if msg_len == 0:
-                            self.processRequest(recv_msg, recv_data)
-                            recv_data = None
-                            state = None
-                            break
-                    else:
-                        logger.debug('Got invalid message from request: {}, state: {}'.format(buf, state))
-            except socket.error as e:
-                # If no data is present, no problem at all, pass to check messages
-                pass
-            except Exception as e:
-                tb = traceback.format_exc()
-                logger.error('Error: {}, trace: {}'.format(e, tb))
-
-            if self.running is False:
-                break
-
-            try:
-                msg = self.messages.get(block=True, timeout=1)
-            except six.moves.queue.Empty:  # No message got in time @UndefinedVariable
-                continue
-
-            logger.debug('Got message {}={}'.format(msg, REV_DICT.get(msg)))
-
-            try:
-                m = msg[1] if msg[1] is not None else b''
-                l = len(m)
-                data = MAGIC + six.int2byte(msg[0]) + six.int2byte(l & 0xFF) + six.int2byte(l >> 8) + m
-                try:
-                    self.clientSocket.sendall(data)
-                except socket.error as e:
-                    # Send data error
-                    logger.debug('Socket connection is no more available: {}'.format(e.args))
-                    self.running = False
-            except Exception as e:
-                logger.error('Invalid message in queue: {}'.format(e))
-
-        logger.debug('Client processor stopped')
-        try:
-            self.clientSocket.close()
-        except Exception:
-            pass  # If can't close, nothing happens, just end thread
-
-
-class ServerIPC(threading.Thread):
-
-    def __init__(self, listenPort, clientMessageProcessor=None):
-        super(self.__class__, self).__init__()
-        self.port = listenPort
-        self.running = False
-        self.serverSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.serverSocket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.threads = []
-        self.clientMessageProcessor = clientMessageProcessor
-
-    def stop(self):
-        logger.debug('Stopping Server IPC')
-        self.running = False
-        for t in self.threads:
-            t.stop()
-        socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect(('localhost', self.port))
-        self.serverSocket.close()
-
-        for t in self.threads:
-            t.join()
-
-    def sendMessage(self, msgId, msgData):
-        '''
-        Notify message to all listening threads
-        '''
-        logger.debug('Sending message {}({}),{} to all clients'.format(msgId, REV_DICT.get(msgId), msgData))
-
-        # Convert to bytes so length is correctly calculated
-        if isinstance(msgData, six.text_type):
-            msgData = msgData.encode('utf8')
-
-        for t in self.threads:
-            if t.isAlive():
-                logger.debug('Sending to {}'.format(t))
-                t.messages.put((msgId, msgData))
-
-    def sendLoggofMessage(self):
-        self.sendMessage(MSG_LOGOFF, '')
-
-    def sendMessageMessage(self, message):
-        self.sendMessage(MSG_MESSAGE, message)
-
-    def sendScriptMessage(self, script):
-        self.sendMessage(MSG_SCRIPT, script)
-
-    def sendInformationMessage(self, info):
-        self.sendMessage(MSG_INFORMATION, pickle.dumps(info))
-
-    def cleanupFinishedThreads(self):
-        '''
-        Cleans up current threads list
-        '''
-        aliveThreads = []
-        for t in self.threads:
-            if t.isAlive():
-                logger.debug('Thread {} is alive'.format(t))
-                aliveThreads.append(t)
-        self.threads[:] = aliveThreads
-
-    def run(self):
-        self.running = True
-
-        self.serverSocket.bind(('localhost', self.port))
-        self.serverSocket.setblocking(1)
-        self.serverSocket.listen(4)
-
-        while True:
-            try:
-                (clientSocket, address) = self.serverSocket.accept()
-                # Stop processing if thread is mean to stop
-                if self.running is False:
-                    break
-                logger.debug('Got connection from {}'.format(address))
-
-                self.cleanupFinishedThreads()  # House keeping
-
-                logger.debug('Starting new thread, current: {}'.format(self.threads))
-                t = ClientProcessor(self, clientSocket)
-                self.threads.append(t)
-                t.start()
-            except Exception as e:
-                logger.error('Got an exception on Server ipc thread: {}'.format(e))
-
-
-class ClientIPC(threading.Thread):
-    def __init__(self, listenPort):
-        super(ClientIPC, self).__init__()
-        self.port = listenPort
-        self.running = False
-        self.clientSocket = None
-        self.messages = six.moves.queue.Queue(32)  # @UndefinedVariable
-
-        self.connect()
-
-    def stop(self):
-        self.running = False
-
-    def getMessage(self):
-        while self.running:
-            try:
-                return self.messages.get(timeout=1)
-            except six.moves.queue.Empty:  # @UndefinedVariable
-                continue
-
-        return None
-
-    def sendRequestMessage(self, msg, data=None):
-        logger.debug('Sending request for msg: {}({}), {}'.format(msg, REV_DICT.get(msg), data))
-        if data is None:
-            data = b''
-
-        if isinstance(data, six.text_type):  # Convert to bytes if necessary
-            data = data.encode('utf-8')
-
-        l = len(data)
-        msg = six.int2byte(msg) + six.int2byte(l & 0xFF) + six.int2byte(l >> 8) + data
-        self.clientSocket.sendall(msg)
-
-    def requestInformation(self):
-        self.sendRequestMessage(REQ_INFORMATION)
-
-    def sendLogin(self, username):
-        self.sendRequestMessage(REQ_LOGIN, username)
-
-    def sendLogout(self, username):
-        self.sendRequestMessage(REQ_LOGOUT, username)
-
-    def messageReceived(self):
-        '''
-        Override this method to automatically get notified on new message
-        received. Message is at self.messages queue
-        '''
-        pass  # Messa
-
-    def receiveBytes(self, number):
-        msg = b''
-        while self.running and len(msg) < number:
-            try:
-                buf = self.clientSocket.recv(number - len(msg))
-                if buf == b'':
-                    logger.debug('Buf {}, msg {}({})'.format(buf, msg, REV_DICT.get(msg)))
-                    self.running = False
-                    break
-                msg += buf
-            except socket.timeout:
-                pass
-
-        if self.running is False:
-            logger.debug('Not running, returning None')
-            return None
-        return msg
-
-    def connect(self):
-        self.clientSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.clientSocket.connect(('localhost', self.port))
-        self.clientSocket.settimeout(2)  # 2 seconds timeout
-
-    def run(self):
-        self.running = True
-
-        while self.running:
-            try:
-                msg = b''
-                # We look for magic message header
-                while self.running:  # Wait for MAGIC
-                    try:
-                        buf = self.clientSocket.recv(len(MAGIC) - len(msg))
-                        if buf == b'':
-                            self.running = False
-                            break
-                        msg += buf
-                        if len(msg) != len(MAGIC):
-                            continue  # Do not have message
-                        if msg != MAGIC:  # Skip first byte an continue searchong
-                            msg = msg[1:]
-                            continue
-                        break
-                    except socket.timeout:  # Timeout is here so we can get stop thread
-                        continue
-
-                if self.running is False:
-                    break
-
-                # Now we get message basic data (msg + datalen)
-                msg = bytearray(self.receiveBytes(3))
-
-                # We have the magic header, here comes the message itself
-                if msg is None:
-                    continue
-
-                msgId = msg[0]
-                dataLen = msg[1] + (msg[2] << 8)
-                if msgId not in VALID_MESSAGES:
-                    raise Exception('Invalid message id: {}'.format(msgId))
-
-                data = self.receiveBytes(dataLen)
-                if data is None:
-                    continue
-
-                self.messages.put((msgId, data))
-                self.messageReceived()
-
-            except socket.error as e:
-                logger.error('Communication with server got an error: {}'.format(toUnicode(e.strerror)))
-                self.running = False
-                return
-            except Exception as e:
-                tb = traceback.format_exc()
-                logger.error('Error: {}, trace: {}'.format(e, tb))
-
-        try:
-            self.clientSocket.close()
-        except Exception:
-            pass  # If can't close, nothing happens, just end thread
-

actors/src/udsactor/linux/UDSActorService.py

@@ -1,161 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-from udsactor import operations
-
-from udsactor.service import CommonService
-from udsactor.service import initCfg
-from udsactor.service import IPC_PORT
-from udsactor import ipc
-
-from udsactor.log import logger
-
-from udsactor.linux.daemon import Daemon
-from udsactor.linux import renamer
-
-import sys
-import time
-try:
-    from prctl import set_proctitle
-except Exception:  # Platform may not include prctl, so in case it's not available, we let the "name" as is
-    def set_proctitle(_):
-        pass
-
-
-class UDSActorSvc(Daemon, CommonService):
-    def __init__(self, args=None):
-        Daemon.__init__(self, '/var/run/udsa.pid')
-        CommonService.__init__(self)
-
-    def rename(self, name, user=None, oldPassword=None, newPassword=None):
-        '''
-        Renames the computer, and optionally sets a password for an user
-        before this
-        '''
-
-        # Check for password change request for an user
-        if user is not None:
-            logger.info('Setting password for user {}'.format(user))
-            try:
-                operations.changeUserPassword(user, oldPassword, newPassword)
-            except Exception as e:
-                # We stop here without even renaming computer, because the
-                # process has failed
-                raise Exception(
-                    'Could not change password for user {} (maybe invalid current password is configured at broker): {} '.format(user, unicode(e)))
-
-        renamer.rename(name)
-        self.setReady()
-
-    def joinDomain(self, name, domain, ou, account, password):
-        logger.fatal('Join domain is not supported on linux platforms right now')
-
-    def run(self):
-        initCfg()
-
-        logger.debug('Running Daemon')
-        set_proctitle('UDSActorDaemon')
-
-        # Linux daemon will continue running unless something is requested to
-        if self.interactWithBroker() is False:
-            logger.debug('Interact with broker returned false, stopping service after a while')
-            return
-
-        if self.isAlive is False:
-            logger.debug('The service is not alive after broker interaction, stopping it')
-            return
-
-        if self.rebootRequested is True:
-            logger.debug('Reboot has been requested, stopping service')
-            return
-
-        self.initIPC()
-
-        # *********************
-        # * Main Service loop *
-        # *********************
-        # Counter used to check ip changes only once every 10 seconds, for
-        # example
-        counter = 0
-        while self.isAlive:
-            counter += 1
-            if counter % 10 == 0:
-                self.checkIpsChanged()
-            # In milliseconds, will break
-            self.doWait(1000)
-
-        self.endIPC()
-        self.endAPI()
-
-        self.notifyStop()
-
-
-def usage():
-    sys.stderr.write("usage: {} start|stop|restart|login 'username'|logout 'username'\n".format(sys.argv[0]))
-    sys.exit(2)
-
-if __name__ == '__main__':
-    logger.setLevel(20000)
-
-    if len(sys.argv) == 3 and sys.argv[1] in ('login', 'logout'):
-        logger.debug('Running client udsactor')
-        client = None
-        try:
-            client = ipc.ClientIPC(IPC_PORT)
-            if 'login' == sys.argv[1]:
-                client.sendLogin(sys.argv[2])
-                sys.exit(0)
-            elif 'logout' == sys.argv[1]:
-                client.sendLogout(sys.argv[2])
-                sys.exit(0)
-            else:
-                usage()
-        except Exception as e:
-            logger.error(e)
-    elif len(sys.argv) != 2:
-        usage()
-
-    logger.debug('Executing actor')
-    daemon = UDSActorSvc()
-    if len(sys.argv) == 2:
-        if 'start' == sys.argv[1]:
-            daemon.start()
-        elif 'stop' == sys.argv[1]:
-            daemon.stop()
-        elif 'restart' == sys.argv[1]:
-            daemon.restart()
-        else:
-            usage()
-        sys.exit(0)
-    else:
-        usage()

actors/src/udsactor/linux/daemon.py

@@ -1,182 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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: : http://www.jejik.com/authors/sander_marechal/
-@see: : http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/
-'''
-
-from __future__ import unicode_literals
-import sys
-import os
-import time
-import atexit
-from udsactor.log import logger
-
-from signal import SIGTERM
-
-
-class Daemon:
-    """
-    A generic daemon class.
-
-    Usage: subclass the Daemon class and override the run() method
-    """
-    def __init__(self, pidfile, stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
-        self.stdin = stdin
-        self.stdout = stdout
-        self.stderr = stderr
-        self.pidfile = pidfile
-
-    def daemonize(self):
-        """
-        do the UNIX double-fork magic, see Stevens' "Advanced
-        Programming in the UNIX Environment" for details (ISBN 0201563177)
-        http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
-        """
-        try:
-            pid = os.fork()
-            if pid > 0:
-                # exit first parent
-                sys.exit(0)
-        except OSError as e:
-            logger.error("fork #1 error: {}".format(e))
-            sys.stderr.write("fork #1 failed: {}\n".format(e))
-            sys.exit(1)
-
-        # decouple from parent environment
-        os.chdir("/")
-        os.setsid()
-        os.umask(0)
-
-        # do second fork
-        try:
-            pid = os.fork()
-            if pid > 0:
-                # exit from second parent
-                sys.exit(0)
-        except OSError as e:
-            logger.error("fork #2 error: {}".format(e))
-            sys.stderr.write("fork #2 failed: {}\n".format(e))
-            sys.exit(1)
-
-        # redirect standard file descriptors
-        sys.stdout.flush()
-        sys.stderr.flush()
-        si = open(self.stdin, 'r')
-        so = open(self.stdout, 'a+')
-        se = open(self.stderr, 'a+', 0)
-        os.dup2(si.fileno(), sys.stdin.fileno())
-        os.dup2(so.fileno(), sys.stdout.fileno())
-        os.dup2(se.fileno(), sys.stderr.fileno())
-
-        # write pidfile
-        atexit.register(self.delpid)
-        pid = str(os.getpid())
-        with open(self.pidfile, 'w+') as f:
-            f.write("{}\n".format(pid))
-
-    def delpid(self):
-        try:
-            os.remove(self.pidfile)
-        except Exception:
-            # Not found/not permissions or whatever...
-            pass
-
-    def start(self):
-        """
-        Start the daemon
-        """
-        logger.debug('Starting daemon')
-        # Check for a pidfile to see if the daemon already runs
-        try:
-            pf = open(self.pidfile, 'r')
-            pid = int(pf.read().strip())
-            pf.close()
-        except IOError:
-            pid = None
-
-        if pid:
-            message = "pidfile {} already exist. Daemon already running?\n".format(pid)
-            logger.error(message)
-            sys.stderr.write(message)
-            sys.exit(1)
-
-        # Start the daemon
-        self.daemonize()
-        try:
-            self.run()
-        except Exception as e:
-            logger.error('Exception running process: {}'.format(e))
-
-        if os.path.exists(self.pidfile):
-            os.remove(self.pidfile)
-
-    def stop(self):
-        """
-        Stop the daemon
-        """
-        # Get the pid from the pidfile
-        try:
-            pf = open(self.pidfile, 'r')
-            pid = int(pf.read().strip())
-            pf.close()
-        except IOError:
-            pid = None
-
-        if pid is None:
-            message = "pidfile {} does not exist. Daemon not running?\n".format(self.pidfile)
-            logger.info(message)
-            # sys.stderr.write(message)
-            return  # not an error in a restart
-
-        # Try killing the daemon process
-        try:
-            while True:
-                os.kill(pid, SIGTERM)
-                time.sleep(1)
-        except OSError as err:
-            if err.errno == 3:  # No such process
-                if os.path.exists(self.pidfile):
-                    os.remove(self.pidfile)
-            else:
-                sys.stderr.write(err)
-                sys.exit(1)
-
-    def restart(self):
-        """
-        Restart the daemon
-        """
-        self.stop()
-        self.start()
-
-    # Overridables
-    def run(self):
-        """
-        You should override this method when you subclass Daemon. It will be called after the process has been
-        daemonized by start() or restart().
-        """

actors/src/udsactor/linux/log.py

@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import logging
-import os
-import tempfile
-import six
-
-# 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
-
-
-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
-        # 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')
-                logging.basicConfig(
-                    filename=fname,
-                    filemode='a',
-                    format='%(levelname)s %(asctime)s %(message)s',
-                    level=logging.DEBUG
-                )
-                self.logger = logging.getLogger('udsactor')
-                os.chmod(fname, 0o0600)
-                return
-            except Exception:
-                pass
-
-        # Logger can't be set
-        self.logger = None
-
-    def log(self, level, message):
-        # Debug messages are logged to a file
-        # our loglevels are 10000 (other), 20000 (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

actors/src/udsactor/linux/operations.py

@@ -1,245 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import socket
-import platform
-import fcntl
-import os
-import ctypes  # @UnusedImport
-import ctypes.util
-import subprocess
-import struct
-import array
-import six
-from udsactor import utils
-from .renamer import rename
-
-
-def _getMacAddr(ifname):
-    '''
-    Returns the mac address of an interface
-    Mac is returned as unicode utf-8 encoded
-    '''
-    if isinstance(ifname, list):
-        return dict([(name, _getMacAddr(name)) for name in ifname])
-    if isinstance(ifname, six.text_type):
-        ifname = ifname.encode('utf-8')  # If unicode, convert to bytes (or str in python 2.7)
-    try:
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        info = bytearray(fcntl.ioctl(s.fileno(), 0x8927, struct.pack(str('256s'), ifname[:15])))
-        return six.text_type(''.join(['%02x:' % char for char in info[18:24]])[:-1])
-    except Exception:
-        return None
-
-
-def _getIpAddr(ifname):
-    '''
-    Returns the ip address of an interface
-    Ip is returned as unicode utf-8 encoded
-    '''
-    if isinstance(ifname, list):
-        return dict([(name, _getIpAddr(name)) for name in ifname])
-    if isinstance(ifname, six.text_type):
-        ifname = ifname.encode('utf-8')  # If unicode, convert to bytes (or str in python 2.7)
-    try:
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        return six.text_type(socket.inet_ntoa(fcntl.ioctl(
-            s.fileno(),
-            0x8915,  # SIOCGIFADDR
-            struct.pack(str('256s'), ifname[:15])
-        )[20:24]))
-    except Exception:
-        return None
-
-
-def _getInterfaces():
-    '''
-    Returns a list of interfaces names coded in utf-8
-    '''
-    max_possible = 128  # arbitrary. raise if needed.
-    space = max_possible * 16
-    if platform.architecture()[0] == '32bit':
-        offset, length = 32, 32
-    elif platform.architecture()[0] == '64bit':
-        offset, length = 16, 40
-    else:
-        raise OSError('Unknown arquitecture {0}'.format(platform.architecture()[0]))
-
-    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]
-    namestr = names.tostring()
-    # return namestr, outbytes
-    return [namestr[i:i + offset].split(b'\0', 1)[0].decode('utf-8') for i in range(0, outbytes, length)]
-
-
-def _getIpAndMac(ifname):
-    ip, mac = _getIpAddr(ifname), _getMacAddr(ifname)
-    return (ip, mac)
-
-
-def getComputerName():
-    '''
-    Returns computer name, with no domain
-    '''
-    return socket.gethostname().split('.')[0]
-
-
-def getNetworkInfo():
-    for ifname in _getInterfaces():
-        ip, mac = _getIpAndMac(ifname)
-        if mac != '00:00:00:00:00:00':  # Skips local interfaces
-            yield utils.Bunch(name=ifname, mac=mac, ip=ip)
-
-
-def getDomainName():
-    return ''
-
-
-def getLinuxVersion():
-    lv = platform.linux_distribution()
-    return lv[0] + ', ' + lv[1]
-
-
-def reboot(flags=0):
-    '''
-    Simple reboot using os command
-    '''
-    # Workaround for dummy thread
-    if six.PY3 is False:
-        import threading
-        threading._DummyThread._Thread__stop = lambda x: 42
-
-    subprocess.call(['/sbin/shutdown', 'now', '-r'])
-
-
-def loggoff():
-    '''
-    Right now restarts the machine...
-    '''
-    # Workaround for dummy thread
-    if six.PY3 is False:
-        import threading
-        threading._DummyThread._Thread__stop = lambda x: 42
-
-    subprocess.call(['/usr/bin/pkill', '-u', os.environ['USER']])
-    # subprocess.call(['/sbin/shutdown', 'now', '-r'])
-    # subprocess.call(['/usr/bin/systemctl', 'reboot', '-i'])
-
-
-def renameComputer(newName):
-    rename(newName)
-
-
-def joinDomain(domain, ou, account, password, executeInOneStep=False):
-    pass
-
-
-def changeUserPassword(user, oldPassword, newPassword):
-    '''
-    Simple password change for user using command line
-    '''
-    os.system('echo "{1}\n{1}" | /usr/bin/passwd {0} 2> /dev/null'.format(user, newPassword))
-
-
-class XScreenSaverInfo(ctypes.Structure):
-    _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)]
-
-# Initialize xlib & xss
-try:
-    xlibPath = ctypes.util.find_library('X11')
-    xssPath = ctypes.util.find_library('Xss')
-    xlib = ctypes.cdll.LoadLibrary(xlibPath)
-    xss = ctypes.cdll.LoadLibrary(xssPath)
-
-    # Fix result type to XScreenSaverInfo Structure
-    xss.XScreenSaverQueryExtension.restype = ctypes.c_int
-    xss.XScreenSaverAllocInfo.restype = ctypes.POINTER(XScreenSaverInfo)  # Result in a XScreenSaverInfo structure
-except Exception:  # Libraries not accesible, not found or whatever..
-    xlib = xss = None
-
-
-def initIdleDuration(atLeastSeconds):
-    '''
-    On linux we set the screensaver to at least required seconds, or we never will get "idle"
-    '''
-    # Workaround for dummy thread
-    if six.PY3 is False:
-        import threading
-        threading._DummyThread._Thread__stop = lambda x: 42
-
-    subprocess.call(['/usr/bin/xset', 's', '{}'.format(atLeastSeconds + 30)])
-    # And now reset it
-    subprocess.call(['/usr/bin/xset', 's', 'reset'])
-
-
-def getIdleDuration():
-    '''
-    Returns idle duration, in seconds
-    '''
-    if xlib is None or xss is None:
-        return 0  # Libraries not available
-
-    # production code might want to not hardcode the offset 16...
-    display = xlib.XOpenDisplay(None)
-
-    event_base = ctypes.c_int()
-    error_base = ctypes.c_int()
-
-    available = xss.XScreenSaverQueryExtension(display, ctypes.byref(event_base), ctypes.byref(error_base))
-    if available != 1:
-        return 0  # No screen saver is available, no way of getting idle
-
-    info = xss.XScreenSaverAllocInfo()
-    xss.XScreenSaverQueryInfo(display, xlib.XDefaultRootWindow(display), info)
-
-    if info.contents.state != 0:
-        return 3600 * 100 * 1000  # If screen saver is active, return a high enough value
-
-    return info.contents.idle / 1000.0
-
-
-def getCurrentUser():
-    '''
-    Returns current logged in user
-    '''
-    return os.environ['USER']

actors/src/udsactor/linux/store.py

@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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 six
-import os
-
-DEBUG = False
-
-CONFIGFILE = '/etc/udsactor/udsactor.cfg' if DEBUG is False else '/tmp/udsactor.cfg'
-
-
-def checkPermissions():
-    return True if DEBUG else os.getuid() == 0
-
-
-def readConfig():
-    res = {}
-    try:
-        cfg = six.moves.configparser.SafeConfigParser()  # @UndefinedVariable
-        cfg.optionxform = six.text_type
-        cfg.read(CONFIGFILE)
-        # Just reads 'uds' section
-        for key in cfg.options('uds'):
-            res[key] = cfg.get('uds', key)
-            if res[key].lower() in ('true', 'yes', 'si'):
-                res[key] = True
-            elif res[key].lower() in ('false', 'no'):
-                res[key] = False
-    except Exception:
-        pass
-
-    return res
-
-
-def writeConfig(data):
-    cfg = six.moves.configparser.SafeConfigParser()  # @UndefinedVariable
-    cfg.optionxform = six.text_type
-    cfg.add_section('uds')
-    for key, val in data.items():
-        cfg.set('uds', key, str(val))
-
-    # 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)

actors/src/udsactor/log.py

@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import traceback
-import sys
-import six
-
-if sys.platform == 'win32':
-    from udsactor.windows.log import LocalLogger  # @UnusedImport
-else:
-    from udsactor.linux.log import LocalLogger  # @Reimport
-
-# 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
-
-
-class Logger(object):
-    def __init__(self):
-        self.logLevel = INFO
-        self.logger = LocalLogger()
-        self.remoteLogger = None
-
-    def setLevel(self, level):
-        '''
-        Sets log level filter (minimum level required for a log message to be processed)
-        :param level: Any message with a level below this will be filtered out
-        '''
-        self.logLevel = int(level)  # Ensures level is an integer or fails
-
-    def setRemoteLogger(self, remoteLogger):
-        self.remoteLogger = remoteLogger
-
-    def log(self, level, message):
-        if level < self.logLevel:  # Skip not wanted messages
-            return
-
-        # If remote logger is available, notify message to it
-        try:
-            if self.remoteLogger is not None and self.remoteLogger.isConnected and level >= INFO:
-                self.remoteLogger.log(level, message)
-        except Exception as e:
-            self.logger.log(FATAL, 'Error notifying log to broker: {}'.format(e.message))
-
-        self.logger.log(level, message)
-
-    def debug(self, message):
-        self.log(DEBUG, message)
-
-    def warn(self, message):
-        self.log(WARN, message)
-
-    def info(self, message):
-        self.log(WARN, message)
-
-    def error(self, message):
-        self.log(ERROR, message)
-
-    def fatal(self, message):
-        self.log(FATAL, message)
-
-    def exception(self):
-        try:
-            tb = traceback.format_exc()
-        except Exception:
-            tb = '(could not get traceback!)'
-
-        self.log(DEBUG, tb)
-
-    def flush(self):
-        pass
-
-
-logger = Logger()

actors/src/udsactor/service.py

@@ -1,310 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-from udsactor.log import logger
-
-from . import operations
-from . import store
-from . import REST
-from . import ipc
-from . import httpserver
-from .scriptThread import ScriptExecutorThread
-from .utils import exceptionToMessage
-
-import socket
-import time
-import random
-
-IPC_PORT = 39188
-
-cfg = None
-
-
-def initCfg():
-    global cfg  # pylint: disable=global-statement
-    cfg = store.readConfig()
-
-    if logger.logger.isWindows():
-        # Logs will also go to windows event log for services
-        logger.logger.serviceLogger = True
-
-    if cfg is not None:
-        logger.setLevel(cfg.get('logLevel', 20000))
-    else:
-        logger.setLevel(20000)
-        cfg = {}
-
-    # If ANY var is missing, reset cfg
-    for v in ('host', 'ssl', 'masterKey'):
-        if v not in cfg:
-            cfg = None
-            break
-
-
-class CommonService(object):
-    def __init__(self):
-        self.isAlive = True
-        self.api = None
-        self.ipc = None
-        self.httpServer = None
-        self.rebootRequested = False
-        self.knownIps = []
-        socket.setdefaulttimeout(20)
-
-    def reboot(self):
-        self.rebootRequested = True
-
-    def setReady(self):
-        self.api.setReady([(v.mac, v.ip) for v in operations.getNetworkInfo()])
-
-    def interactWithBroker(self):
-        '''
-        Returns True to continue to main loop, false to stop & exit service
-        '''
-        # If no configuration is found, stop service
-        if cfg is None:
-            logger.fatal('No configuration found, stopping service')
-            return False
-
-        self.api = REST.Api(cfg['host'], cfg['masterKey'], cfg['ssl'])
-
-        # Wait for Broker to be ready
-        counter = 0
-        while self.isAlive:
-            try:
-                # getNetworkInfo is a generator function
-                netInfo = tuple(operations.getNetworkInfo())
-                self.knownIps = dict(((i.mac, i.ip) for i in netInfo))
-                ids = ','.join([i.mac for i in netInfo])
-                if ids == '':
-                    # Wait for any network interface to be ready
-                    logger.debug('No valid network interfaces found, retrying in a while...')
-                    raise Exception()
-                logger.debug('Ids: {}'.format(ids))
-                self.api.init(ids)
-                # Set remote logger to notify log info to broker
-                logger.setRemoteLogger(self.api)
-
-                break
-            except REST.InvalidKeyError:
-                logger.fatal('Can\'t sync with broker: Invalid broker Master Key')
-                return False
-            except REST.UnmanagedHostError:
-                # Maybe interface that is registered with broker is not enabled already?
-                # Right now, we thing that the interface connected to broker is
-                # the interface that broker will know, let's see how this works
-                logger.fatal('This host is not managed by UDS Broker (ids: {})'.format(ids))
-                return False  # On unmanaged hosts, there is no reason right now to continue running
-            except Exception as e:
-                logger.debug('Exception on network info: retrying')
-                logger.exception()
-                # Any other error is expectable and recoverable, so let's wait a bit and retry again
-                # but, if too many errors, will log it (one every minute, for
-                # example)
-                counter += 1
-                if counter % 60 == 0:  # Every 5 minutes, raise a log
-                    logger.info('Trying to inititialize connection with broker (last error: {})'.format(exceptionToMessage(e)))
-                # Wait a bit before next check
-                self.doWait(5000)
-
-        # Broker connection is initialized, now get information about what to
-        # do
-        counter = 0
-        while self.isAlive:
-            try:
-                logger.debug('Requesting information of what to do now')
-                info = self.api.information()
-                data = info.split('\r')
-                if len(data) != 2:
-                    logger.error('The format of the information message is not correct (got {})'.format(info))
-                    raise Exception
-                params = data[1].split('\t')
-                if data[0] == 'rename':
-                    try:
-                        if len(params) == 1:  # Simple rename
-                            logger.debug('Renaming computer to {}'.format(params[0]))
-                            self.rename(params[0])
-                        # Rename with change password for an user
-                        elif len(params) == 4:
-                            logger.debug('Renaming computer to {}'.format(params))
-                            self.rename(params[0], params[1], params[2], params[3])
-                        else:
-                            logger.error('Got invalid parameter for rename operation: {}'.format(params))
-                            return False
-                        break
-                    except Exception as e:
-                        logger.error('Error at computer renaming stage: {}'.format(e.message))
-                        return False
-                elif data[0] == 'domain':
-                    if len(params) != 5:
-                        logger.error('Got invalid parameters for domain message: {}'.format(params))
-                        return False
-                    self.joinDomain(params[0], params[1], params[2], params[3], params[4])
-                    break
-                else:
-                    logger.error('Unrecognized action sent from broker: {}'.format(data[0]))
-                    return False  # Stop running service
-            except REST.UserServiceNotFoundError:
-                logger.error('The host has lost the sync state with broker! (host uuid changed?)')
-                return False
-            except Exception as e:
-                if counter % 60 == 0:
-                    logger.warn('Too many retries in progress, though still trying (last error: {})'.format(exceptionToMessage(e)))
-                counter += 1
-                # Any other error is expectable and recoverable, so let's wait
-                # a bit and retry again
-                # Wait a bit before next check
-                self.doWait(5000)
-
-        if self.rebootRequested:
-            try:
-                operations.reboot()
-            except Exception as e:
-                logger.error('Exception on reboot: {}'.format(e.message))
-            return False  # Stops service
-
-        return True
-
-    def checkIpsChanged(self):
-        if self.api is None or self.api.uuid is None:
-            return  # Not connected
-        netInfo = tuple(operations.getNetworkInfo())
-        for i in netInfo:
-            # If at least one ip has changed
-            if i.mac in self.knownIps and self.knownIps[i.mac] != i.ip:
-                logger.info('Notifying ip change to broker (mac {}, from {} to {})'.format(i.mac, self.knownIps[i.mac], i.ip))
-                try:
-                    # Notifies all interfaces IPs
-                    self.api.notifyIpChanges(((v.mac, v.ip) for v in netInfo))
-                    # Regenerates Known ips
-                    self.knownIps = dict(((v.mac, v.ip) for v in netInfo))
-                except Exception as e:
-                    logger.warn('Got an error notifiying IPs to broker: {} (will retry in a bit)'.format(e.message.decode('windows-1250', 'ignore')))
-
-    def clientMessageProcessor(self, msg, data):
-        logger.debug('Got message {}'.format(msg))
-        if self.api is None:
-            logger.info('Rest api not ready')
-            return
-
-        if msg == ipc.REQ_LOGIN:
-            self.api.login(data)
-        elif msg == ipc.REQ_LOGOUT:
-            self.api.logout(data)
-            self.onLogout(data)
-        elif msg == ipc.REQ_INFORMATION:
-            info = {}
-            if self.api.idle is not None:
-                info['idle'] = self.api.idle
-            self.ipc.sendInformationMessage(info)
-
-    def initIPC(self):
-        # ******************************************
-        # * Initialize listener IPC & REST threads *
-        # ******************************************
-        logger.debug('Starting IPC listener at {}'.format(IPC_PORT))
-        self.ipc = ipc.ServerIPC(IPC_PORT, clientMessageProcessor=self.clientMessageProcessor)
-        self.ipc.start()
-
-        if self.api.mac in self.knownIps:
-            address = (self.knownIps[self.api.mac], random.randrange(40000, 44000))
-            logger.info('Starting REST listener at {}'.format(address))
-            self.httpServer = httpserver.HTTPServerThread(address, self)
-            self.httpServer.start()
-            # And notify it to broker
-            self.api.notifyComm(self.httpServer.getServerUrl())
-
-    def endIPC(self):
-        # Remove IPC threads
-        if self.ipc is not None:
-            try:
-                self.ipc.stop()
-            except Exception:
-                logger.error('Couln\'t stop ipc server')
-        if self.httpServer is not None:
-            try:
-                self.httpServer.stop()
-            except Exception:
-                logger.error('Couln\'t stop REST server')
-
-    def endAPI(self):
-        if self.api is not None:
-            try:
-                self.api.notifyComm(None)
-            except Exception:
-                logger.error('Couln\'t remove comms url from broker')
-
-        self.notifyStop()
-
-    # ***************************************************
-    # Methods that ARE overriden by linux & windows Actor
-    # ***************************************************
-    def rename(self, name, user=None, oldPassword=None, newPassword=None):
-        '''
-        Invoked when broker requests a rename action
-        MUST BE OVERRIDEN
-        '''
-        raise NotImplementedError('Method renamed has not been implemented!')
-
-    def joinDomain(self, name, domain, ou, account, password):
-        '''
-        Invoked when broker requests a "domain" action
-        MUST BE OVERRIDEN
-        '''
-        raise NotImplementedError('Method renamed has not been implemented!')
-
-    # ****************************************
-    # Methods that CAN BE overriden by actors
-    # ****************************************
-    def doWait(self, miliseconds):
-        '''
-        Invoked to wait a bit
-        CAN be OVERRIDEN
-        '''
-        time.sleep(float(miliseconds) / 1000)
-
-    def notifyStop(self):
-        '''
-        Overriden to log stop
-        '''
-        logger.info('Service is being stopped')
-
-    def preConnect(self, user, protocol):
-        '''
-        Invoked when received a PRE Connection request via REST
-        '''
-        logger.debug('Pre-connect does nothing')
-        return 'ok'
-
-    def onLogout(self, user):
-        logger.debug('On logout invoked for {}'.format(user))

actors/src/udsactor/windows/SENS.py

@@ -1,148 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-# _*_ coding: iso-8859-1 _*_
-
-from __future__ import unicode_literals
-
-import win32com.client  # @UnresolvedImport, pylint: disable=import-error
-import win32com.server.policy  # @UnresolvedImport, pylint: disable=import-error
-import os
-
-from udsactor.log import logger
-
-# based on python SENS example from
-# http://timgolden.me.uk/python/win32_how_do_i/track-session-events.html
-
-# from Sens.h
-SENSGUID_PUBLISHER = "{5fee1bd6-5b9b-11d1-8dd2-00aa004abd5e}"
-SENSGUID_EVENTCLASS_LOGON = "{d5978630-5b9f-11d1-8dd2-00aa004abd5e}"
-
-# from EventSys.h
-PROGID_EventSystem = "EventSystem.EventSystem"
-PROGID_EventSubscription = "EventSystem.EventSubscription"
-
-IID_ISensLogon = "{d597bab3-5b9f-11d1-8dd2-00aa004abd5e}"
-
-
-class SensLogon(win32com.server.policy.DesignatedWrapPolicy):
-    _com_interfaces_ = [IID_ISensLogon]
-    _public_methods_ = [
-        'Logon',
-        'Logoff',
-        'StartShell',
-        'DisplayLock',
-        'DisplayUnlock',
-        'StartScreenSaver',
-        'StopScreenSaver'
-    ]
-
-    def __init__(self, service):
-        self._wrap_(self)
-        self.service = service
-
-    def Logon(self, *args):
-        logger.debug('Logon event: {}'.format(args))
-        if self.service.api is not None and self.service.api.isConnected:
-            try:
-                data = self.service.api.login(args[0])
-                logger.debug('Data received for login: {}'.format(data))
-                data = data.split('\t')
-                if len(data) == 2:
-                    logger.debug('Data is valid: {}'.format(data))
-                    windir = os.environ['windir']
-                    with open(os.path.join(windir, 'remoteip.txt'), 'w') as f:
-                        f.write(data[0])
-                    with open(os.path.join(windir, 'remoteh.txt'), 'w') as f:
-                        f.write(data[1])
-            except Exception as e:
-                logger.fatal('Error notifying logon to server: {}'.format(e))
-
-    def Logoff(self, *args):
-        logger.debug('Logoff event: arguments: {}'.format(args))
-        if self.service is not None and self.service.api is not None and self.service.api.isConnected:
-            try:
-                self.service.api.logout(args[0])
-            except Exception as e:
-                logger.fatal('Error notifying logoff to server: {}'.format(e))
-
-        logger.debug('Invoking onLogout: {}'.format(self.service))
-        self.service.onLogout(args[0])
-        logger.debug('Invoked!!')
-
-    def StartShell(self, *args):
-        # logevent('StartShell : %s' % [args])
-        pass
-
-    def DisplayLock(self, *args):
-        # logevent('DisplayLock : %s' % [args])
-        pass
-
-    def DisplayUnlock(self, *args):
-        # logevent('DisplayUnlock : %s' % [args])
-        pass
-
-    def StartScreenSaver(self, *args):
-        # When finished basic actor, we will use this to provide a new parameter: logout on screensaver
-        # This will allow to easily close sessions of idle users
-        # logevent('StartScreenSaver : %s' % [args])
-        pass
-
-    def StopScreenSaver(self, *args):
-        # logevent('StopScreenSaver : %s' % [args])
-        pass
-
-
-def logevent(msg):
-    logger.info(msg)
-
-# def register():
-    # call the CoInitialize to allow the registration to run in an other
-    # thread
-    # pythoncom.CoInitialize()
-
-    # logevent('Registring ISensLogon')
-
-    # sl=SensLogon()
-    # subscription_interface=pythoncom.WrapObject(sl)
-
-    # event_system=win32com.client.Dispatch(PROGID_EventSystem)
-
-    # event_subscription=win32com.client.Dispatch(PROGID_EventSubscription)
-    # event_subscription.EventClassID=SENSGUID_EVENTCLASS_LOGON
-    # event_subscription.PublisherID=SENSGUID_PUBLISHER
-    # event_subscription.SubscriptionName='Python subscription'
-    # event_subscription.SubscriberInterface=subscription_interface
-
-    # event_system.Store(PROGID_EventSubscription, event_subscription)
-
-    # pythoncom.PumpMessages()
-    # #logevent('ISensLogon stopped')

actors/src/udsactor/windows/UDSActorService.py

@@ -1,317 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-# pylint: disable=unused-wildcard-import, wildcard-import
-
-import win32serviceutil  # @UnresolvedImport, pylint: disable=import-error
-import win32service  # @UnresolvedImport, pylint: disable=import-error
-import win32security  # @UnresolvedImport, pylint: disable=import-error
-import win32net  # @UnresolvedImport, pylint: disable=import-error
-import win32event  # @UnresolvedImport, pylint: disable=import-error
-import win32com.client  # @UnresolvedImport,  @UnusedImport, pylint: disable=import-error
-import pythoncom  # @UnresolvedImport, pylint: disable=import-error
-import servicemanager  # @UnresolvedImport, pylint: disable=import-error
-import os
-
-from udsactor import operations
-from udsactor.service import CommonService
-from udsactor.service import initCfg
-
-from udsactor.log import logger
-
-from .SENS import SensLogon
-from .SENS import logevent
-from .SENS import SENSGUID_EVENTCLASS_LOGON
-from .SENS import SENSGUID_PUBLISHER
-from .SENS import PROGID_EventSubscription
-from .SENS import PROGID_EventSystem
-
-
-class UDSActorSvc(win32serviceutil.ServiceFramework, CommonService):
-    '''
-    This class represents a Windows Service for managing actor interactions
-    with UDS Broker and Machine
-    '''
-    _svc_name_ = "UDSActor"
-    _svc_display_name_ = "UDS Actor Service"
-    _svc_description_ = "UDS Actor for machines managed by UDS Broker"
-    # 'System Event Notification' is the SENS service
-    _svc_deps_ = ['EventLog', 'SENS']
-
-    def __init__(self, args):
-        win32serviceutil.ServiceFramework.__init__(self, args)
-        CommonService.__init__(self)
-        self.hWaitStop = win32event.CreateEvent(None, 1, 0, None)
-        self._user = None
-
-    def SvcStop(self):
-        self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
-        self.isAlive = False
-        win32event.SetEvent(self.hWaitStop)
-
-    SvcShutdown = SvcStop
-
-    def notifyStop(self):
-        servicemanager.LogMsg(servicemanager.EVENTLOG_INFORMATION_TYPE,
-                              servicemanager.PYS_SERVICE_STOPPED,
-                              (self._svc_name_, ''))
-
-    def doWait(self, miliseconds):
-        win32event.WaitForSingleObject(self.hWaitStop, miliseconds)
-
-    def rename(self, name, user=None, oldPassword=None, newPassword=None):
-        '''
-        Renames the computer, and optionally sets a password for an user
-        before this
-        '''
-        hostName = operations.getComputerName()
-
-        if hostName.lower() == name.lower():
-            logger.info('Computer name is now {}'.format(hostName))
-            self.setReady()
-            return
-
-        # Check for password change request for an user
-        if user is not None:
-            logger.info('Setting password for user {}'.format(user))
-            try:
-                operations.changeUserPassword(user, oldPassword, newPassword)
-            except Exception as e:
-                # We stop here without even renaming computer, because the
-                # process has failed
-                raise Exception(
-                    'Could not change password for user {} (maybe invalid current password is configured at broker): {} '.format(user, unicode(e)))
-
-        operations.renameComputer(name)
-        # Reboot just after renaming
-        logger.info('Rebooting computer got activate new name {}'.format(name))
-        self.reboot()
-
-    def oneStepJoin(self, name, domain, ou, account, password):
-        '''
-        Ejecutes the join domain in exactly one step
-        '''
-        currName = operations.getComputerName()
-        # If name is desired, simply execute multiStepJoin, because computer
-        # name will not change
-        if currName.lower() == name.lower():
-            self.multiStepJoin(name, domain, ou, account, password)
-        else:
-            operations.renameComputer(name)
-            logger.debug('Computer renamed to {} without reboot'.format(name))
-            operations.joinDomain(
-                domain, ou, account, password, executeInOneStep=True)
-            logger.debug(
-                'Requested join domain {} without errors'.format(domain))
-            self.reboot()
-
-    def multiStepJoin(self, name, domain, ou, account, password):
-        currName = operations.getComputerName()
-        if currName.lower() == name.lower():
-            currDomain = operations.getDomainName()
-            logger.debug('Name: "{}" vs "{}", Domain: "{}" vs "{}"'.format(currName.lower(), name.lower(), currDomain.lower(), domain.lower()))
-            if currDomain is not None:
-                logger.info(
-                    'Machine {} is part of domain {}'.format(name, domain))
-                self.setReady()
-            else:
-                operations.joinDomain(
-                    domain, ou, account, password, executeInOneStep=False)
-        else:
-            operations.renameComputer(name)
-            logger.info(
-                'Rebooting computer got activate new name {}'.format(name))
-            self.reboot()
-
-    def joinDomain(self, name, domain, ou, account, password):
-        ver = operations.getWindowsVersion()
-        ver = ver[0] * 10 + ver[1]
-        logger.info('Starting joining domain {} with name {} (detected operating version: {})'.format(
-            domain, name, ver))
-        # Accepts one step joinDomain, also remember XP is no more supported by
-        # microsoft, but this also must works with it because will do a "multi
-        # step" join
-        if ver >= 60:
-            self.oneStepJoin(name, domain, ou, account, password)
-        else:
-            self.multiStepJoin(name, domain, ou, account, password)
-
-    def preConnect(self, user, protocol):
-        logger.debug('Pre connect invoked')
-        if protocol != 'rdp':  # If connection is not using rdp, skip adding user
-            return 'ok'
-        # Well known SSID for Remote Desktop Users
-        REMOTE_USERS_SID = 'S-1-5-32-555'
-
-        p = win32security.GetBinarySid(REMOTE_USERS_SID)
-        groupName = win32security.LookupAccountSid(None, p)[0]
-
-        useraAlreadyInGroup = False
-        resumeHandle = 0
-        while True:
-            users, _, resumeHandle = win32net.NetLocalGroupGetMembers(None, groupName, 1, resumeHandle, 32768)
-            if user in [u['name'] for u in users]:
-                useraAlreadyInGroup = True
-                break
-            if resumeHandle == 0:
-                break
-
-        if useraAlreadyInGroup is False:
-            logger.debug('User not in group, adding it')
-            self._user = user
-            try:
-                userSSID = win32security.LookupAccountName(None, user)[0]
-                win32net.NetLocalGroupAddMembers(None, groupName, 0, [{'sid': userSSID}])
-            except Exception as e:
-                logger.error('Exception adding user to Remote Desktop Users: {}'.format(e))
-        else:
-            self._user = None
-            logger.debug('User {} already in group'.format(user))
-
-        return 'ok'
-
-    def onLogout(self, user):
-        logger.debug('Windows onLogout invoked: {}, {}'.format(user, self._user))
-        try:
-            REMOTE_USERS_SID = 'S-1-5-32-555'
-            p = win32security.GetBinarySid(REMOTE_USERS_SID)
-            groupName = win32security.LookupAccountSid(None, p)[0]
-        except Exception:
-            logger.error('Exception getting Windows Group')
-            return
-
-        if self._user is not None:
-            try:
-                win32net.NetLocalGroupDelMembers(None, groupName, [self._user])
-            except Exception as e:
-                logger.error('Exception removing user from Remote Desktop Users: {}'.format(e))
-
-    def SvcDoRun(self):
-        '''
-        Main service loop
-        '''
-        try:
-            initCfg()
-
-            logger.debug('running SvcDoRun')
-            servicemanager.LogMsg(servicemanager.EVENTLOG_INFORMATION_TYPE,
-                                  servicemanager.PYS_SERVICE_STARTED,
-                                  (self._svc_name_, ''))
-
-            # call the CoInitialize to allow the registration to run in an other
-            # thread
-            logger.debug('Initializing com...')
-            pythoncom.CoInitialize()
-
-            # ********************************************************
-            # * Ask brokers what to do before proceding to main loop *
-            # ********************************************************
-            if self.interactWithBroker() is False:
-                logger.debug('Interact with broker returned false, stopping service after a while')
-                self.notifyStop()
-                win32event.WaitForSingleObject(self.hWaitStop, 5000)
-                return
-
-            if self.isAlive is False:
-                logger.debug('The service is not alive after broker interaction, stopping it')
-                self.notifyStop()
-                return
-
-            if self.rebootRequested is True:
-                logger.debug('Reboot has been requested, stopping service')
-                self.notifyStop()
-                return
-
-            self.initIPC()
-        except Exception:  # Any init exception wil be caught, service must be then restarted
-            logger.exception()
-            logger.debug('Exiting service with failure status')
-            os._exit(-1)  # pylint: disable=protected-access
-
-        # ********************************
-        # * Registers SENS subscriptions *
-        # ********************************
-        logevent('Registering ISensLogon')
-        subscription_guid = '{41099152-498E-11E4-8FD3-10FEED05884B}'
-        sl = SensLogon(self)
-        subscription_interface = pythoncom.WrapObject(sl)
-
-        event_system = win32com.client.Dispatch(PROGID_EventSystem)
-
-        event_subscription = win32com.client.Dispatch(PROGID_EventSubscription)
-        event_subscription.EventClassID = SENSGUID_EVENTCLASS_LOGON
-        event_subscription.PublisherID = SENSGUID_PUBLISHER
-        event_subscription.SubscriptionName = 'UDS Actor subscription'
-        event_subscription.SubscriptionID = subscription_guid
-        event_subscription.SubscriberInterface = subscription_interface
-
-        event_system.Store(PROGID_EventSubscription, event_subscription)
-
-        logger.debug('Registered SENS, running main loop')
-
-        # *********************
-        # * Main Service loop *
-        # *********************
-        # Counter used to check ip changes only once every 10 seconds, for
-        # example
-        counter = 0
-        while self.isAlive:
-            counter += 1
-            # Process SENS messages, This will be a bit asyncronous (1 second
-            # delay)
-            pythoncom.PumpWaitingMessages()
-            if counter >= 15:  # Once every 15 seconds
-                counter = 0
-                try:
-                    self.checkIpsChanged()
-                except Exception as e:
-                    logger.error('Error checking ip change: {}'.format(e))
-            # In milliseconds, will break
-            win32event.WaitForSingleObject(self.hWaitStop, 1000)
-
-        logger.debug('Exited main loop, deregistering SENS')
-
-        # *******************************************
-        # * Remove SENS subscription before exiting *
-        # *******************************************
-        event_system.Remove(
-            PROGID_EventSubscription, "SubscriptionID == " + subscription_guid)
-
-        self.endIPC()  # Ends IPC servers
-        self.endAPI()  # And deinitializes REST api if needed
-
-        self.notifyStop()
-
-
-if __name__ == '__main__':
-    initCfg()
-    win32serviceutil.HandleCommandLine(UDSActorSvc)

actors/src/udsactor/windows/log.py

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import servicemanager  # @UnresolvedImport, pylint: disable=import-error
-import logging
-import os
-import tempfile
-
-# Valid logging levels, from UDS Broker (uds.core.utils.log)
-OTHER, DEBUG, INFO, WARN, ERROR, FATAL = (10000 * (x + 1) for x in xrange(6))
-
-
-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
-        logging.basicConfig(
-            filename=os.path.join(tempfile.gettempdir(), 'udsactor.log'),
-            filemode='a',
-            format='%(levelname)s %(asctime)s %(message)s',
-            level=logging.DEBUG
-        )
-        self.logger = logging.getLogger('udsactor')
-        self.serviceLogger = False
-
-    def log(self, level, message):
-        # Debug messages are logged to a file
-        # our loglevels are 10000 (other), 20000 (debug), ....
-        # logging levels are 10 (debug), 20 (info)
-        # OTHER = logging.NOTSET
-        self.logger.log(level / 1000 - 10, message)
-
-        if level < INFO or self.serviceLogger is False:  # Only information and above will be on event log
-            return
-
-        if level < WARN:  # Info
-            servicemanager.LogInfoMsg(message)
-        elif level < ERROR:  # WARN
-            servicemanager.LogWarningMsg(message)
-        else:  # Error & Fatal
-            servicemanager.LogErrorMsg(message)
-
-    def isWindows(self):
-        return True
-
-    def isLinux(self):
-        return False

actors/src/udsactor/windows/operations.py

@@ -1,219 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-import win32com.client  # @UnresolvedImport, pylint: disable=import-error
-import win32net  # @UnresolvedImport, pylint: disable=import-error
-import win32security  # @UnresolvedImport, pylint: disable=import-error
-import win32api  # @UnresolvedImport, pylint: disable=import-error
-import win32con  # @UnresolvedImport, pylint: disable=import-error
-import ctypes
-from ctypes.wintypes import DWORD, LPCWSTR
-import os
-
-from udsactor import utils
-from udsactor.log import logger
-
-
-def getErrorMessage(res=0):
-    msg = win32api.FormatMessage(res)
-    return msg.decode('windows-1250', 'ignore')
-
-
-def getComputerName():
-    return win32api.GetComputerNameEx(win32con.ComputerNamePhysicalDnsHostname)
-
-
-def getNetworkInfo():
-    obj = win32com.client.Dispatch("WbemScripting.SWbemLocator")
-    wmobj = obj.ConnectServer("localhost", "root\cimv2")
-    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
-                    continue
-                # logger.debug('Net config found: {}=({}, {})'.format(obj.Caption, obj.MACAddress, ip))
-                yield utils.Bunch(name=obj.Caption, mac=obj.MACAddress, ip=ip)
-    except Exception:
-        return
-
-
-def getDomainName():
-    '''
-    Will return the domain name if we belong a domain, else None
-    (if part of a network group, will also return None)
-    '''
-    # Status:
-    # 0 = Unknown
-    # 1 = Unjoined
-    # 2 = Workgroup
-    # 3 = Domain
-    domain, status = win32net.NetGetJoinInformation()
-    if status != 3:
-        domain = None
-
-    return domain
-
-
-def getWindowsVersion():
-    return win32api.GetVersionEx()
-
-EWX_LOGOFF = 0x00000000
-EWX_SHUTDOWN = 0x00000001
-EWX_REBOOT = 0x00000002
-EWX_FORCE = 0x00000004
-EWX_POWEROFF = 0x00000008
-EWX_FORCEIFHUNG = 0x00000010
-
-
-def reboot(flags=EWX_FORCEIFHUNG | EWX_REBOOT):
-    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),)
-    win32security.AdjustTokenPrivileges(htok, 0, privs)
-    win32api.ExitWindowsEx(flags, 0)
-
-
-def loggoff():
-    win32api.ExitWindowsEx(EWX_LOGOFF)
-
-
-def renameComputer(newName):
-    # Needs admin privileges to work
-    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))
-
-NETSETUP_JOIN_DOMAIN = 0x00000001
-NETSETUP_ACCT_CREATE = 0x00000002
-NETSETUP_ACCT_DELETE = 0x00000004
-NETSETUP_WIN9X_UPGRADE = 0x00000010
-NETSETUP_DOMAIN_JOIN_IF_JOINED = 0x00000020
-NETSETUP_JOIN_UNSECURE = 0x00000040
-NETSETUP_MACHINE_PWD_PASSED = 0x00000080
-NETSETUP_JOIN_WITH_NEW_NAME = 0x00000400
-NETSETUP_DEFER_SPN_SET = 0x1000000
-
-
-def joinDomain(domain, ou, account, password, executeInOneStep=False):
-    '''
-    Joins machine to a windows domain
-    :param domain: Domain to join to
-    :param ou: Ou that will hold machine
-    :param account: Account used to join domain
-    :param password: Password of account used to join domain
-    :param executeInOneStep: If true, means that this machine has been renamed and wants to add NETSETUP_JOIN_WITH_NEW_NAME to request so we can do rename/join in one step.
-    '''
-    # If account do not have domain, include it
-    if '@' not in account and '\\' not in account:
-        if '.' in domain:
-            account = account + '@' + domain
-        else:
-            account = domain + '\\' + account
-
-    # Do log
-    flags = NETSETUP_ACCT_CREATE | NETSETUP_DOMAIN_JOIN_IF_JOINED | NETSETUP_JOIN_DOMAIN
-
-    if executeInOneStep:
-        flags |= NETSETUP_JOIN_WITH_NEW_NAME
-
-    flags = DWORD(flags)
-
-    domain = LPCWSTR(domain)
-
-    # Must be in format "ou=.., ..., dc=...,"
-    ou = LPCWSTR(ou) if ou is not None and ou != '' else None
-    account = LPCWSTR(account)
-    password = LPCWSTR(password)
-
-    res = ctypes.windll.netapi32.NetJoinDomain(None, domain, ou, account, password, 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, domain, None, account, password, flags)
-    if res != 0:
-        # Log the error
-        error = getErrorMessage(res)
-        if res == 1355:
-            error = "DC Is not reachable"
-        print res, error
-        raise Exception('Error joining domain {}, with credentials {}/*****{}: {}, {}'.format(domain.value, account.value, ', under OU {}'.format(ou.value) if ou.value is not None else '', res, error))
-
-
-def changeUserPassword(user, oldPassword, newPassword):
-    computerName = LPCWSTR(getComputerName())
-    user = LPCWSTR(user)
-    oldPassword = LPCWSTR(oldPassword)
-    newPassword = LPCWSTR(newPassword)
-
-    res = ctypes.windll.netapi32.NetUserChangePassword(computerName, user, oldPassword, newPassword)
-
-    if res != 0:
-        # Log the error, and raise exception to parent
-        error = getErrorMessage()
-        raise Exception('Error changing password for user {}: {}'.format(user.value, error))
-
-
-class LASTINPUTINFO(ctypes.Structure):
-    _fields_ = [
-        ('cbSize', ctypes.c_uint),
-        ('dwTime', ctypes.c_uint),
-    ]
-
-
-def initIdleDuration(atLeastSeconds):
-    '''
-    In windows, there is no need to set screensaver
-    '''
-    pass
-
-
-def getIdleDuration():
-    lastInputInfo = LASTINPUTINFO()
-    lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo)
-    ctypes.windll.user32.GetLastInputInfo(ctypes.byref(lastInputInfo))
-    millis = ctypes.windll.kernel32.GetTickCount() - lastInputInfo.dwTime  # @UndefinedVariable
-    return millis / 1000.0
-
-
-def getCurrentUser():
-    '''
-    Returns current logged in username
-    '''
-    return os.environ['USERNAME']

actors/src/udsactor/windows/store.py

@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014 Virtual Cable S.L.
-# 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. 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
-'''
-from __future__ import unicode_literals
-
-from win32com.shell import shell  # @UnresolvedImport, pylint: disable=import-error
-import _winreg as wreg  # @UnresolvedImport, pylint: disable=import-error
-import win32security  # @UnresolvedImport, pylint: disable=import-error
-import cPickle
-
-DEBUG = False
-
-
-# Can be changed to whatever we want, but registry key is protected by permissions
-def encoder(data):
-    return data.encode('bz2')
-
-
-def decoder(data):
-    return data.decode('bz2')
-
-path = 'Software\\UDSActor'
-baseKey = wreg.HKEY_CURRENT_USER if DEBUG is True else wreg.HKEY_LOCAL_MACHINE  # @UndefinedVariable
-
-
-def checkPermissions():
-    return True if DEBUG else shell.IsUserAnAdmin()
-
-
-def fixRegistryPermissions(handle):
-    if DEBUG:
-        return
-    # Fix permissions so users can't read this key
-    v = win32security.GetSecurityInfo(handle, win32security.SE_REGISTRY_KEY, win32security.DACL_SECURITY_INFORMATION)
-    dacl = v.GetSecurityDescriptorDacl()
-    n = 0
-    # Remove all normal users access permissions to the registry key
-    while n < dacl.GetAceCount():
-        if unicode(dacl.GetAce(n)[2]) == u'PySID:S-1-5-32-545':  # Whell known Users SID
-            dacl.DeleteAce(n)
-        else:
-            n += 1
-    win32security.SetSecurityInfo(handle, win32security.SE_REGISTRY_KEY,
-                                  win32security.DACL_SECURITY_INFORMATION | win32security.PROTECTED_DACL_SECURITY_INFORMATION,
-                                  None, None, dacl, None)
-
-
-def readConfig():
-    try:
-        key = wreg.OpenKey(baseKey, path, 0, wreg.KEY_QUERY_VALUE)  # @UndefinedVariable
-        data, _ = wreg.QueryValueEx(key, '')  # @UndefinedVariable
-        wreg.CloseKey(key)  # @UndefinedVariable
-        return cPickle.loads(decoder(data))
-    except Exception:
-        return None
-
-
-def writeConfig(data):
-    try:
-        key = wreg.OpenKey(baseKey, path, 0, wreg.KEY_ALL_ACCESS)  # @UndefinedVariable
-    except Exception:
-        key = wreg.CreateKeyEx(baseKey, path, 0, wreg.KEY_ALL_ACCESS)  # @UndefinedVariable
-        fixRegistryPermissions(key.handle)
-
-    wreg.SetValueEx(key, "", 0, wreg.REG_BINARY, encoder(cPickle.dumps(data)))  # @UndefinedVariable
-    wreg.CloseKey(key)  # @UndefinedVariable

guacamole-tunnel/.classpath

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
-	<classpathentry kind="lib" path="/home/dkmaster/.m2/repository/org/glyptodon/guacamole/guacamole-common/0.8.0/guacamole-common-0.8.0.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

guacamole-tunnel/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>guacamole-tunnel</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

guacamole-tunnel/pom.xml

@@ -1,81 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openuds.server</groupId>
-    <artifactId>transport</artifactId>
-    <packaging>war</packaging>
-    <version>1.7.0</version>
-    <name>Guacamole Transport</name>
-    <url>http://openuds.org/</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    
-  <build>
-	<finalName>transport</finalName>
-        <plugins>
-
-            <!-- Compile using Java 1.6 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-	    
-	 <!-- Overlay guacamole-common-js (zip) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.glyptodon.guacamole</groupId>
-                            <artifactId>guacamole-common-js</artifactId>
-                            <type>zip</type>
-                        </overlay>
-                    </overlays>
-                </configuration>
-            </plugin>	    
-
-        </plugins>
-
-    </build>    
-    
-  <dependencies>
-
-        <!-- Servlet API -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Main Guacamole library -->
-        <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
-            <artifactId>guacamole-common</artifactId>
-            <version>0.9.4</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Guacamole JavaScript library -->
-        <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
-            <artifactId>guacamole-common-js</artifactId>
-            <version>0.9.4</version>
-            <type>zip</type>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-    
-    
-</project>

guacamole-tunnel/src/main/java/org/openuds/guacamole/TunnelServlet.java

@@ -1,147 +0,0 @@
-package org.openuds.guacamole;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
-import org.glyptodon.guacamole.servlet.GuacamoleSession;
-
-public class TunnelServlet
-    extends GuacamoleHTTPTunnelServlet {
-
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = 2010742981126080080L;
-	private static final String UDS_PATH = "/guacamole/";
-	private static final String UDSFILE = "udsfile";
-	private static final String UDS = "uds";
-	
-	
-	private static Properties config = null;
-	
-	private String getConfigValue(String value) throws GuacamoleException {
-		if( config == null ) {
-			try {
-				config = new Properties();
-				config.load(getServletContext().getResourceAsStream("/WEB-INF/tunnel.properties"));
-				if( null != config.getProperty(UDSFILE)) {
-					
-					BufferedReader bufferedReader = new BufferedReader(new FileReader(config.getProperty(UDSFILE)));
-					URL u = new URL(bufferedReader.readLine());
-					String uds = u.getProtocol() + "://" + u.getAuthority();
-					bufferedReader.close();
-					
-					config.put(UDS, uds);
-				}
-					
-			} catch( Exception e ) {
-				throw new GuacamoleException(e.getMessage(), e);
-			}
-		}
-		System.out.println("Getting value of " + value + ": " + config.getProperty(value));
-		
-		return config.getProperty(value);
-			
-	}
-	
-	@Override
-    protected GuacamoleTunnel doConnect(HttpServletRequest request)
-        throws GuacamoleException {
-    	
-    	String data = request.getParameter("data");
-    	String width = request.getParameter("width");
-    	String height = request.getParameter("height");
-    	
-    	if( data == null || width == null || height == null)
-    		throw new GuacamoleException("Can't read required parameters");
-    	
-		Hashtable<String,String> params = Util.readParameters( getConfigValue(UDS) + UDS_PATH + data);
-		
-		if( params == null ) {
-			System.out.println("Invalid credentials");
-			throw new GuacamoleException("Can't access required user credentials");
-		}
-		
-        System.out.println("Got parameters from remote server: " + data + ", " + width + "x" + height);
-		
-		GuacamoleClientInformation info = new GuacamoleClientInformation();
-		info.setOptimalScreenWidth(Integer.parseInt(width));
-		info.setOptimalScreenHeight(Integer.parseInt(height));
-		
-		System.out.println("Optiomal size: " + width + "x" + height);
-		
-		// Add audio mimetypes
-        String[] audio_mimetypes = request.getParameterValues("audio");
-        if (audio_mimetypes != null)
-            info.getAudioMimetypes().addAll(Arrays.asList(audio_mimetypes));
-        
-        // Add video mimetypes
-        String[] video_mimetypes = request.getParameterValues("video");
-        if (video_mimetypes != null)
-            info.getVideoMimetypes().addAll(Arrays.asList(video_mimetypes));       
-    	
-        // Create our configuration
-        GuacamoleConfiguration config = new GuacamoleConfiguration();
-        config.setProtocol(params.get("protocol"));
-        
-        System.out.println("Parsing parameters");
-        
-        Enumeration<String> keys = params.keys();
-        while( keys.hasMoreElements() ) {
-        	String key = keys.nextElement();
-        	if( "protocol".equals(key) )
-        		continue;
-        	System.out.println("Parameter " + key + ": " + params.get(key));
-        	config.setParameter(key, params.get(key));
-        }
-        
-        System.out.println("Opening soket");
-        
-        // Connect to guacd - everything is hard-coded here.
-        GuacamoleSocket socket = null;
-        try {
-	        socket = new ConfiguredGuacamoleSocket(
-	                new InetGuacamoleSocket("127.0.0.1", 4822),
-	                config, info
-	        );
-        } catch( Exception e ) {
-        	System.out.print(e.getMessage());
-        	System.out.print(e);
-        }
-        
-        System.out.println("Initializing socket " + socket.toString());
-
-        // Establish the tunnel using the connected socket
-        GuacamoleTunnel tunnel = new GuacamoleTunnel(socket);
-
-        System.out.println("Initializing tunnel " + tunnel.toString());
-        
-        // Attach tunnel to session
-        HttpSession httpSession = request.getSession(true);
-        GuacamoleSession session = new GuacamoleSession(httpSession);
-        session.attachTunnel(tunnel);
-        
-        System.out.println("Returning tunnel");
-
-        // Return pre-attached tunnel
-        return tunnel;
-
-    }
-	
-}

guacamole-tunnel/src/main/java/org/openuds/guacamole/Util.java

@@ -1,185 +0,0 @@
-package org.openuds.guacamole;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.cert.X509Certificate;
-import java.util.Hashtable;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-public class Util {
-	
-	//
-	public static Hashtable<String,String> readParameters(String url) {
-		//String url = unscramble(data);
-		//String params = getUrl(url);
-		//return parseParams(params);
-		//String params = Credentials.getAndRemove(data);
-		String params = getUrl(url);
-		if( params == null || params.equals("ERROR"))
-			return null;
-		return parseParams(params);
-	}
-	
-	public static Hashtable<String,String> parseParams(String params)
-	{
-		Hashtable<String,String> res = new Hashtable<String, String>();
-		String[] parms = params.split("\n");
-		for( int i = 0; i < parms.length;  i++) {
-			String[] val = parms[i].split("\t");
-			if( val.length == 1 )
-				res.put(val[0], "");
-			else
-				res.put(val[0], val[1]);
-		}
-		return res;
-	}
-	
-	
-	public static boolean download(String baseUrl, String id, String outputFileName) 
-	{
-		return Util.download(baseUrl, id, outputFileName, true);
-	}
-	
-	public static boolean download(String baseUrl, String id, String outputFileName, boolean ignoreCert)
-	{
-		// SSL Part got from sample at http://code.google.com/p/misc-utils/wiki/JavaHttpsUrl
-		try {
-		    final TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
-		        @Override
-		        public void checkClientTrusted( final X509Certificate[] chain, final String authType ) {
-		        }
-		        @Override
-		        public void checkServerTrusted( final X509Certificate[] chain, final String authType ) {
-		        }
-		        @Override
-		        public X509Certificate[] getAcceptedIssuers() {
-		            return null;
-		        }
-		    } };
-		    
-		 // Install the all-trusting trust manager
-		    final SSLContext sslContext = SSLContext.getInstance( "SSL" );
-		    sslContext.init( null, trustAllCerts, new java.security.SecureRandom() );
-		    // Create an ssl socket factory with our all-trusting manager
-		    final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-			
-			java.net.URL u = new java.net.URL(baseUrl + id);
-			java.net.URLConnection uc = u.openConnection();
-			
-			System.out.println(baseUrl);
-			System.out.println(uc);
-			
-			// If ignoring server certificates, disable ssl certificate checking
-			if( ignoreCert && uc instanceof HttpsURLConnection) {
-				((HttpsURLConnection)uc).setSSLSocketFactory( sslSocketFactory );
-			}
-			
-		    String contentType = uc.getContentType();
-		    int contentLength = uc.getContentLength();
-		    if (contentType.startsWith("text/") || contentLength == -1) {
-		      throw new IOException("This is not a binary file.");
-		    }
-		    InputStream raw = uc.getInputStream();
-		    InputStream in = new BufferedInputStream(raw);
-		    byte[] data = new byte[contentLength];
-		    int bytesRead = 0;
-		    int offset = 0;
-		    while (offset < contentLength) {
-		      bytesRead = in.read(data, offset, data.length - offset);
-		      if (bytesRead == -1)
-		        break;
-		      offset += bytesRead;
-		    }
-		    in.close();
-
-		    if (offset != contentLength) {
-		      throw new IOException("Only read " + offset + " bytes; Expected " + contentLength + " bytes");
-		    }		    
-		    
-			java.io.FileOutputStream out = new java.io.FileOutputStream(outputFileName);
-		    out.write(data);
-		    out.flush();
-		    out.close();			
-			
-		} catch(Exception e) {
-			System.out.println("Unable to download file, already present or network error? " + e.getMessage());
-			return false;
-		}
-		return true;
-	}
-	
-	
-	public static String getUrl(String url) {
-		return Util.getUrl(url, true);
-	}
-	
-	public static String getUrl(String url, boolean ignoreCert) {
-		try {
-			// SSL Part got from sample at http://code.google.com/p/misc-utils/wiki/JavaHttpsUrl
-		    final TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
-		        @Override
-		        public void checkClientTrusted( final X509Certificate[] chain, final String authType ) {
-		        }
-		        @Override
-		        public void checkServerTrusted( final X509Certificate[] chain, final String authType ) {
-		        }
-		        @Override
-		        public X509Certificate[] getAcceptedIssuers() {
-		            return null;
-		        }
-		    } };
-			    
-		    // Install the all-trusting trust manager
-		    final SSLContext sslContext = SSLContext.getInstance( "SSL" );
-		    sslContext.init( null, trustAllCerts, new java.security.SecureRandom() );
-		    // Create an ssl socket factory with our all-trusting manager
-		    final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-			
-			java.net.URL u = new java.net.URL(url);
-			java.net.URLConnection uc = u.openConnection();
-			
-			System.out.println(url);
-			System.out.println(uc instanceof HttpsURLConnection);
-			
-			// If ignoring server certificates, disable ssl certificate checking and hostname checking
-			if( ignoreCert && uc instanceof HttpsURLConnection) {
-				((HttpsURLConnection)uc).setSSLSocketFactory( sslSocketFactory );
-				((HttpsURLConnection)uc).setHostnameVerifier(
-				        new HostnameVerifier() {
-							@Override
-							public boolean verify(String arg0, SSLSession arg1) {
-								return true;
-							}
-				        });
-			}
-			
-			BufferedReader in = new BufferedReader(new InputStreamReader(uc.getInputStream()));
-			StringBuilder data = new StringBuilder();
-			
-			String inputLine;
-			while ((inputLine = in.readLine()) != null) {
-				data.append(inputLine);
-				data.append("\n");
-			}
-				
-			in.close();
-			return data.toString();
-			
-		} catch(Exception e) {
-			System.out.println("Unable to get url. Network error? " + e.getMessage());
-			return null;
-		}
-		
-	}
-	
-}

guacamole-tunnel/src/main/webapp/WEB-INF/tunnel.properties

@@ -1,5 +0,0 @@
-# We can specify the uds server here as:
-# uds=http://172.27.0.1:8000
-# Or we can get the server from an external file. The path part of the URL inside the file will be removed,
-# so, if we put "https://example.com/other", the value of uds configuration will be "https://example.com"
-udsfile=/var/ssh_443/etc/uds.conf

guacamole-tunnel/src/main/webapp/WEB-INF/web.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5"
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-                        http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-    <!-- Basic config -->
-    <welcome-file-list>
-        <welcome-file>index.xhtml</welcome-file>
-    </welcome-file-list>
-
-    <!-- Guacamole Tunnel Servlet -->
-    <servlet>
-        <description>Tunnel Servlet</description>
-        <servlet-name>Tunnel</servlet-name>
-        <servlet-class>
-           org.openuds.guacamole.TunnelServlet
-        </servlet-class>
-    </servlet>
-
-    <servlet>
-        <description>Credentials Servlet</description>
-        <servlet-name>Credentials</servlet-name>
-        <servlet-class>
-           org.openuds.guacamole.CredentialsServlet
-        </servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>Tunnel</servlet-name>
-        <url-pattern>/tunnel</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>Credentials</servlet-name>
-        <url-pattern>/creds</url-pattern>
-    </servlet-mapping>
-
-</web-app>