0002-code-style-10196.patch

Benjamin Dauvergne, 18 juin 2019 00:53

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/3] code style (#10196)

 mellon/adapters.py                    | 19 +++++++++++--
 mellon/middleware.py                  | 15 ++++++++++
 mellon/models.py                      | 15 ++++++++++
 mellon/sessions_backends/cached_db.py | 15 ++++++++++
 mellon/sessions_backends/db.py        | 15 ++++++++++
 mellon/utils.py                       | 40 +++++++++++++++++++--------
 mellon/views.py                       | 15 ++++++++++
 tests/conftest.py                     | 15 ++++++++++
 tests/test_default_adapter.py         | 15 ++++++++++
 tests/test_sso_slo.py                 | 15 ++++++++++
 tests/test_utils.py                   | 15 ++++++++++
 tests/test_views.py                   | 15 ++++++++++
 tests/urls_tests.py                   | 15 ++++++++++
 tests/utils.py                        | 15 ++++++++++
 tests/xml_utils.py                    | 15 ++++++++++
 15 files changed, 240 insertions(+), 14 deletions(-)

     # django-mellon - SAML2 authentication for Django
     # 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 uuid
     from xml.etree import ElementTree as ET
-...
                         self.logger.error(u'METADATA of %d-th idp has no EntityDescriptor root tag', i)
                         continue
                     if not 'entityID' in doc.attrib:
                     if 'entityID' not in doc.attrib:
                         self.logger.error(
                             u'METADATA of %d-th idp has no entityID attribute on its root tag', i)
                         continue
-...
             except (AttributeError, KeyError, IndexError) as e:
                 self.logger.error(
                     u'invalid reference in username template %r: %s', username_template, e)
             except Exception as e:
             except Exception:
                 self.logger.exception(u'unknown error when formatting username')
             else:
                 return username

     # django-mellon - SAML2 authentication for Django
     # 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.utils.http import urlencode
     from django.http import HttpResponseRedirect
     from django.core.urlresolvers import reverse

     # django-mellon - SAML2 authentication for Django
     # 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.db import models
     from django.utils.translation import ugettext_lazy as _
     from django.conf import settings

     # django-mellon - SAML2 authentication for Django
     # 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.contrib.sessions.backends.db import SessionStore
     from . import db

     # django-mellon - SAML2 authentication for Django
     # 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.contrib.sessions.backends.db import SessionStore
     from mellon import utils

     # django-mellon - SAML2 authentication for Django
     # 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 datetime
     import importlib
-...
             public_keys.append(public_key)
         name_id_formats = app_settings.NAME_ID_FORMATS
         return render_to_string('mellon/metadata.xml', {
                 'entity_id': request.build_absolute_uri(entity_id),
                 'login_url': request.build_absolute_uri(login_url),
                 'logout_url': request.build_absolute_uri(logout_url),
                 'public_keys': public_keys,
                 'name_id_formats': name_id_formats,
                 'default_assertion_consumer_binding': app_settings.DEFAULT_ASSERTION_CONSUMER_BINDING,
                 'organization': app_settings.ORGANIZATION,
                 'contact_persons': app_settings.CONTACT_PERSONS,
                 'discovery_endpoint_url': request.build_absolute_uri(reverse('mellon_login')),
             })
             'entity_id': request.build_absolute_uri(entity_id),
             'login_url': request.build_absolute_uri(login_url),
             'logout_url': request.build_absolute_uri(logout_url),
             'public_keys': public_keys,
             'name_id_formats': name_id_formats,
             'default_assertion_consumer_binding': app_settings.DEFAULT_ASSERTION_CONSUMER_BINDING,
             'organization': app_settings.ORGANIZATION,
             'contact_persons': app_settings.CONTACT_PERSONS,
             'discovery_endpoint_url': request.build_absolute_uri(reverse('mellon_login')),
         })
     def create_server(request):
-...
            This function ignores the sub-second resolution'''
         try:
             dt = isodate.parse_datetime(date_string)
         except:
         except Exception:
             return default
         if is_aware(dt):
             if not settings.USE_TZ:
-...
     def is_nonnull(s):
         return not '\x00' in s
         return '\x00' not in s
     def same_origin(url1, url2):
-...
             message = lasso_decode(status.statusMessage)
         return status_codes, message
     def login(request, user):
         for adapter in get_adapters():
             if hasattr(adapter, 'auth_login'):

     # django-mellon - SAML2 authentication for Django
     # 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 requests
     import lasso

     # django-mellon - SAML2 authentication for Django
     # 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 pytest
     import django_webtest

     # django-mellon - SAML2 authentication for Django
     # 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 pytest
     import re
     import lasso

     # django-mellon - SAML2 authentication for Django
     # 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 base64
     import zlib

     # django-mellon - SAML2 authentication for Django
     # 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 datetime

     # django-mellon - SAML2 authentication for Django
     # 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 pytest
     import mock
     import lasso

     # django-mellon - SAML2 authentication for Django
     # 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 django
     from django.conf.urls import url, include

     # django-mellon - SAML2 authentication for Django
     # 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 httmock import all_requests, response

     # django-mellon - SAML2 authentication for Django
     # 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 lxml import etree as ET
+    -

Projet

Général

Profil

Produits Entr'ouvert » django-mellon

0002-code-style-10196.patch