x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

[x2goclient] 67/94: man page update
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 1c38b7f4abd740dfa262f17a5c878901f7645e0c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 12:16:57 2011 +0200 man page update --- man/pyhoca-cli.1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/man/pyhoca-cli.1 b/man/pyhoca-cli.1 index 43e1e82b..51ffa4bc 100644 --- a/man/pyhoca-cli.1 +++ b/man/pyhoca-cli.1 @@ -86,6 +86,11 @@ Command to run with \fB\-\-new\fR mode on server (default: xterm). \*(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> +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 system the usage of the --password option is forbidden. +.TP \*(T<\fB\-p, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T> Remote X2go server's SSH port (default: 22). .TP -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 64/94: version increment, debian changelog entry
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 90090ef4643a468e1618b2f2a0c21b6b0be0ebdf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 12:07:52 2011 +0200 version increment, debian changelog entry --- debian/changelog | 13 +++++++++++++ pyhoca/cli/__init__.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7b9b3628..32a49a2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +pyhoca-cli (0.1.3.1-0~x2go1) lucid; urgency=low + + * New upstream version 0.1.3.1: + - using setproctitle for process list manipulation + - adds --password option (with masquerading of cleartext password in ps ouput) + - works around Ctrl-C in getpass.getpass + - short option for --port now is -p + - move to interactive auth if SSH privkey does not get accepted by server + - checking of session profile (-P) exists + - take username from session profile when using -P option + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 17 May 2011 12:03:40 +0200 + pyhoca-cli (0.1.3.0-0~nwt1) lucid; urgency=low * change-over to four digit version pattern diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index c6b92866..ebbea676 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.3" +__VERSION__ = "0.1.3.1" from frontend import * \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 65/94: removed old build script
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 013b28046876a901b16b5ec41291de210ccab4da Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 12:08:07 2011 +0200 removed old build script --- build-for-reprepro.sh | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/build-for-reprepro.sh b/build-for-reprepro.sh deleted file mode 100755 index 5bc4bf8b..00000000 --- a/build-for-reprepro.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> -# -# This programme 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 3 of the License, or -# (at your option) any later version. -# -# This programme 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 St, Fifth Floor, Boston, MA 02110-1301, USA. - -PACKAGE=pyhoca-cli - -rm -f ../$PACKAGE_*.changes -rm -f ../$PACKAGE_*.upload -rm -f ../$PACKAGE_*.build -rm -f ../$PACKAGE_*.dsc -rm -f ../$PACKAGE_*.tar.gz -rm -f ../$PACKAGE*.deb - -cp debian/changelog debian/changelog.new -editor debian/changelog.new -mv debian/changelog.new debian/changelog - -debuild - -cd .. -rm -f $PACKAGE_*.upload -dupload --to nwt-ubuntu $PACKAGE_*.changes -rm -f $PACKAGE_*.upload -dupload --to nwt-debian $PACKAGE_*.changes -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 63/94: moving setproctitle stanze further up, fixed typo
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit bdf71da2a41cbcd042c61db71d3c2bf38a0a80a3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 11:50:50 2011 +0200 moving setproctitle stanze further up, fixed typo --- pyhoca-cli | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 8911499a..c00b6b39 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -35,6 +35,17 @@ if app.startswith('./'): sys.path.insert(0, os.path.join(os.path.dirname(__file__))) os.environ['PYTHONX2GO_LOCAL'] = '1' +PROG_NAME = os.path.basename(sys.argv[0]) +PROG_PID = os.getpid() +PROG_OPTIONS = sys.argv[1:] +_password_index = PROG_OPTIONS.index('--password')+1 +PROG_OPTIONS[_password_index] = "XXXXXXXX" + +from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS +if _X2GOCLIENT_OS in ('Linux', 'Mac'): + import setproctitle + setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) + import time import pprint import argparse @@ -51,19 +62,8 @@ from x2go.defaults import DEFAULT_PDFSAVE_LOCATION from x2go.defaults import DEFAULT_PRINTCMD_CMD from pyhoca.cli import current_home, PyHocaCLI, runtime_error -from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS # version information -PROG_NAME = os.path.basename(sys.argv[0]) -PROG_PID = os.getpid() -PROG_OPTIONS = sys.argv[1:] -_password_index = PROG_OPTIONS.index('--password')+1 -PROG_OPTIONS[_password_index] = "XXXXXXXX" - -if _X2GOCLIENT_OS in ('Linux', 'Mac'): - import setproctitle - setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) - from pyhoca.cli import __VERSION__ as _version VERSION=_version VERSION_TEXT=""" @@ -190,7 +190,7 @@ Possible values for the --pack NX option are: if a.libdebug_sftpxfer: liblogger.enable_debug_sftpxfer() - if a.password and _X2GOCLIENT_OS == "Windows" + if a.password and _X2GOCLIENT_OS == "Windows": runtime_error("The --password option is forbidden on Windows platforms", parser=p, exitcode=222) if a.version: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 60/94: adds setproctitle support
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 73823b61e7a7c3072c3ee8a0dde4e0e4648ed3e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 11:18:55 2011 +0200 adds setproctitle support --- pyhoca-cli | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pyhoca-cli b/pyhoca-cli index 8db75c33..3e4c220f 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -55,6 +55,13 @@ from pyhoca.cli import current_home, PyHocaCLI, runtime_error # version information PROG_NAME = os.path.basename(sys.argv[0]) PROG_PID = os.getpid() + +from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS + +if _X2GOCLIENT_OS in ('Linux', 'Mac'): + import setproctitle + setproctitle.setproctitle(PROG_NAME) + from pyhoca.cli import __VERSION__ as _version VERSION=_version VERSION_TEXT=""" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 61/94: interpuctation beautification
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 970d692fea8f4931c2c15c80c602016fc65fea02 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 11:47:02 2011 +0200 interpuctation beautification --- pyhoca/cli/frontend.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index c197e5fa..a22c1048 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -157,7 +157,7 @@ class PyHocaCLI(x2go.X2goClient): if self.args.resume in available_sessions.keys(): self._X2goClient__resume_session(s_hash, self.args.resume) else: - self._runtime_error('requested session not available on X2go server [%s]:%s.' % (self.args.server, self.args.remote_ssh_port), exitcode=20) + self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20) def suspend_session(self, s_hash): @@ -170,7 +170,7 @@ class PyHocaCLI(x2go.X2goClient): if self.args.suspend in available_sessions.keys(): self._X2goClient__suspend_session(s_hash, self.args.suspend) else: - self._runtime_error('requested session not available on X2go server [%s]:%s.' % (self.args.server, self.args.remote_ssh_port), exitcode=21) + self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=21) def terminate_session(self, s_hash): @@ -183,7 +183,7 @@ class PyHocaCLI(x2go.X2goClient): if self.args.terminate in available_sessions.keys(): self._X2goClient__terminate_session(s_hash, self.args.terminate) else: - self._runtime_error('requested session not available on X2go server [%s]:%s.' % (self.args.server, self.args.remote_ssh_port), exitcode=22) + self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=22) def __init__(self, args, logger=None, liblogger=None): @@ -204,7 +204,7 @@ class PyHocaCLI(x2go.X2goClient): _profiles = self._X2goClient__get_profiles() if self.args.session_profile and not _profiles.has_profile(self.args.session_profile): - self._runtime_error('no such session profile of name: %s.' % (self.args.session_profile), exitcode=31) + self._runtime_error('no such session profile of name: %s' % (self.args.session_profile), exitcode=31) if self.args.session_profile: @@ -279,12 +279,12 @@ class PyHocaCLI(x2go.X2goClient): if self.args.password is not None and '\x03' in self.args.password: raise KeyboardInterrupt() except KeyboardInterrupt: - self._runtime_error('Authentication cancelled by user by hitting Ctrl-C at password prompt.', exitcode=-200) + self._runtime_error('Authentication cancelled by user by hitting Ctrl-C at password prompt', exitcode=-200) _auth_count -= 1 if not _auth_count: - self._runtime_error('Authentication failed, too many failures during interactive login.', exitcode=-201) + self._runtime_error('Authentication failed, too many failures during interactive login', exitcode=-201) except socket.error, e: self._runtime_error('a socket error occured while establishing the connection: %s' % str(e), exitcode=-245) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 62/94: reintroducing the --password option secured by setproctitle
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 3ec0c5db1f8eb5c03d8aeeb2a2a09257ac691e81 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 11:47:52 2011 +0200 reintroducing the --password option secured by setproctitle --- pyhoca-cli | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 3e4c220f..8911499a 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -51,16 +51,18 @@ from x2go.defaults import DEFAULT_PDFSAVE_LOCATION from x2go.defaults import DEFAULT_PRINTCMD_CMD from pyhoca.cli import current_home, PyHocaCLI, runtime_error +from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS # version information PROG_NAME = os.path.basename(sys.argv[0]) PROG_PID = os.getpid() - -from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS +PROG_OPTIONS = sys.argv[1:] +_password_index = PROG_OPTIONS.index('--password')+1 +PROG_OPTIONS[_password_index] = "XXXXXXXX" if _X2GOCLIENT_OS in ('Linux', 'Mac'): import setproctitle - setproctitle.setproctitle(PROG_NAME) + setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) from pyhoca.cli import __VERSION__ as _version VERSION=_version @@ -104,6 +106,7 @@ x2go_options = [ # NOT IMPLEMENTED {'args':['--config'], 'default': '~/.x2goclient/sessions', 'help': 'x2goclient config file containing x2go session settings (default: ~/.x2goclient/sessions)', }, {'args':['-c','--command'], 'default': 'TERMINAL', 'help': 'command to run with -R mode on server (default: xterm)', }, {'args':['-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', }, + {'args':['--password'], 'default': None, 'help': 'user password for session authentication', }, {'args':['-p','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', }, {'args':['-k','--ssh-privkey'], 'default': None, 'help': 'use file \'SSH_PRIVKEY\' as private key for the SSH connection (e.g. ~/.ssh/id_rsa)', }, {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'add RSA host key fingerprint to ~/.ssh/known_hosts if authenticity of server can\'t be established (default: not set)', }, @@ -187,6 +190,9 @@ Possible values for the --pack NX option are: if a.libdebug_sftpxfer: liblogger.enable_debug_sftpxfer() + if a.password and _X2GOCLIENT_OS == "Windows" + runtime_error("The --password option is forbidden on Windows platforms", parser=p, exitcode=222) + if a.version: version() @@ -194,9 +200,6 @@ Possible values for the --pack NX option are: if a.username is None and not a.session_profile: a.username = current_user - # statically no password from the command line - a.password = None - # time-to-wait needs to be an integer try: a.time_to_wait = int(a.time_to_wait) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 57/94: explicit logon failure after 3 attempts
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 004f5fcb3c8a29815e55daec1db204bedfaa0d25 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:22:34 2011 +0200 explicit logon failure after 3 attempts --- pyhoca/cli/frontend.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 564f7872..f1b87ec5 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -253,7 +253,6 @@ class PyHocaCLI(x2go.X2goClient): _auth_count = 4 while not connected and _auth_count: - _auth_count -= 1 try: self._X2goClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True @@ -278,6 +277,11 @@ class PyHocaCLI(x2go.X2goClient): except KeyboardInterrupt: self._runtime_error('Authentication cancelled by user by hitting Ctrl-C at password prompt.', exitcode=-200) + _auth_count -= 1 + + if not _auth_count: + self._runtime_error('Authentication failed, too many failures during interactive login.', exitcode=-200) + except socket.error, e: self._runtime_error('a socket error occured while establishing the connection: %s' % str(e), exitcode=-245) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 58/94: fixed exitcode
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit ec91855ea98f392cd1e45db260e907d7d26d2f54 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:23:12 2011 +0200 fixed exitcode --- pyhoca/cli/frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index f1b87ec5..0a9e8ae6 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -280,7 +280,7 @@ class PyHocaCLI(x2go.X2goClient): _auth_count -= 1 if not _auth_count: - self._runtime_error('Authentication failed, too many failures during interactive login.', exitcode=-200) + self._runtime_error('Authentication failed, too many failures during interactive login.', exitcode=-201) except socket.error, e: self._runtime_error('a socket error occured while establishing the connection: %s' % str(e), exitcode=-245) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 59/94: fixes list sessions output, depends on newest python-x2go code
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 49946e41d34eca8773c5f1828c4464f4683f8093 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:33:45 2011 +0200 fixes list sessions output, depends on newest python-x2go code --- debian/control | 2 +- pyhoca/cli/frontend.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index d1762f25..bca4c9b5 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.0.43-0~0), + python-x2go (>=0.0.44-0~0), python-argparse, python-setproctitle Description: A command line X2go client written in Python diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 0a9e8ae6..c197e5fa 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -81,7 +81,8 @@ class PyHocaCLI(x2go.X2goClient): print print "Available runing/suspended X2go sessions" print "========================================" - print "Host: [%s]:%s" % self._X2goClient__get_session_server(s_hash) + _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 session_infos = self._X2goClient__list_sessions(s_hash) @@ -102,6 +103,9 @@ class PyHocaCLI(x2go.X2goClient): # TODO: turn into datetime object print "suspended since: %s" % session_info.date_suspended print + else: + print "No running/suspended sessions found on X2go server." + print def list_profiles(self): # retrieve a session list -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits