This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 5a0bf3f mention a pubkey from broker client in the log file new cdc2493 Fix https brokerage in x2gobroker-daemon-debug. new 29a4fe9 typo fix new 0e51533 fix calling logger_broker new 371b199 make sure, that the authentication_pubkey reply gets included in the JSON output 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 | 1 + sbin/x2gobroker-daemon-debug | 4 +--- sbin/x2gobroker-testagent | 2 +- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/web/json.py | 3 +++ 5 files changed, 7 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 29a4fe99c2a3adc993f1d163f5c65f1eb1fe6ecf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 20 08:30:55 2014 +0100 typo fix --- sbin/x2gobroker-testagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index d744a1a..e927225 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -185,7 +185,7 @@ if __name__ == "__main__": kwargs = {} pubkey = cmdline_args.pubkey if (task == 'addauthkey' or task == 'delauthkey') and not pubkey: - pubkey, privvkey = x2gobroker.agent.genkeypair(local_username=username, client_address="localhost") + pubkey, privkey = x2gobroker.agent.genkeypair(local_username=username, client_address="localhost") if pubkey: kwargs.update({ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit cdc2493c43c84709061e0125ada5d2fff81c17f3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 20 08:30:30 2014 +0100 Fix https brokerage in x2gobroker-daemon-debug. --- debian/changelog | 1 + sbin/x2gobroker-daemon-debug | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0812e4..2078d82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - If we received an SSH public key from a broker client, mark it as ACCEPTED after we deployed it, so that the client knows that it can its corresponding private key. + - Fix https brokerage in x2gobroker-daemon-debug. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index af117ad..86225eb 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -34,6 +34,4 @@ if [ -e /etc/default/x2gobroker-daemon ]; then . /etc/default/x2gobroker-daemon fi -export X2GOBROKER_DEBUG=true - -su - x2gobroker -c "x2gobroker-daemon -M http -i $@" +su - x2gobroker -c "X2GOBROKER_SSL_CERTFILE=\"$X2GOBROKER_SSL_CERTFILE\" X2GOBROKER_SSL_KEYFILE=\"$X2GOBROKER_SSL_KEYFILE\" DAEMON_BIND_ADDRESS=\"$DAEAMON_BIND_ADDRESS\" x2gobroker-daemon -M http -b$DAEMON_BIND_ADDRESS -i $@" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 0e51533a184119e389e7d1a66fc23bc2b480d661 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 20 08:31:27 2014 +0100 fix calling logger_broker --- x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 3efccf6..6a5e879 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1119,7 +1119,7 @@ class X2GoBroker(object): delay_deletion=20, ) else: - logger_broker.notice('base_broker.X2GoBroker.select_session(): accepting public SSH key from broker client') + logger_broker.info('base_broker.X2GoBroker.select_session(): accepting public SSH key from broker client') x2gobroker.agent.add_authorized_key(username=username, pubkey_hash=pubkey, authorized_keys_file=self.get_authorized_keys_file(profile_id), -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 371b1996313c0f96d8f29de2bb526d22fdb48c5d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 20 08:32:12 2014 +0100 make sure, that the authentication_pubkey reply gets included in the JSON output --- x2gobroker/web/json.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index a1f9300..77facf3 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -182,6 +182,9 @@ class X2GoBrokerWeb(_RequestHandler): if profile_info.has_key('authentication_privkey'): selected_session['key'] = profile_info['authentication_privkey'] + if profile_info.has_key('authentication_pubkey'): + selected_session['authentication_pubkey'] = profile_info['authentication_pubkey'] + if profile_info.has_key('session_info'): selected_session['session_info'] = profile_info['session_info'] -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org