x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

[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

[x2goclient] 56/94: fail interactive authentication 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 f6b634be8b9def002f6f31ba2d6145d472017189 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:19:23 2011 +0200 fail interactive authentication after 3 attempts --- pyhoca/cli/frontend.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 52bfcccb..564f7872 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -251,7 +251,9 @@ class PyHocaCLI(x2go.X2goClient): _username = self.args.username or self._X2goClient__get_session_username(self.x2go_session_hash) try: - while not connected: + _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 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 54/94: exchange -r option by -p
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 16f5dc662ca4cc6cd45ef535e40fb1d67bc9cd3d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:10:42 2011 +0200 exchange -r option by -p --- man/pyhoca-cli.1 | 2 +- pyhoca-cli | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/pyhoca-cli.1 b/man/pyhoca-cli.1 index 08c646f2..43e1e82b 100644 --- a/man/pyhoca-cli.1 +++ b/man/pyhoca-cli.1 @@ -86,7 +86,7 @@ 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\-r, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T> +\*(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> diff --git a/pyhoca-cli b/pyhoca-cli index c26198de..8db75c33 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -97,7 +97,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':['-r','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', }, + {'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)', }, {'args':['--sound'], 'default': 'pulse', 'choices': ('pulse', 'esd', 'none'), 'help': 'X2go server sound system (default: \'pulse\')', }, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 52/94: work-around for Python bug http://bugs.python.org/issue11236
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 c76c65322810ca5bafdccfab94b9bb0df0503722 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:06:34 2011 +0200 work-around for Python bug http://bugs.python.org/issue11236 --- pyhoca/cli/frontend.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 3b1a964f..3d28eb10 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -264,6 +264,15 @@ class PyHocaCLI(x2go.X2goClient): except x2go.SSHException, e: self._runtime_error(str(e), exitcode=253) + # workaround for Python bug: http://bugs.python.org/issue11236 + try: + if '\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) + + + 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] 55/94: if SSH privkey is not valid, use interactive auth
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 0a743f26efb88d90ab6d7f3219ac1060dc2ac4a8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:17:14 2011 +0200 if SSH privkey is not valid, use interactive auth --- pyhoca/cli/frontend.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 49dacf4b..52bfcccb 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -30,6 +30,9 @@ import getpass from types import * from gevent import socket +# for debugging +import pprint + # a list of available X2go print actions from x2go.defaults import X2GO_PRINT_ACTIONS @@ -262,11 +265,13 @@ class PyHocaCLI(x2go.X2goClient): except x2go.BadHostKeyException: self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254) except x2go.SSHException, e: - self._runtime_error(str(e), exitcode=253) + if str(e) != 'not a valid DSA private key file': + self._runtime_error(str(e), exitcode=253) + force_password_auth = True # workaround for Python bug: http://bugs.python.org/issue11236 try: - if '\x03' in self.args.password: + 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) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits