[Mpuls-commits] r1254 - wasko/branches/2.0/mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-04 18:12:24 +0100 (Thu, 04 Feb 2010)
New Revision: 1254

Modified:
   wasko/branches/2.0/mpulsweb/lib/base.py
Log:
* mpulsweb/lib/base.py: Redirect to new auth controller if user is not
  authorized.


Modified: wasko/branches/2.0/mpulsweb/lib/base.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/base.py	2010-02-04 17:07:55 UTC (rev 1253)
+++ wasko/branches/2.0/mpulsweb/lib/base.py	2010-02-04 17:12:24 UTC (rev 1254)
@@ -66,9 +66,9 @@
         try:
             storedHash = session['AUTH']
             try:
-                shared = request.cookies['waska_auth']
+                shared = request.cookies['mpuls_auth']
             except KeyError:
-                log.error("Cannot find waska_auth cookie -> HTTPUnauthorized")
+                log.error("Cannot find mpuls_auth cookie -> HTTPUnauthorized")
                 raise HTTPUnauthorized(detail = COOKIE_NOT_FOUND)
 
             if storedHash != md5.new(shared + userIdentity()).digest():
@@ -110,8 +110,8 @@
 
         except KeyError:
             p = str(request.path_info)
-            if not p in ('/waska/login', '/waska/loginAction'):
-                redirect_to(h.url_for(controller='/waska', action='login'))
+            if not p in ('/auth/login', '/auth/loginAction'):
+                redirect_to(h.url_for(controller='/auth', action='login'))
 
     def __call__(self, environ, start_response):
         """Invoke the Controller"""