[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-68-gb460374

[X2Go dev team]

The branch, master has been updated
       via  b4603743e414a6fea2a82ee919955f4d7c7a797f (commit)
      from  2f417f45d0a10f7467724d473601a90487b7160b (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 b4603743e414a6fea2a82ee919955f4d7c7a797f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 27 10:54:23 2013 +0100

    improve last commit

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

Summary of changes:
 x2gobroker/basicauth.py |    5 ++---
 x2gobroker/web/uccs.py  |    2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py
index c621817..a236053 100644
--- a/x2gobroker/basicauth.py
+++ b/x2gobroker/basicauth.py
@@ -34,10 +34,9 @@ def require_basic_auth(realm, validate_callback):
                     handler._transforms = []
                     handler.finish()
 
-                dummy, access = validate_callback('check-credentials', 'FALSE')
+                kwargs['basicauth_user'], access = validate_callback('check-credentials', 'FALSE')
                 if access:
-                    kwargs['basicauth_user'] = 'anonymous'
-                    kwargs['basicauth_pass'] = 'access granted'
+                    kwargs['basicauth_pass'] = 'anonymous access granted'
                     return True
 
                 auth_header = handler.request.headers.get('Authorization')
diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py
index b2a17d0..b2bd842 100644
--- a/x2gobroker/web/uccs.py
+++ b/x2gobroker/web/uccs.py
@@ -47,6 +47,8 @@ def credentials_validate(username, password):
     if not access and "@" in username:
         username = username.split('@')[0]
         access = broker.check_access(username=username, password=password)
+    if username == 'check-credentials' and password == 'FALSE':
+        username = 'anonymous'
     return username, access
 
 


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).