This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit e734f01b2dc5bc411f7e8dd49c27a3adfb348fb4 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 28 16:42:41 2016 +0100 misc: whitespace only. --- Makefile.docupload | 1 - README | 4 +- debian/changelog | 8 +-- debian/copyright | 2 +- man/man1/pyhoca-cli.1 | 134 ++++++++++++++++++++++++------------------------- pyhoca/cli/frontend.py | 10 ++-- setup.py | 2 +- 7 files changed, 80 insertions(+), 81 deletions(-) diff --git a/Makefile.docupload b/Makefile.docupload index 8195e42c..30857760 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -13,7 +13,6 @@ docbuild: make -f Makefile.man2html build_man2html docupload: - ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH}; rm -Rfv ${DOC_PATH}/*; }" scp -r .build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/ diff --git a/README b/README index 0a72b386..9c1b0e51 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/agpl.html for a recent copy. * start a new session on an X2Go server * resume a suspended session on an X2Go server * suspend a running session (hit Ctrl+C) -* terminate a running session +* terminate a running session * retrieve a list of running sessions * sound support available * local folder sharing @@ -36,7 +36,7 @@ See http://www.gnu.org/licenses/agpl.html for a recent copy. === How to use it === -Please refer to the man page: +Please refer to the man page: man pyhoca-cli diff --git a/debian/changelog b/debian/changelog index 3d166985..4f1248bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,7 +88,7 @@ pyhoca-cli (0.4.0.0-0~x2go1) unstable; urgency=low * New upstream version (0.4.0.0): - Importing all of pyhoca.cli in setup.py causes rpmbuild problems due to DISPLAY not being set. It is overkill as well, causing extra - dependencies to be installed at build time. (Fixes: #91). + dependencies to be installed at build time. (Fixes: #91). [ Mike Gabriel ] * Bump version to 0.4.0.0. @@ -201,7 +201,7 @@ pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low * New upstream version (0.1.4.0): - Add X2Go desktop sharing support. - - Terminate shared desktop sessions of Ctrl-C (instead of + - Terminate shared desktop sessions of Ctrl-C (instead of suspending them. * React to Debian bug #627990, prefer man2html-base over man2html. @@ -312,8 +312,8 @@ pyhoca-cli (0.0.13-0~nwt1) lucid maverick testing unstable; urgency=low pyhoca-cli (0.0.12-0~nwt1) lucid maverick testing unstable; urgency=low - * if no SSH private key file is specified (default) pyhoca looks - for standard private key files and if present tries to use them + * if no SSH private key file is specified (default) pyhoca looks + for standard private key files and if present tries to use them (imitates behaviour of openssh-client). If you do not want to use SSH pub/priv key authentication, remove your priv key files from the .ssh folder. diff --git a/debian/copyright b/debian/copyright index e085c16d..17c2542e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ License: AGPL-3+ License: AGPL-3+ PyHoca-CLI is free software; you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. . diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 69bbed1f..0f8fb553 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -22,12 +22,12 @@ pyhoca-cli \- X2Go command line client written in Python .ad b 'hy .SH DESCRIPTION -\fBpyhoca-cli\fR aims to be a cross-platform (Windows, Mac OS X, Linux) X2Go command line client written +\fBpyhoca-cli\fR aims to be a cross-platform (Windows, Mac OS X, Linux) X2Go command line client written in Python. .PP -You can use it +You can use it for scripting remote X2Go sessions or simply starting, resuming or shadowing X2Go sessions from -the command line in a terminal. +the command line in a terminal. .PP It supports versatile command line options as well as parsing \fBx2goclient\fR configuration @@ -37,54 +37,54 @@ See the included README and TODO for further information on \fBpyhoca-cli\fR. .SH COMMON OPTIONS \fBpyhoca-cli\fR accepts the following common options: .TP -\*(T<\fB\-h, \-\-help\fR\*(T> +\*(T<\fB\-h, \-\-help\fR\*(T> Display a help with all available command line options and exit. -.TP -\*(T<\fB\-V, \-\-version\fR\*(T> +.TP +\*(T<\fB\-V, \-\-version\fR\*(T> Output version information and exit. -.TP -\*(T<\fB\-d, \-\-quiet\fR\*(T> +.TP +\*(T<\fB\-d, \-\-quiet\fR\*(T> No output to stdout at all! -.TP -\*(T<\fB\-d, \-\-debug\fR\*(T> +.TP +\*(T<\fB\-d, \-\-debug\fR\*(T> Enable debugging output. -.TP -\*(T<\fB\-\-libdebug\fR\*(T> +.TP +\*(T<\fB\-\-libdebug\fR\*(T> Enable debugging code of the unterlying Python X2Go module. -.TP -\*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> +.TP +\*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> Enable debugging code of Python X2Go's sFTP server code (very verbose, and it may even reveal promiscuous data). .SH SERVER / SESSION PROFILE You either have to specify a server name or a pre-configured X2GoClient session profile to tell \fBpyhoca-cli\fR to what X2Go server to connect. \fBpyhoca-cli\fR will not start if neither of these two options has been given on the command line. .TP -\*(T<\fB\-\-server\fR \fI<HOSTNAME_or_IP>\fR\*(T> +\*(T<\fB\-\-server\fR \fI<HOSTNAME_or_IP>\fR\*(T> If not in LDAP mode you always have to name the remote X2Go server's hostname or IP address. -.TP +.TP \*(T<\fB\-P, \-\-session-profile\fR \fI<SESSION_PROFILE_NAME>\fR\*(T> The name of the session profile to be used to make the connection. .SH ACTIONS \fBpyhoca-cli\fR accepts exclusively one of the listed actions: .TP -\*(T<\fB\-N, \-\-new\fR\*(T> +\*(T<\fB\-N, \-\-new\fR\*(T> Start a new X2Go session on server (default mode if no mode is explicitly specified). -.TP -\*(T<\fB\-R, \-\-resume\fR \fI<SESSION_NAME>\fR\*(T> +.TP +\*(T<\fB\-R, \-\-resume\fR \fI<SESSION_NAME>\fR\*(T> Resume existing X2Go session <SESSION_NAME> on server. Special values for <SESSION_NAME> are ,,NEWEST'' (will resume youngest session) or ,,OLDEST'' (resume session with oldest timestamp). -.TP +.TP \*(T<\fB\-D, \-\-share-desktop\fR \fI<USER>@<DISPLAY>\fR\*(T> Share an X2Go session on the remote server specified by <USER>@<DISPLAY>, whereas <USER> can be the same user that is starting the share mode session or any other user that grants X2Go desktop sharing for the current user. -.TP -\*(T<\fB\-S, \-\-suspend\fR \fI<SESSION_NAME>\fR\*(T> +.TP +\*(T<\fB\-S, \-\-suspend\fR \fI<SESSION_NAME>\fR\*(T> Suspend running X2Go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will suspend all sessions of the connected user). -.TP -\*(T<\fB\-T, \-\-terminate\fR \fI<SESSION_NAME>\fR\*(T> +.TP +\*(T<\fB\-T, \-\-terminate\fR \fI<SESSION_NAME>\fR\*(T> Terminate running X2Go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will terminate all sessions of the connected user). -.TP +.TP \*(T<\fB\-L, \-\-list-sessions\fR\*(T> List user's X2Go sessions on server. .TP @@ -101,46 +101,46 @@ This option is only available for the Linux version of \fBpyhoca-cli\fR. .SH ACTION OPTIONS \fBpyhoca-cli\fR actions can be tweaked by these options: .TP -\*(T<\fB\-\-clean-sessions\fR\*(T> +\*(T<\fB\-\-clean-sessions\fR\*(T> Clean all of the user's suspended/running sessions before starting a new one on the named X2Go server. .TP -\*(T<\fB\-\-terminate-on-ctrl-c\fR\*(T> +\*(T<\fB\-\-terminate-on-ctrl-c\fR\*(T> Terminate the connected session when pressing CTRL+C (instead of suspending the session). .SH X2GO OPTIONS -.TP -\*(T<\fB\-c, \-\-command\fR \fI<CMD>\fR\*(T> +.TP +\*(T<\fB\-c, \-\-command\fR \fI<CMD>\fR\*(T> Command to run with \fB\-\-new\fR mode on server (default: xterm). -.TP -\*(T<\fB\-u, \-\-username\fR \fI<USERNAME>\fR\*(T> +.TP +\*(T<\fB\-u, \-\-username\fR \fI<USERNAME>\fR\*(T> Username for the session (default: currently logged in user). -.TP -\*(T<\fB\-\-password\fR \fI<PASSWORD>\fR\*(T> +.TP +\*(T<\fB\-\-password\fR \fI<PASSWORD>\fR\*(T> User password for this session. If a matching private SSH key is available this one will be preferred for authentication. The cleartext password that has been specified at the command line will be masqueraded in the systems process list (Linux, MacOS). On Windows systems the usage of the \-\-password option is forbidden. -.TP -\*(T<\fB\-p, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T> +.TP +\*(T<\fB\-p, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T> Remote X2Go server's SSH port (default: 22). -.TP -\*(T<\fB\-k, \-\-ssh-privkey\fR \fI<SSH_PRIVKEY>\fR\*(T> +.TP +\*(T<\fB\-k, \-\-ssh-privkey\fR \fI<SSH_PRIVKEY>\fR\*(T> Use file <SSH_PRIVKEY> as private key for SSH connections (default: ~/.ssh/id_rsa). -.TP -\*(T<\fB\-\-add\-to\-known\-hosts\fR\*(T> +.TP +\*(T<\fB\-\-add\-to\-known\-hosts\fR\*(T> Add RSA/DSA host key to ~/.ssh/known_hosts if authenticity of server can't be established (default: not set). -.TP -\*(T<\fB\-\-sound\fR \fI{pulse|esd|none}\fR\*(T> +.TP +\*(T<\fB\-\-sound\fR \fI{pulse|esd|none}\fR\*(T> X2Go server's sound system (default: 'pulse'). -.TP -\*(T<\fB\-F, \-\-share-local-folders\fR \fI<folder1>[,<folder2>[,...]]\fR\*(T> +.TP +\*(T<\fB\-F, \-\-share-local-folders\fR \fI<folder1>[,<folder2>[,...]]\fR\*(T> A comma separated list of local folders that shall be made available in the remote X2Go session. -.TP -\*(T<\fB\-\-printing\fR\*(T> +.TP +\*(T<\fB\-\-printing\fR\*(T> Use X2Go printing (default: disabled). -.TP -\*(T<\fB\-\-share-mode\fR \fI{0|1}\fR\*(T> +.TP +\*(T<\fB\-\-share-mode\fR \fI{0|1}\fR\*(T> Share mode for X2Go desktop sharing (0: view-only, 1: full access). .TP -\*(T<\fB\-\-auth-attempts\fR \fI{0,1,2,3,...}\fR\*(T> +\*(T<\fB\-\-auth-attempts\fR \fI{0,1,2,3,...}\fR\*(T> Number of interactive authentication attempts in case authentication with the server fails (wrong password?). A value that equals 0 disables interactive authentication completely and requires that a private SSH key has been given on the command line or in the session profile or that the \-\-password command line option is used. @@ -153,7 +153,7 @@ Specify the <URL> of the X2Go Session Broker. \fBpyhoca-cli\fR can access http:/ Syntax of <URL> for HTTP brokerage: -http(s)://<user>:<password>@<hostname>:<port>/path/to/broker +http(s)://<user>:<password>@<hostname>:<port>/path/to/broker Syntax of <URL> for SSH brokerage: @@ -182,30 +182,30 @@ try those for authentication against the X2Go Session Broker. (Not implemented, .TP \*(T<\fB\-\-broker-ssh-key=<SSHPRIVKEY>\fR\*(T> NOT IMPLEMENTED YET: For SSH based X2Go Session Brokers. Full path to a valid SSH private key file. (Not implemented, yet). -.SH NX OPTIONS (Version 3) +.SH NX OPTIONS (Version 3) .TP -\*(T<\fB\-g, \-\-geometry\fR \fI{<WIDTH>x<HEIGHT>|fullscreen|maximize}\fR\*(T> +\*(T<\fB\-g, \-\-geometry\fR \fI{<WIDTH>x<HEIGHT>|fullscreen|maximize}\fR\*(T> Screen geometry (default: '800x600'). -.TP -\*(T<\fB\-q, \-\-link\fR \fI{modem|isdn|adsl|wan|lan}\fR\*(T> +.TP +\*(T<\fB\-q, \-\-link\fR \fI{modem|isdn|adsl|wan|lan}\fR\*(T> link quality (default: 'adsl') -.TP -\*(T<\fB\-t, \-\-session\-type\fR \fI{desktop|application}\fR\*(T> -Session type (default: 'application'). Note: there are also some auto-detection -feature for the session type built into the code. +.TP +\*(T<\fB\-t, \-\-session\-type\fR \fI{desktop|application}\fR\*(T> +Session type (default: 'application'). Note: there are also some auto-detection +feature for the session type built into the code. It might not always happen what you expect from setting this option. -.TP +.TP \*(T<\fB\-p, \-\-pack\fR \fI<PACK_METHOD>\fR\*(T> Compression method (see below for possible values). -.TP +.TP \*(T<\fB\-\-kbd\-layout\fR \fI{us|de|fr|...}\fR\*(T> Use keyboard layout (default: 'us'). -.TP +.TP \*(T<\fB\-\-kbd\-type\fR \fI{auto|pc105/us|pc105/de|...}\fR\*(T> Set Keyboard type (default 'pc105/us'). Use \fIauto\fR as value here to enable X2Go's keyboard auto-detection code. .SH BACKEND OPTIONS \fBpyhoca-gui\fR supports transparent use of different data backends. For configuration three backends are common: -FILE, GCONF (Linux only) and WINREG (Windows only). The default backend currently is the FILE backend +FILE, GCONF (Linux only) and WINREG (Windows only). The default backend currently is the FILE backend on all platforms. .PP For client-server communication the only yet implemented backend is the STDOUT backend (as X2Go server commands @@ -238,20 +238,20 @@ Use given backend for accessing the client settings configuration, available bac \*(T<\fB\-\-backend-clientprinting <CLIENTPRINTING_BACKEND>\fR\*(T> Use given backend for accessing the client printing configuration, available backends on Linux: FILES, GCONF; on Windows: FILES, WINREG..SH COMPATIBILITY OPTIONS \fBpyhoca-cli\fR aims at being fully compatible with all command line options and session config files of the X2Go project's X2Go command -line client \fBx2goclient-cli\fR as well as the \fBx2goclient\fR GUI. This is still work in progress. +line client \fBx2goclient-cli\fR as well as the \fBx2goclient\fR GUI. This is still work in progress. To achieve this, some compatibility options have already been added: .TP \*(T<\fB\-\-port\fR \fI<R_PORT>\fR\*(T> Compatibility option, synonymous to \fB\-\-remote\-ssh\-port\fR \fI<R_PORT>\fR. -.TP +.TP \*(T<\fB\-\-ssh\-key\fR \fI<SSH_PRIVKEY>\fR\*(T> Compatibility option, synonymous to \fB\-\-ssh-privkey\fR \fISSH_KEY\fR. -.TP +.TP \*(T<\fB\-\-use\-sound\fR \fI{yes|no}\fR\*(T> Compatibility option, synonymous to \fB\-\-sound\fR \fI{pulse|none}\fR. -.TP -\*(T<\fB\-\-client-ssh-port\fR \fI<PORT>\fR\*(T> +.TP +\*(T<\fB\-\-client-ssh-port\fR \fI<PORT>\fR\*(T> Compatibility option for the x2goclient GUI. PyHoca-Cli (resp. Python X2Go) brings its own internal sFTP server. Thus, this option will be ignored. .SH NX COMPRESSION METHODS As NX compression methods (\fB--pack\fR option) the following values are possible. The % character must be replaced by a digit 0-9. @@ -274,4 +274,4 @@ rfb-hextile, rfb-tight, rfb-tight-compressed .SH AUTHOR This manual has been written by for the X2Go project (http://www.x2go.org) by -Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Mike Gabriel <mike.gabriel@das-netzwerkteam.de> diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 9aa51ff4..f7818349 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -87,7 +87,7 @@ class PyHocaCLI(x2go.X2GoClient): _peername = self._X2GoClient__get_session_server_peername(s_hash) print "Host: %s - [%s]:%s" % (self._X2GoClient__get_session_server_hostname(s_hash), _peername[0], _peername[1]) print "Username: %s" % self._X2GoClient__get_session_username(s_hash) - print + print session_infos = self._X2GoClient__list_sessions(s_hash) if session_infos: for session_info in session_infos.values(): @@ -129,7 +129,7 @@ class PyHocaCLI(x2go.X2GoClient): _peername = self._X2GoClient__get_session_server_peername(s_hash) print "Host: %s - [%s]:%s" % (self._X2GoClient__get_session_server_hostname(s_hash), _peername[0], _peername[1]) print "Username: %s" % self._X2GoClient__get_session_username(s_hash) - print + print desktop_list = self._X2GoClient__list_desktops(s_hash) if desktop_list: for desktop_name in desktop_list: @@ -155,7 +155,7 @@ class PyHocaCLI(x2go.X2GoClient): _session_params = _profiles.to_session_params(_profile_id) print _profile_config print _session_params - print + print def clean_sessions(self, s_hash): """\ @@ -315,7 +315,7 @@ class PyHocaCLI(x2go.X2GoClient): L{PyHocaCLI} constructor for logging application events @type logger: Python X2Go C{X2GoLogger} instance @param liblogger: you can pass an L{X2GoLogger} object to the - L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2GoClient} class in Python X2Go + L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2GoClient} class in Python X2Go @type liblogger: Python X2Go C{X2GoLogger} instance """ @@ -415,7 +415,7 @@ class PyHocaCLI(x2go.X2GoClient): else: # setup up the manually configured X2Go session - self.x2go_session_hash = self._X2GoClient__register_session(args.server, port=int(self.args.remote_ssh_port), + self.x2go_session_hash = self._X2GoClient__register_session(args.server, port=int(self.args.remote_ssh_port), known_hosts=ssh_known_hosts_filename, username=self.args.username, key_filename=self.args.ssh_privkey, diff --git a/setup.py b/setup.py index 0df06368..78cdb9da 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2010-2016 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git