From 111ad734c7af85f7ae5f122d68a6c0f6da939e6c Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 26 Jun 2015 20:10:27 +0000
Subject: [PATCH] fixed issue with invalid session after restart
---
src/python/dm/common/exceptions/invalidSession.py | 4 ++--
src/python/dm/common/service/loginController.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/common/exceptions/invalidSession.py b/src/python/dm/common/exceptions/invalidSession.py
index 420bbda2..fd6b029b 100755
--- a/src/python/dm/common/exceptions/invalidSession.py
+++ b/src/python/dm/common/exceptions/invalidSession.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
#
-# Invalid request error class.
+# Invalid session error class.
#
#######################################################################
@@ -11,6 +11,6 @@ from dm.common.exceptions.dmException import DmException
#######################################################################
-class InvalidRequest(DmException):
+class InvalidSession(DmException):
def __init__ (self, error='', **kwargs):
DmException.__init__(self, error, dmStatus.DM_INVALID_SESSION, **kwargs)
diff --git a/src/python/dm/common/service/loginController.py b/src/python/dm/common/service/loginController.py
index 62a4c2a8..662957a9 100755
--- a/src/python/dm/common/service/loginController.py
+++ b/src/python/dm/common/service/loginController.py
@@ -10,6 +10,7 @@ from dm.common.constants import dmHttpStatus
from dm.common.exceptions.dmException import DmException
from dm.common.exceptions.dmHttpError import DmHttpError
from dm.common.exceptions.authorizationError import AuthorizationError
+from dm.common.exceptions.invalidSession import InvalidSession
from dm.common.utility.loggingManager import LoggingManager
from dm.common.service.dmController import DmController
from dm.common.service.auth.authorizationPrincipalManager import AuthorizationPrincipalManager
@@ -135,7 +136,7 @@ class LoginController(DmController):
if not sessionCache.has_key(sessionId):
errorMsg = 'Invalid or expired session id: %s.' % sessionId
logger.debug(errorMsg)
- raise DmHttpError(dmHttpStatus.DM_HTTP_UNAUTHORIZED, 'User Not Authorized', AuthorizationError(errorMsg))
+ raise DmHttpError(dmHttpStatus.DM_HTTP_UNAUTHORIZED, 'User Not Authorized', InvalidSession(errorMsg))
username = cherrypy.session.get(LoginController.SESSION_USERNAME_KEY)
logger.debug('Session id %s is valid (username: %s)' % (sessionId, username))
--
GitLab