Projet

Général

Profil

0001-rename-A2_AUTH_KERBEROS_ENABLED-to-_ENABLE-13099.patch

Benjamin Dauvergne, 07 septembre 2016 18:01

Télécharger (3,43 ko)

Voir les différences: 

Subject: [PATCH] rename A2_AUTH_KERBEROS_ENABLED to _ENABLE (#13099)


 src/authentic2_auth_kerberos/app_settings.py   | 16 ++++++++++------
 src/authentic2_auth_kerberos/auth_frontends.py |  2 +-
 src/authentic2_auth_kerberos/backends.py       |  4 ++--
 src/authentic2_auth_kerberos/decorators.py     |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)
src/authentic2_auth_kerberos/app_settings.py
1 1 
class AppSettings(object):
2 2 
    __DEFAULTS = {
3 
            'ENABLED': True,
4 
            'CREATE_USER': True,
5 
            'REALM': None,
6 
            'LDAP_BACKEND': True,
7 
            'DJANGO_BACKEND': False,
3 
        'ENABLE': True,
4 
        'CREATE_USER': True,
5 
        'REALM': None,
6 
        'LDAP_BACKEND': True,
7 
        'DJANGO_BACKEND': False,
8 8 
    }
9 9 

  		




  10
  10
  
    
    def __init__(self, prefix):

  		




  ......




  12
  12
  
    

  		




  13
  13
  
    
    def _setting(self, name, dflt):

  		




  14
  14
  
    
        from django.conf import settings

  		




  15
  
  
    
        return getattr(settings, self.prefix+name, dflt)

  		




  
  15
  
    
        return getattr(settings, self.prefix + name, dflt)

  		




  
  16
  
    

  		




  
  17
  
    
    @property

  		




  
  18
  
    
    def ENABLE(self):

  		




  
  19
  
    
        return self._setting('ENABLE', self._setting('ENABLED', self.__DEFAULTS['ENABLE']))

  		




  16
  20
  
    

  		




  17
  21
  
    
    def __getattr__(self, name):

  		




  18
  22
  
    
        if name not in self.__DEFAULTS:

  		












  

    
      src/authentic2_auth_kerberos/auth_frontends.py
    
  





  5
  5
  
    

  		




  6
  6
  
    
class KerberosFrontend(object):

  		




  7
  7
  
    
    def enabled(self):

  		




  8
  
  
    
        return app_settings.ENABLED

  		




  
  8
  
    
        return app_settings.ENABLE

  		




  9
  9
  
    

  		




  10
  10
  
    
    def name(self):

  		




  11
  11
  
    
        return gettext_noop('Kerberos')

  		












  

    
      src/authentic2_auth_kerberos/backends.py
    
  





  32
  32
  
    
        pass

  		




  33
  33
  
    

  		




  34
  34
  
    
    def authenticate(self, principal=None, **kwargs):

  		




  35
  
  
    
        if not app_settings.ENABLED:

  		




  
  35
  
    
        if not app_settings.ENABLE:

  		




  36
  36
  
    
            return

  		




  37
  37
  
    
        if not app_settings.DJANGO_BACKEND:

  		




  38
  38
  
    
            return

  		




  ......




  51
  51
  
    
    def authenticate(self, principal=None, **kwargs):

  		




  52
  52
  
    
        logger = logging.getLogger(__name__)

  		




  53
  53
  
    

  		




  54
  
  
    
        if not app_settings.ENABLED:

  		




  
  54
  
    
        if not app_settings.ENABLE:

  		




  55
  55
  
    
            return

  		




  56
  56
  
    
        if not app_settings.LDAP_BACKEND:

  		




  57
  57
  
    
            return

  		












  

    
      src/authentic2_auth_kerberos/decorators.py
    
  





  8
  8
  
    
    '''If plugin is not enabled, return 404'''

  		




  9
  9
  
    
    @functools.wraps(view)

  		




  10
  10
  
    
    def wrapper(*args, **kwargs):

  		




  11
  
  
    
        if not app_settings.ENABLED:

  		




  
  11
  
    
        if not app_settings.ENABLE:

  		




  12
  12
  
    
            raise Http404

  		




  13
  13
  
    
        return view(*args, **kwargs)

  		




  14
  14
  
    
    return wrapper

  		




  15
  
  
    
-