Projet

Général

Profil

0002-1.patch

Benjamin Dauvergne, 14 mars 2019 13:01

Télécharger (18,9 ko)

Voir les différences: 

Subject: [PATCH 2/3] 1


 src/authentic2/a2_rbac/admin.py                     | 2 +-
 src/authentic2/a2_rbac/management.py                | 2 +-
 src/authentic2/a2_rbac/models.py                    | 2 +-
 src/authentic2/api_views.py                         | 2 +-
 src/authentic2/attribute_kinds.py                   | 2 +-
 src/authentic2/attributes_ng/sources/django_user.py | 2 +-
 src/authentic2/backends/ldap_backend.py             | 2 +-
 src/authentic2/custom_user/models.py                | 2 +-
 src/authentic2/decorators.py                        | 2 +-
 src/authentic2/exponential_retry_timeout.py         | 2 +-
 src/authentic2/idp/saml/saml2_endpoints.py          | 2 +-
 src/authentic2/log_filters.py                       | 2 +-
 src/authentic2/management/commands/slapd-shell.py   | 2 +-
 src/authentic2/manager/forms.py                     | 2 +-
 src/authentic2/manager/ou_views.py                  | 2 +-
 src/authentic2/manager/resources.py                 | 2 +-
 src/authentic2/manager/service_views.py             | 2 +-
 src/authentic2/manager/views.py                     | 2 +-
 src/authentic2/manager/widgets.py                   | 2 +-
 src/authentic2/models.py                            | 2 +-
 src/authentic2/saml/admin.py                        | 2 +-
 src/authentic2/saml/common.py                       | 2 +-
 src/authentic2/saml/models.py                       | 2 +-
 src/authentic2/utils.py                             | 2 +-
 src/authentic2/views.py                             | 2 +-
 src/authentic2_auth_oidc/backends.py                | 2 +-
 src/authentic2_auth_oidc/utils.py                   | 2 +-
 src/authentic2_idp_cas/views.py                     | 2 +-
 src/authentic2_idp_oidc/models.py                   | 2 +-
 src/authentic2_idp_oidc/utils.py                    | 2 +-
 src/authentic2_idp_oidc/views.py                    | 2 +-
 src/django_rbac/models.py                           | 2 +-
 src/django_rbac/utils.py                            | 2 +-
 33 files changed, 33 insertions(+), 33 deletions(-)
src/authentic2/a2_rbac/admin.py
1 1 
from django.contrib import admin
2 2 
from django.utils.translation import ugettext_lazy as _
3 
from django.utils.six import text_type
3 
from django.utils import six
4 4 

  		




  5
  5
  
    
from . import models

  		




  6
  6
  
    

  		












  

    
      src/authentic2/a2_rbac/management.py
    
  





  1
  
  
    
from django.utils.six import text_type

  		




  
  1
  
    
from django.utils import six

  		




  2
  2
  
    
from django.utils.translation import ugettext_lazy as _

  		




  3
  3
  
    
from django.utils.text import slugify

  		




  4
  4
  
    
from django.contrib.contenttypes.models import ContentType

  		












  

    
      src/authentic2/a2_rbac/models.py
    
  





  1
  1
  
    
from collections import namedtuple

  		




  2
  2
  
    
from django.core.exceptions import ValidationError

  		




  3
  
  
    
from django.utils.six import text_type

  		




  
  3
  
    
from django.utils import six

  		




  4
  4
  
    
from django.utils.translation import ugettext_lazy as _

  		




  5
  5
  
    
from django.utils.text import slugify

  		




  6
  6
  
    
from django.db import models

  		












  

    
      src/authentic2/api_views.py
    
  





  20
  20
  
    
from django.db import models

  		




  21
  21
  
    
from django.contrib.auth import get_user_model

  		




  22
  22
  
    
from django.core.exceptions import MultipleObjectsReturned

  		




  23
  
  
    
from django.utils.six import text_type

  		




  
  23
  
    
from django.utils import six

  		




  24
  24
  
    
from django.utils.translation import ugettext as _

  		




  25
  25
  
    
from django.utils.encoding import force_text

  		




  26
  26
  
    
from django.views.decorators.vary import vary_on_headers

  		












  

    
      src/authentic2/attribute_kinds.py
    
  





  10
  10
  
    
from django import forms

  		




  11
  11
  
    
from django.core.exceptions import ValidationError

  		




  12
  12
  
    
from django.core.validators import RegexValidator

  		




  13
  
  
    
from django.utils.six import text_type

  		




  
  13
  
    
from django.utils import six

  		




  14
  14
  
    
from django.utils.translation import ugettext_lazy as _, pgettext_lazy

  		




  15
  15
  
    
from django.utils.functional import allow_lazy

  		




  16
  16
  
    
from django.utils import html

  		












  

    
      src/authentic2/attributes_ng/sources/django_user.py
    
  





  1
  
  
    
from django.utils.six import text_type

  		




  
  1
  
    
from django.utils import six

  		




  2
  2
  
    
from django.utils.translation import ugettext_lazy as _

  		




  3
  3
  
    

  		




  4
  4
  
    
from django_rbac.utils import get_role_model

  		












  

    
      src/authentic2/backends/ldap_backend.py
    
  





  26
  26
  
    
from django.conf import settings

  		




  27
  27
  
    
from django.contrib.auth.models import Group

  		




  28
  28
  
    
from django.utils.encoding import force_bytes, force_text

  		




  29
  
  
    
from django.utils.six import text_type

  		




  
  29
  
    
from django.utils import six

  		




  30
  30
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  31
  31
  
    

  		




  32
  32
  
    
from authentic2.a2_rbac.models import Role

  		












  

    
      src/authentic2/custom_user/models.py
    
  





  1
  1
  
    
from django.db import models

  		




  2
  2
  
    
from django.utils import timezone

  		




  3
  3
  
    
from django.core.mail import send_mail

  		




  4
  
  
    
from django.utils.six import text_type

  		




  
  4
  
    
from django.utils import six

  		




  5
  5
  
    
from django.utils.translation import ugettext_lazy as _

  		




  6
  6
  
    
from django.core.exceptions import ValidationError, MultipleObjectsReturned

  		




  7
  7
  
    
try:

  		












  

    
      src/authentic2/decorators.py
    
  





  10
  10
  
    
from django.http import Http404, HttpResponseForbidden, HttpResponse, HttpResponseBadRequest

  		




  11
  11
  
    
from django.core.cache import cache as django_cache

  		




  12
  12
  
    
from django.core.exceptions import ValidationError

  		




  13
  
  
    
from django.utils.six import text_type

  		




  
  13
  
    
from django.utils import six

  		




  14
  14
  
    

  		




  15
  15
  
    
from . import utils, app_settings, middleware

  		




  16
  16
  
    
from .utils import to_list, to_iter

  		












  

    
      src/authentic2/exponential_retry_timeout.py
    
  





  2
  2
  
    
import logging

  		




  3
  3
  
    
import hashlib

  		




  4
  4
  
    

  		




  5
  
  
    
from django.utils.six import text_type

  		




  
  5
  
    
from django.utils import six

  		




  6
  6
  
    
from django.core.cache import cache

  		




  7
  7
  
    

  		




  8
  8
  
    

  		












  

    
      src/authentic2/idp/saml/saml2_endpoints.py
    
  





  30
  30
  
    
from django.core.exceptions import ObjectDoesNotExist

  		




  31
  31
  
    
from django.http import HttpResponse, HttpResponseRedirect, \

  		




  32
  32
  
    
    HttpResponseForbidden, HttpResponseBadRequest

  		




  33
  
  
    
from django.utils.six import text_type

  		




  
  33
  
    
from django.utils import six

  		




  34
  34
  
    
from django.utils.translation import ugettext as _, ugettext_noop as N_

  		




  35
  35
  
    
from django.views.decorators.csrf import csrf_exempt

  		




  36
  36
  
    
from django.views.decorators.cache import never_cache

  		












  

    
      src/authentic2/log_filters.py
    
  





  1
  1
  
    
import logging

  		




  2
  
  
    
from django.utils.six import text_type

  		




  
  2
  
    
from django.utils import six

  		




  3
  3
  
    

  		




  4
  4
  
    
class RequestContextFilter(logging.Filter):

  		




  5
  5
  
    
    DEFAULT_USERNAME = '-'

  		












  

    
      src/authentic2/management/commands/slapd-shell.py
    
  





  11
  11
  
    

  		




  12
  12
  
    
from django.contrib.auth import get_user_model

  		




  13
  13
  
    
from django.core.management.base import BaseCommand

  		




  14
  
  
    
from django.utils.six import text_type

  		




  
  14
  
    
from django.utils import six

  		




  15
  15
  
    
from optparse import make_option

  		




  16
  16
  
    

  		




  17
  17
  
    
COMMAND = 1

  		












  

    
      src/authentic2/manager/forms.py
    
  





  6
  6
  
    
from django import forms

  		




  7
  7
  
    
from django.contrib.contenttypes.models import ContentType

  		




  8
  8
  
    
from django.db.models.query import Q

  		




  9
  
  
    
from django.utils.six import text_type

  		




  
  9
  
    
from django.utils import six

  		




  10
  10
  
    
from django.utils.text import slugify

  		




  11
  11
  
    
from django.core.exceptions import ValidationError

  		




  12
  12
  
    

  		












  

    
      src/authentic2/manager/ou_views.py
    
  





  3
  3
  
    
from django_rbac.utils import get_ou_model

  		




  4
  4
  
    
from django.http import HttpResponseRedirect

  		




  5
  5
  
    
from django.contrib import messages

  		




  6
  
  
    
from django.utils.six import text_type

  		




  
  6
  
    
from django.utils import six

  		




  7
  7
  
    
from django.utils.translation import ugettext as _

  		




  8
  8
  
    

  		




  9
  9
  
    
from authentic2 import data_transfer

  		












  

    
      src/authentic2/manager/resources.py
    
  





  1
  
  
    
from django.utils.six import text_type

  		




  
  1
  
    
from django.utils import six

  		




  2
  2
  
    
from import_export.resources import ModelResource

  		




  3
  3
  
    
from import_export.fields import Field

  		




  4
  4
  
    
from import_export.widgets import Widget

  		












  

    
      src/authentic2/manager/service_views.py
    
  





  1
  
  
    
from django.utils.six import text_type

  		




  
  1
  
    
from django.utils import six

  		




  2
  2
  
    
from django.utils.translation import ugettext as _

  		




  3
  3
  
    
from django.contrib import messages

  		




  4
  4
  
    
from django.shortcuts import get_object_or_404

  		












  

    
      src/authentic2/manager/views.py
    
  





  9
  9
  
    
from django.views.generic.detail import SingleObjectMixin

  		




  10
  10
  
    
from django.http import HttpResponse, Http404

  		




  11
  11
  
    
from django.utils.encoding import force_text

  		




  12
  
  
    
from django.utils.six import text_type

  		




  
  12
  
    
from django.utils import six

  		




  13
  13
  
    
from django.utils.translation import ugettext_lazy as _

  		




  14
  14
  
    
from django.utils.timezone import now

  		




  15
  15
  
    
from django.core.urlresolvers import reverse, reverse_lazy

  		












  

    
      src/authentic2/manager/widgets.py
    
  





  4
  4
  
    
from django_select2.forms import ModelSelect2Widget, ModelSelect2MultipleWidget

  		




  5
  5
  
    

  		




  6
  6
  
    
from django.contrib.auth import get_user_model

  		




  7
  
  
    
from django.utils.six import text_type

  		




  
  7
  
    
from django.utils import six

  		




  8
  8
  
    

  		




  9
  9
  
    
from django_rbac.backends import DjangoRBACBackend

  		




  10
  10
  
    
from django_rbac.utils import get_role_model, get_ou_model

  		












  

    
      src/authentic2/models.py
    
  





  4
  4
  
    
from django.conf import settings

  		




  5
  5
  
    
from django.db import models

  		




  6
  6
  
    
from django.db.models.query import Q

  		




  7
  
  
    
from django.utils.six import text_type

  		




  
  7
  
    
from django.utils import six

  		




  8
  8
  
    
from django.utils.translation import ugettext_lazy as _

  		




  9
  9
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  10
  10
  
    
from django.core.exceptions import ValidationError, FieldDoesNotExist

  		












  

    
      src/authentic2/saml/admin.py
    
  





  1
  1
  
    
import logging

  		




  2
  2
  
    

  		




  3
  3
  
    
from django.contrib import admin

  		




  4
  
  
    
from django.utils.six import text_type

  		




  
  4
  
    
from django.utils import six

  		




  5
  5
  
    
from django.utils.translation import ugettext as _

  		




  6
  6
  
    
from django.conf.urls import url

  		




  7
  7
  
    
from django.conf import settings

  		












  

    
      src/authentic2/saml/common.py
    
  





  10
  10
  
    
from django.conf import settings

  		




  11
  11
  
    
from django.http import HttpResponseRedirect, Http404, HttpResponse

  		




  12
  12
  
    
from django.shortcuts import render

  		




  13
  
  
    
from django.utils.six import text_type

  		




  
  13
  
    
from django.utils import six

  		




  14
  14
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  15
  15
  
    
from django.core.exceptions import ValidationError

  		




  16
  16
  
    

  		












  

    
      src/authentic2/saml/models.py
    
  





  12
  12
  
    
from django.db.models import Q

  		




  13
  13
  
    
from django.conf import settings

  		




  14
  14
  
    
from django.core.exceptions import ValidationError

  		




  15
  
  
    
from django.utils.six import text_type

  		




  
  15
  
    
from django.utils import six

  		




  16
  16
  
    
from django.utils.translation import ugettext_lazy as _

  		




  17
  17
  
    
from django.core.exceptions import ObjectDoesNotExist

  		




  18
  18
  
    
from django.contrib.contenttypes.models import ContentType

  		












  

    
      src/authentic2/utils.py
    
  





  34
  34
  
    
from django.utils.functional import empty, allow_lazy

  		




  35
  35
  
    
from django.utils.http import urlsafe_base64_encode

  		




  36
  36
  
    
from django.utils.encoding import iri_to_uri, force_bytes, uri_to_iri

  		




  37
  
  
    
from django.utils.six import text_type

  		




  
  37
  
    
from django.utils import six

  		




  38
  38
  
    
from django.shortcuts import render

  		




  39
  39
  
    

  		




  40
  40
  
    

  		












  

    
      src/authentic2/views.py
    
  





  18
  18
  
    
from django.core.urlresolvers import reverse

  		




  19
  19
  
    
from django.core.exceptions import ValidationError

  		




  20
  20
  
    
from django.contrib import messages

  		




  21
  
  
    
from django.utils.six import text_type

  		




  
  21
  
    
from django.utils import six

  		




  22
  22
  
    
from django.utils.translation import ugettext as _

  		




  23
  23
  
    
from django.contrib.auth import logout as auth_logout

  		




  24
  24
  
    
from django.contrib.auth import REDIRECT_FIELD_NAME

  		












  

    
      src/authentic2_auth_oidc/backends.py
    
  





  6
  6
  
    
from jwcrypto.jwt import JWT

  		




  7
  7
  
    
from jwcrypto.jwk import JWK

  		




  8
  8
  
    

  		




  9
  
  
    
from django.utils.six import text_type

  		




  
  9
  
    
from django.utils import six

  		




  10
  10
  
    
from django.utils.timezone import now

  		




  11
  11
  
    
from django.contrib.auth import get_user_model

  		




  12
  12
  
    
from django.contrib.auth.backends import ModelBackend

  		












  

    
      src/authentic2_auth_oidc/utils.py
    
  





  4
  4
  
    

  		




  5
  5
  
    
import requests

  		




  6
  6
  
    

  		




  7
  
  
    
from django.utils.six import text_type

  		




  
  7
  
    
from django.utils import six

  		




  8
  8
  
    
from django.utils.timezone import utc

  		




  9
  9
  
    
from django.shortcuts import get_object_or_404

  		




  10
  10
  
    
from django.utils.translation import ugettext as _

  		












  

    
      src/authentic2_idp_cas/views.py
    
  





  7
  7
  
    

  		




  8
  8
  
    
from django.http import HttpResponseBadRequest, HttpResponse

  		




  9
  9
  
    
from django.views.generic.base import View

  		




  10
  
  
    
from django.utils.six import text_type

  		




  
  10
  
    
from django.utils import six

  		




  11
  11
  
    
from django.utils.timezone import now

  		




  12
  12
  
    

  		




  13
  13
  
    
from authentic2.utils import (get_user_from_session_key, make_url,

  		












  

    
      src/authentic2_idp_oidc/models.py
    
  





  7
  7
  
    
from django.core.exceptions import ValidationError, ImproperlyConfigured

  		




  8
  8
  
    
from django.utils.translation import ugettext_lazy as _

  		




  9
  9
  
    
from django.conf import settings

  		




  10
  
  
    
from django.utils.six import text_type

  		




  
  10
  
    
from django.utils import six

  		




  11
  11
  
    
from django.utils.timezone import now

  		




  12
  12
  
    
from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation

  		




  13
  13
  
    

  		












  

    
      src/authentic2_idp_oidc/utils.py
    
  





  9
  9
  
    
from django.core.exceptions import ImproperlyConfigured

  		




  10
  10
  
    
from django.conf import settings

  		




  11
  11
  
    
from django.utils.encoding import smart_bytes

  		




  12
  
  
    
from django.utils.six import text_type

  		




  
  12
  
    
from django.utils import six

  		




  13
  13
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  14
  14
  
    

  		




  15
  15
  
    
from authentic2 import hooks, crypto

  		












  

    
      src/authentic2_idp_oidc/views.py
    
  





  5
  5
  
    
import time

  		




  6
  6
  
    

  		




  7
  7
  
    
from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed

  		




  8
  
  
    
from django.utils.six import text_type

  		




  
  8
  
    
from django.utils import six

  		




  9
  9
  
    
from django.utils.timezone import now, utc

  		




  10
  10
  
    
from django.utils.http import urlencode

  		




  11
  11
  
    
from django.shortcuts import render

  		












  

    
      src/django_rbac/models.py
    
  





  1
  1
  
    
import operator

  		




  2
  2
  
    
import hashlib

  		




  3
  3
  
    

  		




  4
  
  
    
from django.utils.six import text_type

  		




  
  4
  
    
from django.utils import six

  		




  5
  5
  
    
from django.utils.text import slugify

  		




  6
  6
  
    
from django.utils.translation import ugettext_lazy as _

  		




  7
  7
  
    
from django.db import models

  		












  

    
      src/django_rbac/utils.py
    
  





  2
  2
  
    
from authentic2.decorators import GlobalCache

  		




  3
  3
  
    
from django.conf import settings

  		




  4
  4
  
    
from django.apps import apps

  		




  5
  
  
    
from django.utils.six import text_type

  		




  
  5
  
    
from django.utils import six

  		




  6
  6
  
    

  		




  7
  7
  
    
from . import constants

  		




  8
  8
  
    

  		




  9
  
  
    
-