x2go-commits

x2go-commits@lists.x2go.org

37907 discussions

[x2goclient] 85/94: Catch HOOK_no_such_command and bail out if the server does not know how to execute the given session command.
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.6.1.0 in repository x2goclient. commit 20a1cc9a222004386f38a23684cfac132ce7ea5d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 1 11:57:31 2018 +0100 Catch HOOK_no_such_command and bail out if the server does not know how to execute the given session command. --- debian/changelog | 2 ++ pyhoca/cli/frontend.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index cfc2c173..0141ac62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - pyhoca/cli/frontend.py: Be more real-time realistic and user friendly with notice log messages after authentication. - pyhoca/cli/frontend.py: rephrase auth success message slightly. + - Catch HOOK_no_such_command and bail out if the server does not + know how to execute the given session command. * debian/control: + Set Section: from "python" to "x11". More appropriate. + Bump versioned D on python3-x2go to (0.6.0.2-0~). diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 483c2d4d..072c915c 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -69,6 +69,14 @@ class PyHocaCLI(x2go.X2GoClient): def _runtime_error(self, m, exitcode=-1): runtime_error(m, exitcode=exitcode) + def HOOK_no_such_command(self, *args, **kwargs): + x2go.X2GoClient.HOOK_no_such_command(self, *args, **kwargs) + if len(args) == 0: + cmd=kwargs['cmd'] + else: + cmd=args[0] + self._runtime_error("The remote X2Go Server does not know how to execute the command '{cmd}'. Aborting...".format(cmd=cmd)) + def list_sessions(self, s_hash): """\ List up server-side available sessions for the logged in user. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 87/94: man/man1/pyhoca-cli.1: pre-release date 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.6.1.0 in repository x2goclient. commit 755ae8f4596eb206b1f7b287758362a484bdfbe8 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Mon Dec 3 01:20:46 2018 +0100 man/man1/pyhoca-cli.1: pre-release date update. --- debian/changelog | 1 + man/man1/pyhoca-cli.1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cb660b3c..80aa81bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - setup.py: need to import the sys module, not just version_info into global namespace. - misc: copyright update. + - man/man1/pyhoca-cli.1: pre-release date update. * pyhoca-cli.spec: - Build with Python 2 on CentOS, drop python3-argparse dependency (part of stdlib). diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 72dfe617..70afbdae 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH pyhoca-cli 1 "Sep 2018" "Version 0.6.0.1" "X2Go Application" +.TH pyhoca-cli 1 "Dec 2018" "Version 0.6.0.1" "X2Go Application" .SH NAME pyhoca-cli \- X2Go command line client written in Python .SH SYNOPSIS -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 84/94: pyhoca/cli/frontend.py: rephrase auth success message slightly.
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.6.1.0 in repository x2goclient. commit 192ee99fa63d14e6844827e3edefecac7e549a69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 26 10:30:23 2018 +0100 pyhoca/cli/frontend.py: rephrase auth success message slightly. --- debian/changelog | 1 + pyhoca/cli/frontend.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d3212d20..cfc2c173 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium remote host has the X2Go Server software installed. - pyhoca/cli/frontend.py: Be more real-time realistic and user friendly with notice log messages after authentication. + - pyhoca/cli/frontend.py: rephrase auth success message slightly. * debian/control: + Set Section: from "python" to "x11". More appropriate. + Bump versioned D on python3-x2go to (0.6.0.2-0~). diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 151ec37a..483c2d4d 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -656,7 +656,7 @@ class PyHocaCLI(x2go.X2GoClient): if not self.is_x2goserver(self.x2go_session_hash): self._runtime_error('the remote server does not have the X2Go Server software installed', exitcode=1337) - self._pyhoca_logger('authentication has been successful, launching session...', loglevel=x2go.loglevel_NOTICE, ) + self._pyhoca_logger('authentication has been successful', loglevel=x2go.loglevel_NOTICE, ) def MainLoop(self): -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 83/94: pyhoca/cli/frontend.py: Be more real-time realistic and user friendly with notice log messages after authentication.
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.6.1.0 in repository x2goclient. commit 7585c67979a790ca344a57369b2c56501e25c88c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 26 10:28:59 2018 +0100 pyhoca/cli/frontend.py: Be more real-time realistic and user friendly with notice log messages after authentication. --- debian/changelog | 2 ++ pyhoca/cli/frontend.py | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0e36f30..d3212d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - Fix failing password-only authentication. - pyhoca/cli/frontend.py: Check directly after authentication, if the remote host has the X2Go Server software installed. + - pyhoca/cli/frontend.py: Be more real-time realistic and user friendly + with notice log messages after authentication. * debian/control: + Set Section: from "python" to "x11". More appropriate. + Bump versioned D on python3-x2go to (0.6.0.2-0~). diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 411045af..151ec37a 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -656,6 +656,9 @@ class PyHocaCLI(x2go.X2GoClient): if not self.is_x2goserver(self.x2go_session_hash): self._runtime_error('the remote server does not have the X2Go Server software installed', exitcode=1337) + self._pyhoca_logger('authentication has been successful, launching session...', loglevel=x2go.loglevel_NOTICE, ) + + def MainLoop(self): """\ Start the main loop of this application. @@ -682,6 +685,9 @@ class PyHocaCLI(x2go.X2GoClient): self.list_profiles() sys.exit(0) + if self.args.resume or self.args.new: + self._pyhoca_logger("give the X2Go session some time to come up...", loglevel=x2go.loglevel_NOTICE, ) + if self.args.resume: self.resume_session(self.x2go_session_hash) @@ -703,10 +709,6 @@ class PyHocaCLI(x2go.X2GoClient): if not (self.args.new or self.args.resume or self.args.share_desktop or self.args.session_profile): sys.exit(0) - - if self.args.resume or self.args.new: - self._pyhoca_logger("give the X2Go session some time to come up...", loglevel=x2go.loglevel_NOTICE, ) - i=0 while 0 < self.get_session(self.x2go_session_hash).get_progress_status() < 100: sleep(1) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 81/94: pyhoca/cli/frontend.py: Check directly after authentication, if the remote host has the X2Go Server software installed.
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.6.1.0 in repository x2goclient. commit 5dcd5633dfa55ba9e8ae66a8045f7371108e3864 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 22:05:17 2018 +0000 pyhoca/cli/frontend.py: Check directly after authentication, if the remote host has the X2Go Server software installed. --- debian/changelog | 2 ++ pyhoca/cli/frontend.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3578f841..58607d2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * New upstream release (0.6.0.1): - Fix failing password-only authentication. + - pyhoca/cli/frontend.py: Check directly after authentication, if the + remote host has the X2Go Server software installed. * debian/control: + Set Section: from "python" to "x11". More appropriate. diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 76ad7624..411045af 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -653,6 +653,9 @@ class PyHocaCLI(x2go.X2GoClient): password = None passphrase = None + if not self.is_x2goserver(self.x2go_session_hash): + self._runtime_error('the remote server does not have the X2Go Server software installed', exitcode=1337) + def MainLoop(self): """\ Start the main loop of this application. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 82/94: debian/control: Bump versioned D on python3-x2go to (>= 0.6.0.2-0~).
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.6.1.0 in repository x2goclient. commit 0adac3b85958b87545a0be70edc45ebafeb2d8e4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 22:06:27 2018 +0000 debian/control: Bump versioned D on python3-x2go to (>= 0.6.0.2-0~). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 58607d2f..a0e36f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium remote host has the X2Go Server software installed. * debian/control: + Set Section: from "python" to "x11". More appropriate. + + Bump versioned D on python3-x2go to (0.6.0.2-0~). [ Mihai Moldovan ] * New upstream version (0.6.0.1): diff --git a/debian/control b/debian/control index e78ff0c6..ac9c0381 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, python3, - python3-x2go (>=0.6.0.1-0~), + python3-x2go (>=0.6.0.2-0~), python3-setproctitle, Suggests: mteleplayer-clientside, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 80/94: pyhoca-cli.spec: fully own %{python2_sitelib}/pyhoca directory.
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.6.1.0 in repository x2goclient. commit 3fbced2fc6147ebe6d8e2ac216689330723cfb0c Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sun Nov 11 11:27:38 2018 +0100 pyhoca-cli.spec: fully own %{python2_sitelib}/pyhoca directory. Not great, as explained in pyhoca-gui, but necessary to make packaging easier. --- debian/changelog | 2 ++ pyhoca-cli.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d1e459f..3578f841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium out for now to let builds fail and get a file list. - Pick the files correctly. - Also pick files matching PyHoca_CLI* in the site-lib directory. + - Fully own %{python2_sitelib}/pyhoca directory. Not great, as explained + in pyhoca-gui, but necessary to make packaging easier. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index c83680da..421b0041 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -96,10 +96,10 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %doc COPYING README TODO %{_bindir}/%{name} %if 0%{?el6} || 0%{?el7} -%{python2_sitelib}/pyhoca/cli/ +%{python2_sitelib}/pyhoca/ %{python2_sitelib}/PyHoca_CLI* %else -%{python3_sitelib}/pyhoca/cli/ +%{python3_sitelib}/pyhoca/ %{python3_sitelib}/PyHoca_CLI* %if 0%{?suse_version} %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 79/94: Fix failing password-only authentication.
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.6.1.0 in repository x2goclient. commit e86021e4a2a032e31b9fd8d65c894c8989856d30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 16:05:59 2018 +0000 Fix failing password-only authentication. --- debian/changelog | 2 +- pyhoca/cli/frontend.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 790599b4..2d1e459f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * New upstream release (0.6.0.1): - - Continue development... + - Fix failing password-only authentication. * debian/control: + Set Section: from "python" to "x11". More appropriate. diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 01732cfc..76ad7624 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -547,6 +547,8 @@ class PyHocaCLI(x2go.X2GoClient): force_password_auth = True password = None passphrase = None + _auth_count += 1 + continue except x2go.AuthenticationException as e: @@ -594,6 +596,7 @@ class PyHocaCLI(x2go.X2GoClient): # this error gets thrown when the passphrase for unlocking the SSH privkey was wrong if not force_password_auth and passphrase_unlock_counter >= 1: + if passphrase is not None and passphrase != '': self._pyhoca_logger('wrong SSH key passphrase (%s), try again...' % self.args.ssh_privkey, loglevel=x2go.loglevel_WARN, ) self._pyhoca_logger('unlock SSH key file (%s)' % self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, ) @@ -604,18 +607,22 @@ class PyHocaCLI(x2go.X2GoClient): continue if not force_password_auth and _auth_count >= 1: + self._pyhoca_logger('unlocking of SSH key failed, proceeding with interactive login', loglevel=x2go.loglevel_WARN, ) force_password_auth = True password = None passphrase = None + _auth_count += 1 + continue - elif not str(e).lower().startswith('not a valid dsa private key file') or \ - not str(e).lower().startswith('not a valid rsa private key file') or \ - not str(e).lower().startswith('incompatible ssh peer (no acceptable kex algorithm)') or \ + elif not str(e).lower().startswith('not a valid dsa private key file') and \ + not str(e).lower().startswith('not a valid rsa private key file') and \ + not str(e).lower().startswith('incompatible ssh peer (no acceptable kex algorithm)') and \ not str(e).lower().startswith('no authentication methods available') \ : if force_password_auth: + self._pyhoca_logger('password based login for ,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, ) else: self._pyhoca_logger('passwordless login for ,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, ) @@ -630,6 +637,7 @@ class PyHocaCLI(x2go.X2GoClient): force_password_auth = True password = None passphrase = None + _auth_count += 1 if not connected and _auth_count <= 0: if self.auth_attempts >= 2: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 76/94: pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib otherwise.
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.6.1.0 in repository x2goclient. commit 4b69e6117d11f2cd36fe5d4dfbfeed67e7d459d3 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 14:30:35 2018 +0100 pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib otherwise. Comment out for now to let builds fail and get a file list. --- debian/changelog | 2 ++ pyhoca-cli.spec | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8a7998db..80f5d759 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - Either EL6 or EL7, not both at the same time. - Use modern python build and install macros. - Build-Require python-rpm-macros for OpenSuSE builds. + - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment + out for now to let builds fail and get a file list. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 050dedfe..57d08cbd 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -95,7 +95,16 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %defattr(-,root,root) %doc COPYING README TODO %{_bindir}/%{name} -%{python3_sitelib}/* +%if 0%{?el6} || 0%{?el7} +#%%{python2_sitelib}/ +%else +#%%{python3_sitelib}/* +%if 0%{?suse_version} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) +%pycache_only %{python3_sitelib}/__pycache__ +%endif +%endif +%endif %{_mandir}/man1/%{name}.1* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 78/94: pyhoca-cli.spec: also pick files matching PyHoca_CLI* in the site-lib directory.
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.6.1.0 in repository x2goclient. commit 14eba70f4093a43e540e96a0c67d42305469607e Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 17:05:08 2018 +0100 pyhoca-cli.spec: also pick files matching PyHoca_CLI* in the site-lib directory. --- debian/changelog | 1 + pyhoca-cli.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 211776fe..790599b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment out for now to let builds fail and get a file list. - Pick the files correctly. + - Also pick files matching PyHoca_CLI* in the site-lib directory. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 3afbc59c..c83680da 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -97,10 +97,10 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %{_bindir}/%{name} %if 0%{?el6} || 0%{?el7} %{python2_sitelib}/pyhoca/cli/ -%{python2_sitelib}/PyHoca_CLI*/ +%{python2_sitelib}/PyHoca_CLI* %else %{python3_sitelib}/pyhoca/cli/ -%{python3_sitelib}/PyHoca_CLI*/ +%{python3_sitelib}/PyHoca_CLI* %if 0%{?suse_version} %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) %pycache_only %{python3_sitelib}/__pycache__ -- 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