Now greenmine session middleware is based on SessionMiddleware
parent
c27e5e07f3
commit
3e4d3034b6
|
@ -6,8 +6,10 @@ from django.utils.cache import patch_vary_headers
|
||||||
from django.utils.http import cookie_date
|
from django.utils.http import cookie_date
|
||||||
from django.utils.importlib import import_module
|
from django.utils.importlib import import_module
|
||||||
|
|
||||||
|
from django.contrib.sessions.middleware import SessionMiddleware
|
||||||
|
|
||||||
class GreenmineSessionMiddleware(object):
|
|
||||||
|
class GreenmineSessionMiddleware(SessionMiddleware):
|
||||||
def process_request(self, request):
|
def process_request(self, request):
|
||||||
engine = import_module(settings.SESSION_ENGINE)
|
engine = import_module(settings.SESSION_ENGINE)
|
||||||
session_key = request.META.get(settings.SESSION_HEADER_NAME, None)
|
session_key = request.META.get(settings.SESSION_HEADER_NAME, None)
|
||||||
|
@ -15,42 +17,6 @@ class GreenmineSessionMiddleware(object):
|
||||||
session_key = request.COOKIES.get(settings.SESSION_COOKIE_NAME, None)
|
session_key = request.COOKIES.get(settings.SESSION_COOKIE_NAME, None)
|
||||||
request.session = engine.SessionStore(session_key)
|
request.session = engine.SessionStore(session_key)
|
||||||
|
|
||||||
def process_response(self, request, response):
|
|
||||||
"""
|
|
||||||
If request.session was modified, or if the configuration is to save the
|
|
||||||
session every time, save the changes and set a session cookie.
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
accessed = request.session.accessed
|
|
||||||
modified = request.session.modified
|
|
||||||
except AttributeError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
if accessed:
|
|
||||||
patch_vary_headers(response, ('Cookie',))
|
|
||||||
if modified or settings.SESSION_SAVE_EVERY_REQUEST:
|
|
||||||
if request.session.get_expire_at_browser_close():
|
|
||||||
max_age = None
|
|
||||||
expires = None
|
|
||||||
else:
|
|
||||||
max_age = request.session.get_expiry_age()
|
|
||||||
expires_time = time.time() + max_age
|
|
||||||
expires = cookie_date(expires_time)
|
|
||||||
# Save the session data and refresh the client cookie.
|
|
||||||
# Skip session save for 500 responses, refs #3881.
|
|
||||||
if response.status_code != 500:
|
|
||||||
request.session.save()
|
|
||||||
response.set_cookie(settings.SESSION_COOKIE_NAME,
|
|
||||||
request.session.session_key,
|
|
||||||
max_age=max_age,
|
|
||||||
expires=expires,
|
|
||||||
domain=settings.SESSION_COOKIE_DOMAIN,
|
|
||||||
path=settings.SESSION_COOKIE_PATH,
|
|
||||||
secure=settings.SESSION_COOKIE_SECURE or None,
|
|
||||||
httponly=settings.SESSION_COOKIE_HTTPONLY or None)
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
COORS_ALLOWED_ORIGINS = getattr(settings, 'COORS_ALLOWED_ORIGINS', '*')
|
COORS_ALLOWED_ORIGINS = getattr(settings, 'COORS_ALLOWED_ORIGINS', '*')
|
||||||
COORS_ALLOWED_METHODS = getattr(settings, 'COORS_ALLOWED_METHODS',
|
COORS_ALLOWED_METHODS = getattr(settings, 'COORS_ALLOWED_METHODS',
|
||||||
|
|
Loading…
Reference in New Issue