This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch brokerclient in repository pyhoca-cli. from 817cb9b If a user name can neither be detected from the session profile, nor from the command line option, try the username used for the broker authentication. new 70c61ab ~When --list-profiles is invoked: Don't crash if a session profile backend does not rely on config files. Show the session broker URL if a broker session profile backend is in use. new 110424c Update man page with (future) broker options. Some man page fixes (mentioning X2Go Client where it should name PyHoca-CLI). new 544b38a Add cmdline option --broker-password. Masquerade broker password in process list (Linux/Mac only). new 4a246c4 debian/changelog: mention the new broker feature explicitly The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 +++++++++ man/man1/pyhoca-cli.1 | 9 +++++++-- pyhoca-cli | 9 ++++++++- pyhoca/cli/frontend.py | 8 +++++--- 4 files changed, 29 insertions(+), 6 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-cli. commit 110424c8d045971de591e8de35b79aab65e60e39 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 13:49:27 2014 +0100 Update man page with (future) broker options. Some man page fixes (mentioning X2Go Client where it should name PyHoca-CLI). --- debian/changelog | 2 ++ man/man1/pyhoca-cli.1 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 524489d..e296084 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ pyhoca-cli (0.5.0.0-0x2go1) UNRELEASED; urgency=low - When --list-profiles is invoked: Don't crash if a session profile backend does not rely on config files. Show the session broker URL if a broker session profile backend is in use. + - Update man page with (future) broker options. Some man page fixes + (mentioning X2Go Client where it should name PyHoca-CLI). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 10 Mar 2014 15:56:42 +0100 diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index dc67cb5..049f8cf 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -146,10 +146,10 @@ disables interactive authentication completely and requires that a private SSH k session profile or that the \-\-password command line option is used. .SH BROKER OPTIONS -In case you want to retrieve \fBx2goclient\fR session profiles from an X2Go Session Broker use the following options: +In case you want to retrieve X2Go session profiles from an X2Go Session Broker use the following options: .TP \*(T<\fB\-\-broker-url=<URL>\fR\*(T> -Specify the <URL> of the X2Go Session Broker. X2Go Client can access http:// and ssh:// style URLs. +Specify the <URL> of the X2Go Session Broker. \fBpyhoca-cli\fR can access http:// and ssh:// style URLs. Syntax of <URL> for HTTP brokerage: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-cli. commit 4a246c47c9e97694301e458c6b791ee7b2fdcdf7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 13:50:56 2014 +0100 debian/changelog: mention the new broker feature explicitly --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2bd4fb2..4c431b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ pyhoca-cli (0.5.0.0-0x2go1) UNRELEASED; urgency=low * New upstream version (0.5.0.0): + - Add cmdline option --broker-url. This adds X2Go Session Broker + support to PyHoca-CLI. - Add cmdline option --broker-password. Masquerade broker password in process list (Linux/Mac only). - If a user name can neither be detected from the session profile, nor -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-cli. commit 70c61ab4a089eaa7a7795b86cf7c18ecedeb1a95 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 13:47:27 2014 +0100 ~When --list-profiles is invoked: Don't crash if a session profile backend does not rely on config files. Show the session broker URL if a broker session profile backend is in use. --- debian/changelog | 3 +++ pyhoca/cli/frontend.py | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e5a6f3a..524489d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ pyhoca-cli (0.5.0.0-0x2go1) UNRELEASED; urgency=low - If a user name can neither be detected from the session profile, nor from the command line option, try the username used for the broker authentication. + - When --list-profiles is invoked: Don't crash if a session profile + backend does not rely on config files. Show the session broker URL + if a broker session profile backend is in use. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 10 Mar 2014 15:56:42 +0100 diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index d648196..1a49cf8 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -333,7 +333,7 @@ class PyHocaCLI(x2go.X2GoClient): # initialize the X2GoClient context and start the connection to the X2Go server self._pyhoca_logger('preparing requested X2Go session', loglevel=x2go.loglevel_NOTICE, ) - x2go.X2GoClient.__init__(self, broker_url=self.args.broker_url, logger=liblogger) + x2go.X2GoClient.__init__(self, broker_url=self.args.broker_url, broker_password=self.args.broker_password, logger=liblogger) _profiles = self._X2GoClient__get_profiles() if self.args.session_profile and not _profiles.has_profile(self.args.session_profile): @@ -349,10 +349,12 @@ class PyHocaCLI(x2go.X2GoClient): print print "Available X2Go session profiles" print "===============================" - if _session_profiles.config_files is not None: + if hasattr(_session_profiles, 'config_files') and _session_profiles.config_files is not None: print "configuration files: %s" % _session_profiles.config_files - if _session_profiles.user_config_file is not None: + if hasattr(_session_profiles, 'user_config_file') and _session_profiles.user_config_file is not None: print "user configuration file: %s" % _session_profiles.user_config_file + if hasattr(_session_profiles, 'broker_url') and _session_profiles.broker_url is not None: + print "X2Go Session Broker URL: %s" % _session_profiles.broker_url print for _profile_id in _session_profiles.profile_ids: _profile_config = _session_profiles.get_profile_config(_profile_id) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-cli. commit 544b38a9e8ba2aa65bf025fdcfebba6e1bc6ccb9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 13:50:13 2014 +0100 Add cmdline option --broker-password. Masquerade broker password in process list (Linux/Mac only). --- debian/changelog | 2 ++ man/man1/pyhoca-cli.1 | 5 +++++ pyhoca-cli | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e296084..2bd4fb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ pyhoca-cli (0.5.0.0-0x2go1) UNRELEASED; urgency=low * New upstream version (0.5.0.0): + - Add cmdline option --broker-password. Masquerade broker password + in process list (Linux/Mac only). - If a user name can neither be detected from the session profile, nor from the command line option, try the username used for the broker authentication. diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 049f8cf..46391b8 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -161,6 +161,11 @@ ssh://<user>:<password>@<hostname>:<port>/usr/bin/x2gobroker (or any executable provides the broker via SSH). .TP +\*(T<\fB\-\-broker-password <password>\fR\*(T> +Session broker password for retrieving session profiles from the X2Go Session Broker. +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 \-\-broker-password option is forbidden. +.TP \*(T<\fB\-\-broker-cacertfile=</path/to/cafile.crt>\fR\*(T> Specify a special (self-signed) root-CACert file that shall get used when connecting to an X2Go Session Broker via https (SSL). (Not implemented, yet). .TP diff --git a/pyhoca-cli b/pyhoca-cli index 71ac0c6..523be1c 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -74,13 +74,19 @@ if app.startswith('./'): sys.path.insert(0, os.getcwd()) os.environ['PYTHONX2GO_LOCAL'] = '1' -PROG_OPTIONS = sys.argv[1:] +PROG_OPTIONS = " ".join(sys.argv[1:]).replace("=", " ").split() try: _password_index = PROG_OPTIONS.index('--password')+1 PROG_OPTIONS[_password_index] = "XXXXXXXX" except ValueError: # ignore if --password option is not specified pass +try: + _broker_password_index = PROG_OPTIONS.index('--broker-password')+1 + PROG_OPTIONS[_broker_password_index] = "XXXXXXXX" +except ValueError: + # ignore if --broker-password option is not specified + pass from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS in ('Linux', 'Mac'): @@ -176,6 +182,7 @@ print_options = [ ] broker_options = [ {'args':['-B','--broker-url'], 'default': None, 'help': 'retrieve session profiles via an X2Go Session Broker under the given URL', }, + {'args':['--broker-password'], 'default': None, 'help': 'password for authenticating against the X2Go Session Broker', }, ] nx_options = [ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
-
git-admin＠x2go.org