[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-18-g31eea62

[X2Go dev team]

The branch, master has been updated
       via  31eea62dbed1f9fdc5c270c178e7d947e6749ec9 (commit)
      from  412348110510de7c77fda9f76b039ddfd7a1b7f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31eea62dbed1f9fdc5c270c178e7d947e6749ec9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 18 22:13:10 2013 +0200

    Get the cookie based extra-authentication working for HTTP mode.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    3 ++-
 x2gobroker/web/plain.py |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 64ee398..8b72caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
     - SSH broker: Only allow context change to another user for the
       magic user (default: x2gobroker).
     - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275).
-    - Get the cookie based extra-authentication working.
+    - Get the cookie based extra-authentication working for SSH mode.
+    - Get the cookie based extra-authentication working for HTTP mode.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
 
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index 6fdfffe..eb3daca 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -97,21 +97,21 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
 
         username = self.get_argument('user', default='')
         password = self.get_argument('password', default='')
-        cookie = self.get_argument('cookie', default='')
+        cookie = self.get_argument('authid', default='')
         task = self.get_argument('task', default='')
         profile_id = self.get_argument('sid', default='')
         new_password = self.get_argument('newpass', default='')
 
         output = ''
 
-        logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id))
+        logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}, cookie: {cookie}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id, cookie=cookie))
         if broker_backend.check_access(username=username, password=password, cookie=cookie):
 
             ###
             ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST
             ###
 
-            if global_config['require-cookie-auth']:
+            if global_config['require-cookie-auth'] and not global_config['use-static-cookie']:
 
                 ### FIXME: make up a nice protocol for this, disabled for now
                 #output += "AUTHID: {authid}<br />".format(authid=broker_backend.get_next_authid(username=data.user))


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).