Commit f4773ed6 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Fix cookie logging message

parent d65da9de
# Copyright 2011-2012 GRNET S.A. All rights reserved.
#
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following
# conditions are met:
#
#
# 1. Redistributions of source code must retain the above
# copyright notice, this list of conditions and the following
# disclaimer.
#
#
# 2. Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials
# provided with the distribution.
#
#
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
......@@ -25,7 +25,7 @@
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
#
# The views and conclusions contained in the software and
# documentation are those of the authors and should not be
# interpreted as representing official policies, either expressed
......@@ -53,29 +53,29 @@ class Cookie():
self.uuid, sep, self.auth_token = cookie.partition('|')
self.request = request
self.response = response
@property
def uuid(self):
return getattr(self, 'uuid', '')
@property
def auth_token(self):
return getattr(self, 'auth_token', '')
@property
def is_set(self):
no_token = not self.auth_token
return not no_token
@property
def is_valid(self):
return self.uuid == getattr(self.user, 'uuid', '') and \
self.auth_token == getattr(self.user, 'auth_token', '')
@property
def user(self):
return getattr(self.request, 'user', AnonymousUser())
def __set(self):
if not self.response:
raise ValueError(_(astakos_messages.NO_RESPONSE))
......@@ -88,14 +88,14 @@ class Cookie():
)
msg = 'Cookie [expiring %(auth_token_expires)s] set for %(uuid)s' % user.__dict__
logger._log(LOGGING_LEVEL, msg, [])
def __delete(self):
if not self.response:
raise ValueError(_(astakos_messages.NO_RESPONSE))
self.response.delete_cookie(COOKIE_NAME, path='/', domain=COOKIE_DOMAIN)
msg = 'Cookie deleted for %(uuid)s' % self.__dict__
logger._log(LOGGING_LEVEL, msg, [])
def fix(self, response=None):
self.response = response or self.response
try:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment