entrouvert
/
django-kerberos
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

cleaning (#30321) 

PEP8ness, add copyright notices, remove explicit __version__ in
__init__.py (true version is distributed through PKG_INFO).
This commit is contained in:
Benjamin Dauvergne 2019-02-02 10:32:19 +01:00
parent 0ad8b9cb42
commit 61a8167e9e
6 changed files with 110 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/django_kerberos/__init__.py
View File

@ -1 +0,0 @@
__version__ = '1.2.1'

29
src/django_kerberos/app_settings.py
View File

@ -1,14 +1,31 @@
# django-kerberos - SPNEGO/Kerberos authentication for Django applications
# Copyright (C) 2014-2019 Entr'ouvert
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import sys
class AppSettings(object):
__PREFIX = 'KERBEROS_'
__DEFAULTS = {
'BACKEND_CREATE': False,
'BACKEND_ADMIN_REGEXP': None,
'DEFAULT_REALM': None,
'SERVICE_PRINCIPAL': '',
'HOSTNAME': None,
'KEEP_PASSWORD': False,
'BACKEND_CREATE': False,
'BACKEND_ADMIN_REGEXP': None,
'DEFAULT_REALM': None,
'SERVICE_PRINCIPAL': '',
'HOSTNAME': None,
'KEEP_PASSWORD': False,
}
def __getattr__(self, name):

33
src/django_kerberos/backends.py
View File

@ -1,3 +1,19 @@
# django-kerberos - SPNEGO/Kerberos authentication for Django applications
# Copyright (C) 2014-2019 Entr'ouvert
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import re
import logging
@ -11,6 +27,7 @@ from django.contrib.auth.backends import ModelBackend
import kerberos
class KerberosBackend(ModelBackend):
def __init__(self):
self.logger = logging.getLogger(__name__)
@ -57,7 +74,6 @@ class KerberosBackend(ModelBackend):
self.provision_user(principal, user)
return user
def authenticate(self, principal=None, **kwargs):
if principal and self.authorize_principal(principal):
return self.lookup_user(principal)
@ -81,9 +97,9 @@ class KerberosPasswordBackend(KerberosBackend):
def service_principal(self):
'''Service principal for checking password'''
if not app_settings.SERVICE_PRINCIPAL:
raise ImproperlyConfigured('Kerberos password backend needs '
'the setting KERBEROS_SERVICE_PRINCIPAL to be '
'set')
raise ImproperlyConfigured('Kerberos password backend needs the '
'setting KERBEROS_SERVICE_PRINCIPAL to be'
' set')
return app_settings.SERVICE_PRINCIPAL
def authenticate(self, username=None, password=None, **kwargs):
@ -96,11 +112,12 @@ class KerberosPasswordBackend(KerberosBackend):
try:
if not kerberos.checkPassword(principal, password,
self.service_principal(), self.default_realm()):
self.service_principal(),
self.default_realm()):
return
except kerberos.KrbError, e:
logging.getLogger(__name__).error('password validation'
'for principal %r failed %s', principal, e)
except kerberos.KrbError as e:
logging.getLogger(__name__).error(
'password validation forprincipal %r failed %s', principal, e)
return
else:
if principal and self.authorize_principal(principal):

37
src/django_kerberos/hashers.py
View File

@ -1,3 +1,19 @@
# django-kerberos - SPNEGO/Kerberos authentication for Django applications
# Copyright (C) 2014-2019 Entr'ouvert
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
from django.core.exceptions import ImproperlyConfigured
@ -9,6 +25,7 @@ import kerberos
from . import app_settings
class KerberosHasher(BasePasswordHasher):
'''A pseudo hasher which just validate that the given password
match a given Kerberos identity'''
@ -20,9 +37,9 @@ class KerberosHasher(BasePasswordHasher):
def service_principal(self):
if not app_settings.SERVICE_PRINCIPAL:
raise ImproperlyConfigured('Kerberos pseudo password hasher needs '
'the setting KERBEROS_SERVICE_PRINCIPAL to be '
'set')
raise ImproperlyConfigured(
'Kerberos pseudo password hasher needs the setting '
'KERBEROS_SERVICE_PRINCIPAL to be set')
return app_settings.SERVICE_PRINCIPAL
def verify(self, password, encoded):
@ -31,11 +48,11 @@ class KerberosHasher(BasePasswordHasher):
principal = force_bytes(principal)
password = force_bytes(password)
try:
return kerberos.checkPassword(principal, password,
self.service_principal(), self.default_realm())
except kerberos.KrbError, e:
logging.getLogger(__name__).error('password validation'
'for principal %r failed %s', principal, e)
return kerberos.checkPassword(
principal, password,
self.service_principal(),
self.default_realm())
except kerberos.KrbError as e:
logging.getLogger(__name__).error(
'password validation for principal %r failed %s', principal, e)
return False

16
src/django_kerberos/urls.py
View File

@ -1,3 +1,19 @@
# django-kerberos - SPNEGO/Kerberos authentication for Django applications
# Copyright (C) 2014-2019 Entr'ouvert
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import patterns, url
from . import views

22
src/django_kerberos/views.py
View File

@ -1,3 +1,19 @@
# django-kerberos - SPNEGO/Kerberos authentication for Django applications
# Copyright (C) 2014-2019 Entr'ouvert
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
import kerberos
@ -62,7 +78,7 @@ class NegotiateView(View):
self.logger.debug(u'Negotiate authstr %r', authstr)
try:
result, context = kerberos.authGSSServerInit(service)
except kerberos.KrbError, e:
except kerberos.KrbError as e:
self.logger.warning(u'exception during authGSSServerInit: %s, certainly a '
u'keytab problem', e)
details = (u'exception during authGSSServerInit: %s, certainly a '
@ -78,7 +94,7 @@ class NegotiateView(View):
context={'details': details}, status=500)
try:
r = kerberos.authGSSServerStep(context, authstr)
except kerberos.KrbError, e:
except kerberos.KrbError as e:
self.logger.warning(u'exception during authGSSServerStep: %s', e)
details = u'exception during authGSSServerStep: %s' % e
return TemplateResponse(request, self.error_template_name,
@ -89,7 +105,7 @@ class NegotiateView(View):
return self.challenge(request, *args, **kwargs)
try:
self.principal = kerberos.authGSSServerUserName(context)
except kerberos.KrbError, e:
except kerberos.KrbError as e:
self.logger.warning(u'exception during authGSSServerUserName: %s', e)
details = u'exception during authGSSServerUserName: %s' % e
return TemplateResponse(request, self.error_template_name,