Changeset 3061

Timestamp:

27/11/07 13:32:35 (13 years ago)

Author:

pjkersha

Message:

ows_server/ows_server/controllers/login.py: delete security details from session if session not found on Session Manager

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py (modified) (5 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py

@@ -4 +4 @@
 
 from ows_server.lib.base import *
-from ows_server.lib.security_util import setSecuritySession, LoginServiceQuery
+from ows_server.lib.security_util import setSecuritySession, SecuritySession,\
+                                         LoginServiceQuery
 from ows_common.exception_report import OwsError
 from paste.request import parse_querystring
@@ -65 +66 @@
                                 
         except Exception, e:
-            c.xml='Error establishing security context [%s]'%cgi.escape(str(e))
+            c.xml='Error establishing security context.  Please report ' + \
+                  'the error to your site administrator'
+            log.error("Initialising SessionMgrClient for " + \
+                      "getSessionStatus call: %s" % e)
+            SecuritySession.delete()
             return Response(render('content'), code=400)
         
@@ -77 +82 @@
             c.xml = "Error checking your session details.  Please re-login"
             log.error("Session Manager getSessionStatus returned: %s" % e)
-        return Response(render('login'), code=401)
+            SecuritySession.delete()
+            return Response(render('login'), code=401)
    
         if bSessOK:
-            log.debug(\
-        "Session found - redirect back to site requesting credentials ...")
+            log.debug("Session found - redirect back to site requesting " + \
+                      "credentials ...")
             # ... Return across http GET passing security parameters...
             return self.__doRedirect()
         else:
-            log.debug("Session wasn't found - re-displaying login...")
+            log.debug("Session wasn't found - removing security details " + \
+                      "from cookie and re-displaying login...")
+            SecuritySession.delete()
             render_response('login')
 
@@ -108 +116 @@
                                 
         except Exception, e:
-            c.xml='Error establishing security context [%s]'%cgi.escape(str(e))
+            c.xml='Error establishing security context.  Please report ' + \
+                  'the error to your site administrator'
+            log.error("Login: initialising SessionMgrClient: %s" % e)
             return Response(render('content'), code=400)
         
@@ -117 +127 @@
             sessID = smClnt.connect(username, passphrase=passphrase)[-1]
         except Exception, e:
-            c.xml = \
-    "Error logging in.  Please check your username/pass-phrase and try again."
+            c.xml = "Error logging in.  Please check your username/" + \
+                    "pass-phrase and try again."
             log.error("Session Manager connect returned: %s" % e)
             return Response(render('login'), code=401)