opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some code cleanup in framework/__init__.py

Browse Source
This commit is contained in:
Greg Von Kuster
2008-12-15 17:04:06 -05:00
parent c90a09e782
commit c730aad62c
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/framework/__init__.py
+5 -16
View File
@@ -25,7 +25,7 @@ import mako.template
import mako.lookup
pkg_resources.require( "SQLAlchemy >= 0.4" )
from sqlalchemy import desc
from sqlalchemy import and_
import logging
log = logging.getLogger( __name__ )
@@ -180,17 +180,9 @@ class UniverseWebTransaction( base.DefaultWebTransaction ):
Support for universe_session and universe_user cookies has been
removed as of 31 Oct 2008.
"""
#log.debug("####In __ensure_valid_session...")
#try:
# log.debug("####In __ensure_valid_session, self.galaxy_session: %s" % str( self.galaxy_session ) )
# log.debug("####In __ensure_valid_session, self.galaxy_session.is_valid: %s" % str(self.galaxy_session.is_valid))
#except:
# log.debug("####In __ensure_valid_session, self.galaxy_session does not yet exist...")
sa_session = self.sa_session
# Try to load an existing session
#log.debug("###In __ensure_valid_session, before secure_id = self.get_cookie( name='galaxysession' )...")
secure_id = self.get_cookie( name='galaxysession' )
#log.debug("###In __ensure_valid_session, secure_id: %s" % str( secure_id) )
galaxy_session = None
prev_galaxy_session = None
user_for_new_session = None
@@ -201,10 +193,9 @@ class UniverseWebTransaction( base.DefaultWebTransaction ):
if secure_id:
# Decode the cookie value to get the session_key
session_key = self.security.decode_session_key( secure_id )
#log.debug("###In __ensure_valid_session, session_key: %s" % str( session_key) )
# Retrive the galaxy_session id via the unique session_key
galaxy_session = sa_session.query( self.app.model.GalaxySession ).filter_by( session_key=session_key, is_valid=True ).first()
#log.debug("###In __ensure_valid_session, galaxy_session: %s" % str( galaxy_session) )
# Retrieve the galaxy_session id via the unique session_key
galaxy_session = self.app.model.GalaxySession.filter( and_( self.app.model.GalaxySession.table.c.session_key==session_key,
self.app.model.GalaxySession.table.c.is_valid==True ) ).first()
# If remote user is in use it can invalidate the session, so we need to
# to check some things now.
if self.app.config.use_remote_user:
@@ -260,7 +251,6 @@ class UniverseWebTransaction( base.DefaultWebTransaction ):
Caller is responsible for flushing the returned session.
"""
#log.debug("###In __create_new_session...")
session_key = self.security.get_new_session_key()
galaxy_session = self.app.model.GalaxySession(
session_key=session_key,
@@ -293,8 +283,7 @@ class UniverseWebTransaction( base.DefaultWebTransaction ):
"""
Update the 'galaxysession' cookie to match the current session.
"""
self.set_cookie( name='galaxysession',
value=self.security.encode_session_key( self.galaxy_session.session_key ) )
self.set_cookie( self.security.encode_session_key( self.galaxy_session.session_key ), name='galaxysession' )
def handle_user_login( self, user ):
"""