This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit d0c3fbd9d21b7a76ff0878c1858d38e3e2385378 Author: Jason Alavaliant <alavaliant@ra09.com> Date: Thu Dec 18 10:06:36 2014 +0100 Handle spaces in broker login passwords when authservice is used. (Fixes: #706). --- debian/changelog | 5 +++++ sbin/x2gobroker-authservice | 2 +- x2gobroker/authservice.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 935041e..e054d03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -296,6 +296,11 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - On session resumption take profile's host list into account. Don't resume sessions the profile has not been configured for. (Fixes: #553). + [ Jason Alavaliant ] + * New upstream version (0.0.3.0): + - Handle spaces in broker login passwords when authservice is used. (Fixes: + #706). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 x2gobroker (0.0.2.3-0~x2go1) unstable; urgency=low diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 012af4b..b83c71c 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -73,7 +73,7 @@ class AuthClient(asyncore.dispatcher_with_send): self._buf = data for req in reqs.split('\n'): try: - user, passwd, service = req.split() + user, passwd, service = req.split('\r') except: self.send('bad\n') self.logger.warning('bad authentication data received') diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py index 457d898..d6f8919 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -32,7 +32,7 @@ def authenticate(username, password, service="x2gobroker"): s.connect(x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET) # FIXME: somehow logging output disappears after we have connected to the socket file... logger_broker.debug('sending username={username}, password=<hidden>, service={service} to authentication service'.format(username=username, service=service)) - s.send('{username} {password} {service}\n'.format(username=username, password=password, service=service)) + s.send('{username}\r{password}\r{service}\n'.format(username=username, password=password, service=service)) result = s.recv(1024) s.close() if result.startswith('ok'): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git