This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit f8ec7bcffd61494134308b59fd2a29e5951b4095 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 31 21:35:52 2019 +0100 Fix regression flaw in x2gobroker/web/json.py, introduced by commit 9fa371e9. --- debian/changelog | 2 ++ x2gobroker/web/json.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 694f32f..41a29ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,8 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium execution. - Ignore SSH broker events for now. Not sure if we will ever support that. - Finalize API documentation. + - Fix regression flaw in x2gobroker/web/json.py, introduced by commit + 9fa371e9. * debian/*: + Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic. diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index 8e1853b..28b7fd4 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -153,7 +153,7 @@ class X2GoBrokerWeb(_RequestHandler): broker_username, password, task, profile_id, ip, cookie, authed, server = broker_backend.run_optional_script(script_type='pre_auth_scripts', username=broker_username, password=password, task=task, profile_id=profile_id, ip=ip, cookie=cookie) - logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}, cookie: {cookie}'.format(broker_username=broker_username, server_username=server_username, password='XXXXX', task=task, profile_id=profile_id, cookie=cookie)) + logger_broker.debug ('broker_username: {broker_username}, server_username: {server_username}, password: {password}, task: {task}, profile_id: {profile_id}, cookie: {cookie}'.format(broker_username=broker_username, server_username=server_username, password='XXXXX', task=task, profile_id=profile_id, cookie=cookie)) access, next_cookie = broker_backend.check_access(username=broker_username, password=password, ip=ip, cookie=cookie) broker_username, password, task, profile_id, ip, cookie, authed, server = broker_backend.run_optional_script(script_type='post_auth_scripts', username=broker_username, password=password, task=task, profile_id=profile_id, ip=ip, cookie=cookie, authed=access) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git