x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

[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

[x2goclient] 53/94: getting rid of empty lines
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 d4bf467131f1a1be1814f2936ab45b40c56bb33c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:07:44 2011 +0200 getting rid of empty lines --- pyhoca/cli/frontend.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 3d28eb10..49dacf4b 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -271,8 +271,6 @@ class PyHocaCLI(x2go.X2goClient): 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] 49/94: fixes UTF-8 error, session profile usage + password auth now fixed
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 d471d3d9c2152fa83328b3ea751b512889f07963 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:43:08 2011 +0200 fixes UTF-8 error, session profile usage + password auth now fixed --- pyhoca/cli/frontend.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 634d48ba..111874cd 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -216,7 +216,7 @@ class PyHocaCLI(x2go.X2goClient): # setup up the manually configured X2go session 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, + username=self.args.username, password=self.args.password, key_filename=self.args.ssh_privkey, add_to_known_hosts=self.args.add_to_known_hosts, @@ -247,14 +247,14 @@ class PyHocaCLI(x2go.X2goClient): while not connected: try: - self._X2goClient__connect_session(self.x2go_session_hash, force_password_auth=force_password_auth) + self._X2goClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True except x2go.AuthenticationException, e: force_password_auth = True - self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, ) + self._pyhoca_logger('interactive login for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() except x2go.PasswordRequiredException, e: - self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, ) + self._pyhoca_logger('interactive login for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() 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) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 50/94: raising a runtime error, if session profile name does not exist
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 9914dc4fd27805cae63ea1d6ccaf64ece46cb69b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:47:51 2011 +0200 raising a runtime error, if session profile name does not exist --- pyhoca/cli/frontend.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 111874cd..0346cf8b 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -196,7 +196,10 @@ class PyHocaCLI(x2go.X2goClient): x2go.X2goClient.__init__(self, logger=liblogger) _profiles = self._X2goClient__get_profiles() - if self.args.session_profile and _profiles.has_profile(self.args.session_profile): + if not _profiles.has_profile(self.args.session_profile): + self._runtime_error('no such session profile of name: %s.' % (self.args.session_profile), exitcode=31) + + if self.args.session_profile: # override session profile options by option values from the arg parser kwargs={} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 51/94: only raising error if session_profile arg was specified
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 0b96e036d66981b508e49c9a1750bf4c7b1504fb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:48:36 2011 +0200 only raising error if session_profile arg was specified --- 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 0346cf8b..3b1a964f 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -196,7 +196,7 @@ class PyHocaCLI(x2go.X2goClient): x2go.X2goClient.__init__(self, logger=liblogger) _profiles = self._X2goClient__get_profiles() - if not _profiles.has_profile(self.args.session_profile): + 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) if self.args.session_profile: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 45/94: change loglevel option from arg to kwarg parameter
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 344e4b54924ee801e4a9da9be95ec906cd79ea48 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:16:24 2011 +0200 change loglevel option from arg to kwarg parameter --- pyhoca/cli/frontend.py | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 45e5cfed..36bc76d1 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -123,7 +123,7 @@ class PyHocaCLI(x2go.X2goClient): else: _server = self.args.server # clean all sessions from X2go server - self.logger('cleaning up all running sessions from X2go server: %s' % _server, x2go.loglevel_NOTICE, ) + self.logger('cleaning up all running sessions from X2go server: %s' % _server, loglevel=x2go.loglevel_NOTICE, ) self._X2goClient__clean_sessions(s_hash) @@ -132,7 +132,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # start a new session and run a command - self.logger('starting a new X2go session', x2go.loglevel_INFO, ) + self.logger('starting a new X2go session', loglevel=x2go.loglevel_INFO, ) if self.args.session_profile is None: self.logger('command for new session is: %s' % self.args.command, loglevel=x2go.loglevel_DEBUG, ) else: @@ -145,7 +145,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # resume a running session - self.logger('resuming X2go session: %s' % self.args.resume, x2go.loglevel_INFO, ) + self.logger('resuming X2go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.resume in available_sessions.keys(): self._X2goClient__resume_session(s_hash, self.args.resume) @@ -158,7 +158,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # send a suspend request to a session - self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, x2go.loglevel_INFO, ) + self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.suspend in available_sessions.keys(): self._X2goClient__suspend_session(s_hash, self.args.suspend) @@ -171,7 +171,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # send a terminate request to a session - self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, x2go.loglevel_INFO, ) + self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.terminate in available_sessions.keys(): self._X2goClient__terminate_session(s_hash, self.args.terminate) @@ -191,7 +191,7 @@ class PyHocaCLI(x2go.X2goClient): self._pyhoca_logger.tag = 'PyHocaCLI' # initialize the X2goClient context and start the connection to the X2go server - self._pyhoca_logger('preparing requested X2go session', x2go.loglevel_NOTICE, ) + self._pyhoca_logger('preparing requested X2go session', loglevel=x2go.loglevel_NOTICE, ) x2go.X2goClient.__init__(self, logger=liblogger) @@ -248,10 +248,12 @@ class PyHocaCLI(x2go.X2goClient): try: self._X2goClient__connect_session(self.x2go_session_hash, force_password_auth=force_password_auth) connected = True - except x2go.AuthenticationException: + except x2go.AuthenticationException, e: force_password_auth = True + self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() - except x2go.PasswordRequiredException: + except x2go.PasswordRequiredException, e: + self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() 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) @@ -302,7 +304,7 @@ class PyHocaCLI(x2go.X2goClient): # give the session some time to come up... # no CTRL-C is allowed during this phase... i=0 - self._pyhoca_logger("give the X2go session some time to come up...", x2go.loglevel_NOTICE, ) + self._pyhoca_logger("give the X2go session some time to come up...", loglevel=x2go.loglevel_NOTICE, ) while i < self.args.time_to_wait: time.sleep(1) i+=1 @@ -311,9 +313,9 @@ class PyHocaCLI(x2go.X2goClient): profile_name = self._X2goClient__get_session_profile_name(self.x2go_session_hash) session_name = self._X2goClient__get_session_name(self.x2go_session_hash) - self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, x2go.loglevel_INFO, ) - self._pyhoca_logger("X2go session name is: %s" % session_name, x2go.loglevel_INFO, ) - self._pyhoca_logger("Press CTRL+C to suspend the running session...", x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, ) + self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, ) + self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) try: session_duration = 0 @@ -327,18 +329,18 @@ class PyHocaCLI(x2go.X2goClient): time.sleep(2) if self._X2goClient__has_session_terminated(self.x2go_session_hash): - self._pyhoca_logger("X2go session %s has terminated" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has terminated" % session_name, loglevel=x2go.loglevel_NOTICE, ) elif self._X2goClient__is_session_suspended(self.x2go_session_hash): - self._pyhoca_logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, ) elif self._X2goClient__is_session_running(self.x2go_session_hash): - self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, ) except KeyboardInterrupt: - self._pyhoca_logger("Suspending X2go session %s" % session_name, x2go.loglevel_INFO, ) + self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, ) self._X2goClient__suspend_session(self.x2go_session_hash) # giving nxproxy's SSH tunnel some time to settle time.sleep(2) - self._pyhoca_logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, ) except x2go.X2goSessionException, e: self._pyhoca_logger("X2goSessionException occured:", loglevel=x2go.loglevel_ERROR) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 47/94: take user name from session profile if --session-profile is used
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 a777014192b21d25b5f119a0647a5c370f574491 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:24:08 2011 +0200 take user name from session profile if --session-profile is used --- pyhoca-cli | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 4b74424f..c26198de 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -184,7 +184,7 @@ Possible values for the --pack NX option are: version() # if no username is given we use the uid under which this programme is run - if a.username is None: + if a.username is None and not a.session_profile: a.username = current_user # statically no password from the command line @@ -272,7 +272,6 @@ Possible values for the --pack NX option are: if a.share_local_folders is not None: a.share_local_folders = a.share_local_folders.split(',') - if a.server: ##### TODO: ssh_config to be moved into Python X2go!!!! -- 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