openstack
/
django_openstack_auth
Code Issues Proposed changes

Merge "Revert "Add is_authenticated and is_anonymous properties"" into stable/newton

This commit is contained in:
Jenkins 2016-09-27 16:40:18 +00:00 committed by Gerrit Code Review
parent 7091219cdb 61500ab57c
commit 55ebf6b792
1 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
openstack_auth/user.py
View File

@ -14,11 +14,9 @@
import hashlib import hashlib
import logging import logging
import django
from django.conf import settings from django.conf import settings
from django.contrib.auth import models from django.contrib.auth import models
from django.db import models as db_models from django.db import models as db_models
from django.utils import deprecation
from keystoneauth1 import exceptions as keystone_exceptions from keystoneauth1 import exceptions as keystone_exceptions
from keystoneclient.common import cms as keystone_cms from keystoneclient.common import cms as keystone_cms
import six import six
@ -263,32 +261,16 @@ class User(models.AbstractBaseUser, models.AnonymousUser):
return None return None
return not utils.is_token_valid(self.token, margin) return not utils.is_token_valid(self.token, margin)
if django.VERSION >= (1, 10):
@property
def is_authenticated(self):
"""Checks for a valid authentication."""
if (self.token is not None and utils.is_token_valid(self.token)):
return deprecation.CallableTrue
else:
return deprecation.CallableFalse
@property
def is_anonymous(self):
"""Return if the user is not authenticated.
Returns ``True`` if not authenticated,``False`` otherwise.
"""
return deprecation.CallableBool(not self.is_authenticated)
else:
def is_authenticated(self, margin=None): def is_authenticated(self, margin=None):
"""Checks for a valid authentication. """Checks for a valid authentication.
:param margin: :param margin:
A security time margin in seconds before end of authentication. A security time margin in seconds before end of authentication.
Will return ``False`` if authentication ends in less than Will return ``False`` if authentication ends in less than ``margin``
``margin`` seconds of time. seconds of time.
A default margin can be set by the TOKEN_TIMEOUT_MARGIN in the A default margin can be set by the TOKEN_TIMEOUT_MARGIN in the
django settings. django settings.
""" """
return (self.token is not None and return (self.token is not None and
utils.is_token_valid(self.token, margin)) utils.is_token_valid(self.token, margin))
@ -301,10 +283,11 @@ class User(models.AbstractBaseUser, models.AnonymousUser):
:param margin: :param margin:
A security time margin in seconds before end of an eventual A security time margin in seconds before end of an eventual
authentication. authentication.
Will return ``True`` even if authenticated but that Will return ``True`` even if authenticated but that authentication
authentication ends in less than ``margin`` seconds of time. ends in less than ``margin`` seconds of time.
A default margin can be set by the TOKEN_TIMEOUT_MARGIN in the A default margin can be set by the TOKEN_TIMEOUT_MARGIN in the
django settings. django settings.
""" """
return not self.is_authenticated(margin) return not self.is_authenticated(margin)